WIP

Author: NSAmelchev

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java

@@ -262,7 +262,6 @@ public DiscoveryMessageFactory(Marshaller cstDataMarshall, ClassLoader cstDataMa
         factory.register((short)518, MappingProposedMessage::new, new MappingProposedMessageSerializer());
         factory.register((short)519, MarshallerMappingItem::new, new MarshallerMappingItemSerializer());
 
-
         factory.register((short)520, SnapshotOperationResponse::new, new SnapshotOperationResponseSerializer());
         factory.register((short)521, SnapshotHandlerResult::new, new SnapshotHandlerResultSerializer());
         factory.register((short)522, DataStreamerUpdatesHandlerResult::new, new DataStreamerUpdatesHandlerResultSerializer());

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerify.java

@@ -234,29 +234,31 @@ else if (txRec.state() == TransactionState.ROLLED_BACK) {
             for (Map.Entry<GridCacheVersion, Set<Short>> tx: txPrimParticipatingNodes.entrySet())
                 calcTxHash.accept(tx.getKey(), tx.getValue());
 
-            Map<Object, TransactionsHashRecord> txHashRes = new HashMap<>();
+            Collection<TransactionsHashRecord> txHashRes = nodesTxHash.entrySet().stream().map(e -> {
+                Short nodeId = e.getKey();
+                HashHolder hashHolder = e.getValue();
 
-            nodesTxHash.forEach((nodeId, hashHolder) -> {
-                TransactionsHashRecord rec = new TransactionsHashRecord(
+                return new TransactionsHashRecord(
                     sft.consistentId(),
                     blt.compactIdMapping().get(nodeId),
                     hashHolder.hash);
+            }).collect(Collectors.toCollection(ArrayList::new));
 
-                txHashRes.put(rec.remoteConsistentId(), rec);
-            });
-
-            Map<PartitionKey, PartitionHashRecord> partHashRes = new HashMap<>();
-
-            partMap.forEach((partKey, hashHolder) -> {
-                partHashRes.put(partKey, new PartitionHashRecord(
-                    partKey,
-                    false,
-                    sft.consistentId(),
-                    null,
-                    0,
-                    null,
-                    new VerifyPartitionContext(hashHolder)));
-            });
+            Map<PartitionKey, PartitionHashRecord> partHashRes = partMap.entrySet().stream()
+                .collect(Collectors.toMap(
+                    Map.Entry::getKey,
+                    e -> new PartitionHashRecord(
+                        e.getKey(),
+                        false,
+                        sft.consistentId(),
+                        null,
+                        0,
+                        null,
+                        new VerifyPartitionContext(e.getValue())
+                    ),
+                    (a, b) -> a,
+                    HashMap::new
+                ));
 
             if (log.isInfoEnabled()) {
                 log.info("Verify incremental snapshot procedure finished " +

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java

@@ -36,7 +36,7 @@
 /** */
 public class IncrementalSnapshotVerifyResult implements MarshallableMessage {
     /** Transaction hashes collection. */
-    private Map<Object, TransactionsHashRecord> txHashRes;
+    private Collection<TransactionsHashRecord> txHashRes;
 
     /** */
     @Order(0)
@@ -67,7 +67,7 @@ public IncrementalSnapshotVerifyResult() {
 
     /** */
     IncrementalSnapshotVerifyResult(
-        Map<Object, TransactionsHashRecord> txHashRes,
+        Collection<TransactionsHashRecord> txHashRes,
         Map<PartitionKey, PartitionHashRecord> partHashRes,
         Collection<GridCacheVersion> partiallyCommittedTxs,
         Collection<Exception> exceptions
@@ -84,7 +84,7 @@ public Map<PartitionKey, PartitionHashRecord> partHashRes() {
     }
 
     /** */
-    public Map<Object, TransactionsHashRecord> txHashRes() {
+    public Collection<TransactionsHashRecord> txHashRes() {
         return txHashRes;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotChecker.java

@@ -25,13 +25,16 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.management.cache.IdleVerifyResult;
 import org.apache.ignite.internal.processors.cache.persistence.filename.SnapshotFileTree;
+import org.apache.ignite.internal.processors.cache.verify.TransactionsHashRecord;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
@@ -104,7 +107,10 @@ public IdleVerifyResult reduceIncrementalResults(
             if (log.isDebugEnabled())
                 log.debug("Handle VerifyIncrementalSnapshotJob result [node=" + nodeRes.getKey() + ", taskRes=" + res + ']');
 
-            bldr.addIncrementalHashRecords(nodeRes.getKey(), res.txHashRes());
+            Map<Object, TransactionsHashRecord> txHashRes = res.txHashRes().stream().collect(
+                Collectors.toMap(TransactionsHashRecord::remoteConsistentId, Function.identity(), (a, b) -> a, HashMap::new));
+
+            bldr.addIncrementalHashRecords(nodeRes.getKey(), txHashRes);
         }
 
         return bldr.build();