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

Update rel properties stored as columns #1177

Merged
merged 1 commit into from
Jan 15, 2023
Merged

Update rel properties stored as columns #1177

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
17 changes: 11 additions & 6 deletions src/include/storage/store/rel_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,14 @@ class DirectedRelTableData {
inline uint32_t getNumPropertyLists(table_id_t boundNodeTableID) {
return propertyLists.at(boundNodeTableID).size();
}
// Returns the list offset of the given relID if the relID stored as list in the current
// direction, otherwise it returns UINT64_MAX.
inline list_offset_t getListOffset(nodeID_t nodeID, int64_t relID) {
return ((RelIDList*)(propertyLists
.at(nodeID.tableID)[RelTableSchema::INTERNAL_REL_ID_PROPERTY_IDX]
.get()))
->getListOffset(nodeID.offset, relID);
return propertyLists.contains(nodeID.tableID) ?
((RelIDList*)getPropertyLists(
nodeID.tableID, RelTableSchema::INTERNAL_REL_ID_PROPERTY_IDX))
->getListOffset(nodeID.offset, relID) :
UINT64_MAX;
}

void initializeData(RelTableSchema* tableSchema, BufferManager& bufferManager, WAL* wal);
Expand All @@ -119,10 +122,12 @@ class DirectedRelTableData {
}
}

void insertRel(table_id_t boundTableID, const shared_ptr<ValueVector>& boundVector,
void insertRel(const shared_ptr<ValueVector>& boundVector,
const shared_ptr<ValueVector>& nbrVector,
const vector<shared_ptr<ValueVector>>& relPropertyVectors);
void deleteRel(table_id_t boundTableID, const shared_ptr<ValueVector>& boundVector);
void deleteRel(const shared_ptr<ValueVector>& boundVector);
void updateRel(const shared_ptr<ValueVector>& boundVector, property_id_t propertyID,
const shared_ptr<ValueVector>& propertyVector);
void performOpOnListsWithUpdates(const std::function<void(Lists*)>& opOnListsWithUpdates);
unique_ptr<ListsUpdateIteratorsForDirection> getListsUpdateIteratorsForDirection(
table_id_t boundNodeTableID);
Expand Down
50 changes: 27 additions & 23 deletions src/storage/store/rel_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,12 @@ void DirectedRelTableData::scanLists(Transaction* transaction, RelTableScanState
}
}

