merge: #933

933: Backport 876 to stable/8.2 r=nicpuppa a=remcowesterhoud #876 Co-authored-by: Remco Westerhoud <[email protected]>
camunda · Oct 11, 2023 · 9e73b1b · 9e73b1b
2 parents d1dc633 + 31439f9
commit 9e73b1b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/engine/src/main/java/io/camunda/zeebe/process/test/engine/db/InMemoryDbTransaction.java b/engine/src/main/java/io/camunda/zeebe/process/test/engine/db/InMemoryDbTransaction.java
@@ -100,6 +100,7 @@ public InMemoryDbIterator newIterator() {
     final TreeMap<Bytes, Bytes> snapshot = new TreeMap<>();
     snapshot.putAll(database);
     snapshot.putAll(transactionCache);
+    deletedKeys.forEach(snapshot::remove);
 
     return new InMemoryDbIterator(snapshot);
   }

diff --git a/...src/test/java/io/camunda/zeebe/process/test/engine/db/InMemoryZeebeDbTransactionTest.java b/...src/test/java/io/camunda/zeebe/process/test/engine/db/InMemoryZeebeDbTransactionTest.java
@@ -8,6 +8,7 @@
 package io.camunda.zeebe.process.test.engine.db;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 import io.camunda.zeebe.db.ColumnFamily;
 import io.camunda.zeebe.db.TransactionContext;
@@ -492,6 +493,25 @@ void shouldWriteKeyAfterDeletion() {
     assertThat(oneColumnFamily.get(oneKey).getValue()).isEqualTo(-2);
   }
 
+  @Test
+  void shouldNotIterateOverDeletionsInTransaction() throws Exception {
+    // given
+    oneKey.wrapLong(1);
+    oneValue.wrapLong(-1L);
+    oneColumnFamily.insert(oneKey, oneValue);
+    transactionContext.getCurrentTransaction().commit();
+
+    // when - then
+    transactionContext.runInTransaction(
+        () -> {
+          oneColumnFamily.deleteExisting(oneKey);
+          oneColumnFamily.forEach(
+              (key, value) -> {
+                fail("Should not iterate over deleted keys");
+              });
+        });
+  }
+
   private enum ColumnFamilies {
     DEFAULT, // rocksDB needs a default column family
     ONE,