From 559cb56f6d385eaffda8c94b100f25684a43e038 Mon Sep 17 00:00:00 2001
From: chesnokoff <chesnokoff239@gmail.com>
Date: Thu, 26 Mar 2026 21:27:10 +0300
Subject: [PATCH] IGNITE-28360 Remove redundant
 GridDistributedTxPrepareRequest#dhtVers collection conversion

---
 .../GridDistributedTxPrepareRequest.java      | 43 ++++---------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index e1ca8e0938ae2..bcfad75d10d17 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -20,7 +20,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.UUID;
 import org.apache.ignite.IgniteCheckedException;
@@ -37,7 +36,6 @@
 import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
@@ -101,34 +99,27 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
     public Collection<IgniteTxEntry> writes;
 
     /** DHT versions to verify. */
-    @GridToStringInclude
-    private Map<IgniteTxKey, GridCacheVersion> dhtVers;
-
-    /** */
     @Order(7)
-    public Collection<IgniteTxKey> dhtVerKeys;
-
-    /** */
-    @Order(8)
-    public Collection<GridCacheVersion> dhtVerVals;
+    @GridToStringInclude
+    public Map<IgniteTxKey, GridCacheVersion> dhtVers;
 
     /** Expected transaction size. */
-    @Order(9)
+    @Order(8)
     public int txSize;
 
     /** Transaction nodes mapping (primary node -> related backup nodes). */
-    @Order(10)
+    @Order(9)
     public Map<UUID, Collection<UUID>> txNodes;
 
     /** IO policy. */
-    @Order(11)
+    @Order(10)
     public byte plc;
 
     /** Transient TX state. */
     private IgniteTxState txState;
 
     /** */
-    @Order(12)
+    @Order(11)
     @GridToStringExclude
     public byte flags;
 
@@ -381,15 +372,12 @@ public void applicationAttributes(Map<String, String> appAttrs) {
         if (reads != null)
             marshalTx(reads, ctx);
 
-        if (dhtVers != null && dhtVerKeys == null) {
+        if (dhtVers != null) {
             for (IgniteTxKey key : dhtVers.keySet()) {
                 GridCacheContext<?, ?> cctx = ctx.cacheContext(key.cacheId());
 
                 key.prepareMarshal(cctx);
             }
-
-            dhtVerKeys = dhtVers.keySet();
-            dhtVerVals = dhtVers.values();
         }
     }
 
@@ -403,22 +391,9 @@ public void applicationAttributes(Map<String, String> appAttrs) {
         if (reads != null)
             unmarshalTx(reads, ctx, ldr);
 
-        if (dhtVerKeys != null && dhtVers == null) {
-            assert dhtVerVals != null;
-            assert dhtVerKeys.size() == dhtVerVals.size();
-
-            Iterator<IgniteTxKey> keyIt = dhtVerKeys.iterator();
-            Iterator<GridCacheVersion> verIt = dhtVerVals.iterator();
-
-            dhtVers = U.newHashMap(dhtVerKeys.size());
-
-            while (keyIt.hasNext()) {
-                IgniteTxKey key = keyIt.next();
-
+        if (dhtVers != null) {
+            for (IgniteTxKey key : dhtVers.keySet())
                 key.finishUnmarshal(ctx.cacheContext(key.cacheId()), ldr);
-
-                dhtVers.put(key, verIt.next());
-            }
         }
     }