From ff34bcf295d7897cd34170a006560951c29e4670 Mon Sep 17 00:00:00 2001
From: jbajic <jure.bajic@memgraph.com>
Date: Mon, 16 Jan 2023 13:44:57 +0100
Subject: [PATCH] Fix deltas from commited transacations

---
 src/storage/v3/shard.cpp              | 16 ++++++++++-----
 tests/unit/storage_v3_shard_split.cpp | 29 +++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/storage/v3/shard.cpp b/src/storage/v3/shard.cpp
index d4191b4bb..ee205ad94 100644
--- a/src/storage/v3/shard.cpp
+++ b/src/storage/v3/shard.cpp
@@ -1122,13 +1122,19 @@ void Shard::AlignClonedTransaction(Transaction &cloned_transaction, const Transa
     // auto *prev = &delta_it->prev;
     // auto *cloned_prev = &cloned_delta_it->prev;
 
-    auto *delta = &*delta_it;
+    const auto *delta = &*delta_it;
     auto *cloned_delta = &*cloned_delta_it;
     while (delta != nullptr) {
-      // Align delta
-      cloned_delta->next = &*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; });
+      // Align delta, while ignoring deltas whose transactions have commited,
+      // or aborted
+      if (cloned_transactions.contains(delta->commit_info->start_or_commit_timestamp.logical_id)) {
+        cloned_delta->next = &*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; });
+      } else {
+        delta = delta->next;
+        continue;
+      }
       // Align prev ptr
       auto ptr = delta->prev.Get();
       switch (ptr.type) {
diff --git a/tests/unit/storage_v3_shard_split.cpp b/tests/unit/storage_v3_shard_split.cpp
index 1cca21d62..54068955d 100644
--- a/tests/unit/storage_v3_shard_split.cpp
+++ b/tests/unit/storage_v3_shard_split.cpp
@@ -139,4 +139,33 @@ TEST_F(ShardSplitTest, TestBasicSplitAfterCommit) {
   EXPECT_EQ(splitted_data.transactions.size(), 0);
 }
 
+TEST_F(ShardSplitTest, TestBasicSplitAfterCommit2) {
+  {
+    auto acc = storage.Access(GetNextHlc());
+    EXPECT_FALSE(acc.CreateVertexAndValidate({}, {PropertyValue(1)}, {}).HasError());
+    EXPECT_FALSE(acc.CreateVertexAndValidate({}, {PropertyValue(2)}, {}).HasError());
+    EXPECT_FALSE(acc.CreateVertexAndValidate({}, {PropertyValue(3)}, {}).HasError());
+    EXPECT_FALSE(acc.CreateVertexAndValidate({}, {PropertyValue(4)}, {}).HasError());
+    EXPECT_FALSE(acc.CreateVertexAndValidate({}, {PropertyValue(5)}, {}).HasError());
+    EXPECT_FALSE(acc.CreateVertexAndValidate({}, {PropertyValue(6)}, {}).HasError());
+
+    acc.Commit(GetNextHlc());
+  }
+  auto acc = storage.Access(GetNextHlc());
+  EXPECT_FALSE(acc.CreateEdge(VertexId{primary_label, PrimaryKey{PropertyValue(1)}},
+                              VertexId{primary_label, PrimaryKey{PropertyValue(2)}}, edge_type_id, Gid::FromUint(0))
+                   .HasError());
+  EXPECT_FALSE(acc.CreateEdge(VertexId{primary_label, PrimaryKey{PropertyValue(1)}},
+                              VertexId{primary_label, PrimaryKey{PropertyValue(5)}}, edge_type_id, Gid::FromUint(1))
+                   .HasError());
+  EXPECT_FALSE(acc.CreateEdge(VertexId{primary_label, PrimaryKey{PropertyValue(4)}},
+                              VertexId{primary_label, PrimaryKey{PropertyValue(6)}}, edge_type_id, Gid::FromUint(2))
+                   .HasError());
+
+  auto splitted_data = storage.PerformSplit({PropertyValue(4)});
+  EXPECT_EQ(splitted_data.vertices.size(), 3);
+  EXPECT_EQ(splitted_data.edges->size(), 2);
+  EXPECT_EQ(splitted_data.transactions.size(), 1);
+}
+
 }  // namespace memgraph::storage::v3::tests