Correct id swap revert in distributed tx during retry

Backport of a667b24 This fixes transaction failure when a transaction is retried because of a ODistributedRecordLockedException. Fixes orientechnologies#10289
indexity-io · Aug 29, 2024 · 31d7d3d · 31d7d3d
1 parent 796166b
commit 31d7d3d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...src/main/java/com/orientechnologies/orient/core/storage/impl/local/OMicroTransaction.java b/...src/main/java/com/orientechnologies/orient/core/storage/impl/local/OMicroTransaction.java
@@ -789,10 +789,11 @@ public Iterator<byte[]> getSerializedOperations() {
   public void resetAllocatedIds() {
     for (Map.Entry<ORID, ORecordOperation> op : recordOperations.entrySet()) {
       if (op.getValue().type == ORecordOperation.CREATED) {
+        ORID lastCreateId = op.getValue().getRID().copy();
         ORecordId oldNew =
-            new ORecordId(op.getKey().getClusterId(), op.getKey().getClusterPosition());
-        updateIdentityAfterRecordCommit(op.getValue().getRID(), oldNew);
-        updatedRids.remove(op.getValue().getRID());
+            new ORecordId(lastCreateId.getClusterId(), op.getKey().getClusterPosition());
+        updateIdentityAfterCommit(lastCreateId, oldNew);
+        updatedRids.put(oldNew, op.getKey());
       }
     }
   }

diff --git a/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionRealAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/tx/OTransactionRealAbstract.java
@@ -624,10 +624,11 @@ public Iterator<byte[]> getSerializedOperations() {
   public void resetAllocatedIds() {
     for (Map.Entry<ORID, ORecordOperation> op : allEntries.entrySet()) {
       if (op.getValue().type == ORecordOperation.CREATED) {
+        ORID lastCreateId = op.getValue().getRID().copy();
         ORecordId oldNew =
-            new ORecordId(op.getKey().getClusterId(), op.getKey().getClusterPosition());
-        updateIdentityAfterCommit(op.getValue().getRID(), oldNew);
-        updatedRids.remove(op.getValue().getRID());
+            new ORecordId(lastCreateId.getClusterId(), op.getKey().getClusterPosition());
+        updateIdentityAfterCommit(lastCreateId, oldNew);
+        updatedRids.put(oldNew, op.getKey());
       }
     }
   }