tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix delta assign

Browse Source
This commit is contained in:
jbajic 2023-02-02 11:04:37 +01:00
parent 97cab6650b
commit c9290777f5
2 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/storage/v3/splitter.cpp
View File

@ -152,24 +152,26 @@ void Splitter::AdjustClonedTransaction(Transaction &cloned_transaction, const Tr
// NOTE It is important that the order of delta lists is in same order
auto delta_it = transaction.deltas.begin();
auto cloned_delta_it = cloned_transaction.deltas.begin();
while (delta_it != transaction.deltas.end()) {
const auto *delta = &*delta_it;
auto *cloned_delta = &*cloned_delta_it;
while (delta != nullptr) {
// Align deltas which belong to cloned transaction, skip others
if (cloned_transactions.contains(delta->commit_info->start_or_commit_timestamp.logical_id)) {
const auto end_it =
cloned_transactions.at(delta->commit_info->start_or_commit_timestamp.logical_id)->deltas.end();
auto found_delta_it = std::ranges::find_if(
cloned_transactions.at(delta->commit_info->start_or_commit_timestamp.logical_id)->deltas,
[delta](const auto &elem) { return elem.uuid == delta->uuid; });
MG_ASSERT(found_delta_it != end_it, "Delta with given uuid must exist!");
while (delta->next != nullptr) {
// Align next ptr
// Get cloned_delta->next transaction, using delta->next original transaction
AdjustDeltaNext(*delta, *cloned_delta, cloned_transactions);
// auto cloned_transaction_it =
// cloned_transactions.find(delta->next->commit_info->start_or_commit_timestamp.logical_id);
// MG_ASSERT(cloned_transaction_it != cloned_transactions.end(), "Cloned transaction not found");
// // Find cloned delta in delta list of cloned transaction
// auto found_cloned_delta_it = std::ranges::find_if(
// cloned_transaction_it->second->deltas, [delta](const auto &elem) { return elem.uuid == delta->next->uuid;
// });
// MG_ASSERT(found_cloned_delta_it != cloned_transaction_it->second->deltas.end(),
// "Delta with given uuid must exist!");
// cloned_delta->next = &*found_cloned_delta_it;
cloned_delta->next = &*found_delta_it;
} else {
delta = delta->next;
continue;
}
// Align prev ptr
auto ptr = delta->prev.Get();
switch (ptr.type) {
@ -178,8 +180,18 @@ void Splitter::AdjustClonedTransaction(Transaction &cloned_transaction, const Tr
break;
}
case PreviousPtr::Type::DELTA: {
cloned_delta->prev.Set(ptr.delta);
break;
auto cloned_transaction_it =
cloned_transactions.find(ptr.delta->commit_info->start_or_commit_timestamp.logical_id);
MG_ASSERT(cloned_transaction_it != cloned_transactions.end(), "Cloned transaction not found");
// Find cloned delta in delta list of cloned transaction
auto found_cloned_delta_it =
std::ranges::find_if(cloned_transaction_it->second->deltas,
[delta = ptr.delta](const auto &elem) { return elem.uuid == delta->next->uuid; });
MG_ASSERT(found_cloned_delta_it != cloned_transaction_it->second->deltas.end(),
"Delta with given uuid must exist!");
// cloned_delta->next = &*found_cloned_delta_it;
ptr.delta.break;
}
case PreviousPtr::Type::VERTEX: {
// What if the vertex is already moved to garbage collection...
@ -208,4 +220,18 @@ void Splitter::AdjustClonedTransaction(Transaction &cloned_transaction, const Tr
"Both iterators must be exhausted!");
}
void Splitter::AdjustDeltaNext(const Delta &original, Delta &cloned,
std::map<uint64_t, std::unique_ptr<Transaction>> &cloned_transactions) {
// Get cloned_delta->next transaction, using delta->next original transaction
auto cloned_transaction_it =
cloned_transactions.find(original.next->commit_info->start_or_commit_timestamp.logical_id);
MG_ASSERT(cloned_transaction_it != cloned_transactions.end(), "Cloned transaction not found");
// Find cloned delta in delta list of cloned transaction
auto found_cloned_delta_it =
std::ranges::find_if(cloned_transaction_it->second->deltas,
[&original](const auto &elem) { return elem.uuid == original.next->uuid; });
MG_ASSERT(found_cloned_delta_it != cloned_transaction_it->second->deltas.end(), "Delta with given uuid must exist!");
cloned.next = &*found_cloned_delta_it;
}
} // namespace memgraph::storage::v3

3
src/storage/v3/splitter.hpp
View File

@ -83,6 +83,9 @@ class Splitter final {
void AdjustClonedTransactions(std::map<uint64_t, std::unique_ptr<Transaction>> &cloned_transactions,
VertexContainer &cloned_vertices, EdgeContainer &cloned_edges);
static void AdjustDeltaNext(const Delta &original, Delta &cloned,
std::map<uint64_t, std::unique_ptr<Transaction>> &cloned_transactions);
const LabelId primary_label_;
VertexContainer &vertices_;
EdgeContainer &edges_;