Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete rels from many-one, one-one tables #1132

Merged
merged 1 commit into from
Dec 21, 2022
Merged

Delete rels from many-one, one-one tables #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/storage/store/rel_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,7 @@ void RelTable::rollbackInMemoryIfNecessary() {
void RelTable::insertRel(const shared_ptr<ValueVector>& srcNodeIDVector,
const shared_ptr<ValueVector>& dstNodeIDVector,
const vector<shared_ptr<ValueVector>>& relPropertyVectors) {
assert(srcNodeIDVector->state->isFlat());
assert(dstNodeIDVector->state->isFlat());
assert(srcNodeIDVector->state->isFlat() && dstNodeIDVector->state->isFlat());
auto srcTableID =
srcNodeIDVector->getValue<nodeID_t>(srcNodeIDVector->state->selVector->selectedPositions[0])
.tableID;
Expand Down Expand Up @@ -208,6 +207,24 @@ void RelTable::deleteRel(const shared_ptr<ValueVector>& srcNodeIDVector,
const shared_ptr<ValueVector>& dstNodeIDVector, const shared_ptr<ValueVector>& relIDVector) {
assert(srcNodeIDVector->state->isFlat() && dstNodeIDVector->state->isFlat() &&
relIDVector->state->isFlat());
auto srcTableID =
srcNodeIDVector->getValue<nodeID_t>(srcNodeIDVector->state->selVector->selectedPositions[0])
.tableID;
auto dstTableID =
dstNodeIDVector->getValue<nodeID_t>(dstNodeIDVector->state->selVector->selectedPositions[0])
.tableID;
for (auto direction : REL_DIRECTIONS) {
auto boundTableID = (direction == RelDirection::FWD ? srcTableID : dstTableID);
auto boundVector = (direction == RelDirection::FWD ? srcNodeIDVector : dstNodeIDVector);
if (adjColumns[direction].contains(boundTableID)) {
auto nodeOffset =
boundVector->readNodeOffset(boundVector->state->selVector->selectedPositions[0]);
adjColumns[direction].at(boundTableID)->setNodeOffsetToNull(nodeOffset);
for (auto i = 0; i < propertyColumns[direction].size(); i++) {
propertyColumns[direction].at(boundTableID)[i]->setNodeOffsetToNull(nodeOffset);
}
}
}
listsUpdateStore->deleteRelIfNecessary(srcNodeIDVector, dstNodeIDVector, relIDVector);
}

Expand Down
79 changes: 76 additions & 3 deletions test/runner/e2e_delete_rel_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,21 @@ class DeleteRelTest : public DBTest {
srcTable.c_str(), dstTable.c_str(), srcID, dstID);
}
string getInsertKnowsRelQuery(string srcTable, string dstTable, int64_t srcID, int64_t dstID) {
auto str = StringUtils::string_format("MATCH (p1:%s), (p2:%s) WHERE p1.ID = %d AND p2.ID "
"= %d create (p1)-[:knows {length: %d}]->(p2);",
return StringUtils::string_format("MATCH (p1:%s), (p2:%s) WHERE p1.ID = %d AND p2.ID "
"= %d create (p1)-[:knows {length: %d}]->(p2);",
srcTable.c_str(), dstTable.c_str(), srcID, dstID, srcID);
return str;
}

string getDeleteTeachesRelQuery(int64_t srcID, int64_t dstID) {
return StringUtils::string_format(
"MATCH (p1:person)-[t:teaches]->(p2:person) WHERE p1.ID = %d AND p2.ID = %d delete t;",
srcID, dstID);
}

string getDeleteHasOwnerRelQuery(int64_t srcID, int64_t dstID) {
return StringUtils::string_format(
"MATCH (a:animal)-[h:hasOwner]->(p:person) WHERE a.ID = %d AND p.ID = %d delete h;",
srcID, dstID);
}

void commitOrRollbackConnectionAndInitDBIfNecessary(
Expand Down Expand Up @@ -231,6 +242,36 @@ class DeleteRelTest : public DBTest {
sortAndCheckTestResults(actualResult, expectedResult);
}

void deleteRelsFromManyToOneTable(bool isCommit, TransactionTestType transactionTestType) {
conn->beginWriteTransaction();
conn->query(getDeleteTeachesRelQuery(11, 1));
conn->query(getDeleteTeachesRelQuery(31, 3));
commitOrRollbackConnectionAndInitDBIfNecessary(isCommit, transactionTestType);
auto result = conn->query("MATCH (:person)-[t:teaches]->(:person) return t.length");
auto actualResult = TestHelper::convertResultToString(*result);
vector<string> expectedResult = isCommit ?
vector<string>{"21", "22", "32", "33"} :
vector<string>{"11", "21", "22", "31", "32", "33"};
sortAndCheckTestResults(actualResult, expectedResult);
}

void deleteRelsFromOneToOneTable(bool isCommit, TransactionTestType transactionTestType) {
conn->beginWriteTransaction();
conn->query(getDeleteHasOwnerRelQuery(1, 51));
conn->query(getDeleteHasOwnerRelQuery(3, 53));
conn->query(getDeleteHasOwnerRelQuery(5, 55));
conn->query(getDeleteHasOwnerRelQuery(7, 57));
conn->query(getDeleteHasOwnerRelQuery(9, 59));
conn->query(getDeleteHasOwnerRelQuery(11, 61));
commitOrRollbackConnectionAndInitDBIfNecessary(isCommit, transactionTestType);
auto result = conn->query("MATCH (:animal)-[h:hasOwner]->(:person) return h.length");
auto actualResult = TestHelper::convertResultToString(*result);
vector<string> expectedResult =
isCommit ? vector<string>{"2", "4", "6", "8"} :
vector<string>{"1", "2", "3", "4", "5", "6", "7", "8", "9", "11"};
sortAndCheckTestResults(actualResult, expectedResult);
}

static constexpr uint64_t NUM_RELS_FOR_PERSON_KNOWS_PERSON = 2500;
static constexpr uint64_t NUM_RELS_FOR_ANIMAL_KNOWS_PERSON = 51;
};
Expand Down Expand Up @@ -421,3 +462,35 @@ TEST_F(DeleteRelTest, MixedDeleteAndCreateRels) {
TestHelper::convertResultToString(*conn->query(knowsRelQuery), true /* checkOutputOrder */),
expectedResult);
}