void DirectedRelTableData::insertRel(table_id_t boundTableID,
const shared_ptr<ValueVector>& boundVector, const shared_ptr<ValueVector>& nbrVector,
void DirectedRelTableData::insertRel(const shared_ptr<ValueVector>& boundVector,
const shared_ptr<ValueVector>& nbrVector,
const vector<shared_ptr<ValueVector>>& relPropertyVectors) {
auto boundTableID =
boundVector->getValue<nodeID_t>(boundVector->state->selVector->selectedPositions[0])
.tableID;
if (!adjColumns.contains(boundTableID)) {
return;
}
Expand All @@ -177,20 +180,31 @@ void DirectedRelTableData::insertRel(table_id_t boundTableID,
}
}

void DirectedRelTableData::deleteRel(
table_id_t boundTableID, const shared_ptr<ValueVector>& boundVector) {
if (!adjColumns.contains(boundTableID)) {
void DirectedRelTableData::deleteRel(const shared_ptr<ValueVector>& boundVector) {
auto boundNode =
boundVector->getValue<nodeID_t>(boundVector->state->selVector->selectedPositions[0]);
if (!adjColumns.contains(boundNode.tableID)) {
return;
}
auto adjColumn = adjColumns.at(boundTableID).get();
auto adjColumn = adjColumns.at(boundNode.tableID).get();
auto nodeOffset =
boundVector->readNodeOffset(boundVector->state->selVector->selectedPositions[0]);
adjColumn->setNodeOffsetToNull(nodeOffset);
for (auto& [_, propertyColumn] : propertyColumns.at(boundTableID)) {
for (auto& [_, propertyColumn] : propertyColumns.at(boundNode.tableID)) {
propertyColumn->setNodeOffsetToNull(nodeOffset);
}
}

void DirectedRelTableData::updateRel(const shared_ptr<ValueVector>& boundVector,
property_id_t propertyID, const shared_ptr<ValueVector>& propertyVector) {
auto boundNode =
boundVector->getValue<nodeID_t>(boundVector->state->selVector->selectedPositions[0]);
if (!adjColumns.contains(boundNode.tableID)) {
return;
}
propertyColumns.at(boundNode.tableID).at(propertyID)->writeValues(boundVector, propertyVector);
}

void DirectedRelTableData::performOpOnListsWithUpdates(
const std::function<void(Lists*)>& opOnListsWithUpdates) {
for (auto& [boundNodeTableID, listsUpdatePerTable] :
Expand Down Expand Up @@ -284,29 +298,17 @@ void RelTable::insertRel(const shared_ptr<ValueVector>& srcNodeIDVector,
const shared_ptr<ValueVector>& dstNodeIDVector,
const vector<shared_ptr<ValueVector>>& relPropertyVectors) {
assert(srcNodeIDVector->state->isFlat() && dstNodeIDVector->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;
fwdRelTableData->insertRel(srcTableID, srcNodeIDVector, dstNodeIDVector, relPropertyVectors);
bwdRelTableData->insertRel(dstTableID, dstNodeIDVector, srcNodeIDVector, relPropertyVectors);
fwdRelTableData->insertRel(srcNodeIDVector, dstNodeIDVector, relPropertyVectors);
bwdRelTableData->insertRel(dstNodeIDVector, srcNodeIDVector, relPropertyVectors);
listsUpdatesStore->insertRelIfNecessary(srcNodeIDVector, dstNodeIDVector, relPropertyVectors);
}

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;
fwdRelTableData->deleteRel(srcTableID, srcNodeIDVector);
bwdRelTableData->deleteRel(dstTableID, dstNodeIDVector);
fwdRelTableData->deleteRel(srcNodeIDVector);
bwdRelTableData->deleteRel(dstNodeIDVector);
listsUpdatesStore->deleteRelIfNecessary(srcNodeIDVector, dstNodeIDVector, relIDVector);
}

Expand All @@ -319,6 +321,8 @@ void RelTable::updateRel(const shared_ptr<ValueVector>& srcNodeIDVector,
srcNodeIDVector->state->selVector->selectedPositions[0]);
auto dstNode = dstNodeIDVector->getValue<nodeID_t>(
dstNodeIDVector->state->selVector->selectedPositions[0]);
fwdRelTableData->updateRel(srcNodeIDVector, propertyID, propertyVector);
bwdRelTableData->updateRel(dstNodeIDVector, propertyID, propertyVector);
auto relID =
relIDVector->getValue<int64_t>(relIDVector->state->selVector->selectedPositions[0]);
ListsUpdateInfo listsUpdateInfo = ListsUpdateInfo{propertyVector, propertyID, relID,
Expand Down
67 changes: 67 additions & 0 deletions test/runner/e2e_update_rel_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,41 @@ class UpdateRelTest : public DBTest {
sortAndCheckTestResults(actualResult, expectedResult);
}

void updateManyToOneRelTable(bool isCommit, TransactionTestType transactionTestType) {
conn->beginWriteTransaction();
ASSERT_TRUE(conn->query(getUpdateRelQuery("person" /* srcTable */, "person" /* dstTable */,
"teaches" /* relation */, 21 /* srcID */, 2 /* dstID */, "SET e.length=null")));
ASSERT_TRUE(conn->query(getUpdateRelQuery("person" /* srcTable */, "person" /* dstTable */,
"teaches" /* relation */, 32 /* srcID */, 3 /* dstID */, "SET e.length = 512")));
ASSERT_TRUE(conn->query(getUpdateRelQuery("person" /* srcTable */, "person" /* relation */,
"teaches" /* relation */, 33 /* srcID */, 3 /* dstID */, "SET e.length = 312")));
commitOrRollbackConnectionAndInitDBIfNecessary(isCommit, transactionTestType);
auto expectedResult = isCommit ? vector<string>{"11", "", "22", "31", "512", "312"} :
vector<string>{"11", "21", "22", "31", "32", "33"};
auto result = conn->query("MATCH (p:person)-[e:teaches]->(:person) RETURN e.length");
auto actualResult = TestHelper::convertResultToString(*result);
sortAndCheckTestResults(actualResult, expectedResult);
}

void updateOneToOneRelTable(bool isCommit, TransactionTestType transactionTestType) {
conn->beginWriteTransaction();
ASSERT_TRUE(conn->query(getUpdateRelQuery("animal" /* srcTable */, "person" /* dstTable */,
"hasOwner" /* relation */, 2 /* srcID */, 52 /* dstID */, "SET e.place='kuzu'")));
ASSERT_TRUE(conn->query(getUpdateRelQuery("animal" /* srcTable */, "person" /* dstTable */,
"hasOwner" /* relation */, 4 /* srcID */, 54 /* dstID */, "SET e.place='db'")));
ASSERT_TRUE(conn->query(getUpdateRelQuery("animal" /* srcTable */, "person" /* relation */,
"hasOwner" /* relation */, 8 /* srcID */, 58 /* dstID */, "SET e.place=null")));
commitOrRollbackConnectionAndInitDBIfNecessary(isCommit, transactionTestType);
auto expectedResult =
isCommit ? vector<string>{"1999", "kuzu", "1997", "db", "1995", "199419941994", "1993",
"", "1991", "1989"} :
vector<string>{"1999", "199819981998", "1997", "199619961996", "1995",
"199419941994", "1993", "199219921992", "1991", "1989"};
auto result = conn->query("MATCH (:animal)-[e:hasOwner]->(:person) RETURN e.place");
auto actualResult = TestHelper::convertResultToString(*result);
sortAndCheckTestResults(actualResult, expectedResult);
}

static constexpr uint64_t NUM_PERSON_KNOWS_PERSON_RELS = 2500;
};

Expand Down Expand Up @@ -392,3 +427,35 @@ TEST_F(UpdateRelTest, InsertAndUpdateRelsForNewlyAddedNodeRollbackNormalExecutio
TEST_F(UpdateRelTest, InsertAndUpdateRelsForNewlyAddedNodeRollbackRecovery) {
insertAndUpdateRelsForNewlyAddedNode(false /* isCommit */, TransactionTestType::RECOVERY);
}

TEST_F(UpdateRelTest, UpdateManyToOneRelTableCommitNormalExecution) {
updateManyToOneRelTable(true /* isCommit */, TransactionTestType::NORMAL_EXECUTION);
}

TEST_F(UpdateRelTest, UpdateManyToOneRelTableCommitRecovery) {
updateManyToOneRelTable(true /* isCommit */, TransactionTestType::RECOVERY);
}

TEST_F(UpdateRelTest, UpdateManyToOneRelTableRollbackNormalExecution) {
updateManyToOneRelTable(false /* isCommit */, TransactionTestType::NORMAL_EXECUTION);
}

TEST_F(UpdateRelTest, UpdateManyToOneRelTableRollbackRecovery) {
updateManyToOneRelTable(false /* isCommit */, TransactionTestType::RECOVERY);
}

TEST_F(UpdateRelTest, UpdateOneToOneRelTableCommitNormalExecution) {
updateOneToOneRelTable(true /* isCommit */, TransactionTestType::NORMAL_EXECUTION);
}

TEST_F(UpdateRelTest, UpdateOneToOneRelTableCommitRecovery) {
updateOneToOneRelTable(true /* isCommit */, TransactionTestType::RECOVERY);
}

TEST_F(UpdateRelTest, UpdateOneToOneRelTableRollbackNormalExecution) {
updateOneToOneRelTable(false /* isCommit */, TransactionTestType::NORMAL_EXECUTION);
}

TEST_F(UpdateRelTest, UpdateOneToOneRelTableRollbackRecovery) {
updateOneToOneRelTable(false /* isCommit */, TransactionTestType::RECOVERY);
}