TEST_F(DeleteRelTest, DeleteRelsFromManyToOneTableCommitNormalExecution) {
deleteRelsFromManyToOneTable(true /* isCommit */, TransactionTestType::NORMAL_EXECUTION);
}

TEST_F(DeleteRelTest, DeleteRelsFromManyToOneTableCommitRecovery) {
deleteRelsFromManyToOneTable(true /* isCommit */, TransactionTestType::RECOVERY);
}

TEST_F(DeleteRelTest, DeleteRelsFromManyToOneTableRollbackNormalExecution) {
deleteRelsFromManyToOneTable(false /* isCommit */, TransactionTestType::NORMAL_EXECUTION);
}

TEST_F(DeleteRelTest, DeleteRelsFromManyToOneTableRollbackRecovery) {
deleteRelsFromManyToOneTable(false /* isCommit */, TransactionTestType::RECOVERY);
}

TEST_F(DeleteRelTest, DeleteRelsFromOneToOneTableCommitNormalExecution) {
deleteRelsFromOneToOneTable(true /* isCommit */, TransactionTestType::NORMAL_EXECUTION);
}

TEST_F(DeleteRelTest, DeleteRelsFromOneToOneTableCommitRecovery) {
deleteRelsFromOneToOneTable(true /* isCommit */, TransactionTestType::RECOVERY);
}

TEST_F(DeleteRelTest, DeleteRelsFromOneToOneTableRollbackNormalExecution) {
deleteRelsFromOneToOneTable(false /* isCommit */, TransactionTestType::NORMAL_EXECUTION);
}

TEST_F(DeleteRelTest, DeleteRelsFromOneToOneTableRollbackRecovery) {
deleteRelsFromOneToOneTable(false /* isCommit */, TransactionTestType::RECOVERY);
}