IGNITE-24178 Remove redundant IdleVerify code (#11801)

Author: maksaska

modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java

@@ -752,7 +752,7 @@ public void testCacheIdleVerifyDump() throws Exception {
             String dumpWithZeros = new String(Files.readAllBytes(Paths.get(fileNameMatcher.group(1))));
 
             assertContains(log, dumpWithZeros, "The check procedure has finished, found " + parts + " partitions");
-            assertContains(log, dumpWithZeros, "Partition: PartitionKeyV2 [grpId=1544803905, grpName=default, partId=0]");
+            assertContains(log, dumpWithZeros, "Partition: PartitionKey [grpId=1544803905, grpName=default, partId=0]");
             assertContains(log, dumpWithZeros, "updateCntr=0, partitionState=OWNING, size=0, partHash=0");
             assertContains(log, dumpWithZeros, "no conflicts have been found");
             assertCompactFooterStat(dumpWithZeros, 0, 0, 0, keysCnt);
@@ -769,7 +769,7 @@ public void testCacheIdleVerifyDump() throws Exception {
 
             assertContains(log, dumpWithoutZeros, "The check procedure has finished, found " + keysCnt + " partitions");
             assertContains(log, dumpWithoutZeros, (parts - keysCnt) + " partitions was skipped");
-            assertContains(log, dumpWithoutZeros, "Partition: PartitionKeyV2 [grpId=1544803905, grpName=default, partId=");
+            assertContains(log, dumpWithoutZeros, "Partition: PartitionKey [grpId=1544803905, grpName=default, partId=");
 
             assertNotContains(log, dumpWithoutZeros, "updateCntr=0, partitionState=OWNING, size=0, partHash=0");
 
@@ -988,7 +988,7 @@ private void testCacheIdleVerifyMultipleCacheFilterOptionsCommon(
      */
     private void assertSort(int expectedPartsCount, String output) {
         Pattern partIdPattern = Pattern.compile(".*partId=([0-9]*)");
-        Pattern primaryPattern = Pattern.compile("Partition instances: \\[PartitionHashRecordV2 \\[isPrimary=true");
+        Pattern primaryPattern = Pattern.compile("Partition instances: \\[PartitionHashRecord \\[isPrimary=true");
 
         Matcher partIdMatcher = partIdPattern.matcher(output);
         Matcher primaryMatcher = primaryPattern.matcher(output);

modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpResult.java

@@ -21,7 +21,7 @@
 import java.io.ObjectOutput;
 import java.util.List;
 import java.util.Map;
-import org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
+import org.apache.ignite.internal.processors.cache.verify.PartitionHashRecord;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.visor.VisorDataTransferObject;
@@ -34,12 +34,12 @@ public class IdleVerifyDumpResult extends VisorDataTransferObject {
     private static final long serialVersionUID = 0L;
 
     /** Cluster hashes. */
-    private Map<PartitionKeyV2, List<PartitionHashRecordV2>> clusterHashes;
+    private Map<PartitionKey, List<PartitionHashRecord>> clusterHashes;
 
     /**
      * @param clusterHashes Cluster hashes.
      */
-    public IdleVerifyDumpResult(Map<PartitionKeyV2, List<PartitionHashRecordV2>> clusterHashes) {
+    public IdleVerifyDumpResult(Map<PartitionKey, List<PartitionHashRecord>> clusterHashes) {
         this.clusterHashes = clusterHashes;
     }
 
@@ -63,7 +63,7 @@ public IdleVerifyDumpResult() {
     /**
      * @return Cluster hashes.
      */
-    public Map<PartitionKeyV2, List<PartitionHashRecordV2>> clusterHashes() {
+    public Map<PartitionKey, List<PartitionHashRecord>> clusterHashes() {
         return clusterHashes;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyResult.java

@@ -32,7 +32,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
+import org.apache.ignite.internal.processors.cache.verify.PartitionHashRecord;
 import org.apache.ignite.internal.processors.cache.verify.TransactionsHashRecord;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
@@ -53,19 +53,19 @@ public class IdleVerifyResult extends VisorDataTransferObject {
 
     /** Counter conflicts. */
     @GridToStringInclude
-    private Map<PartitionKeyV2, List<PartitionHashRecordV2>> cntrConflicts = new HashMap<>();
+    private Map<PartitionKey, List<PartitionHashRecord>> cntrConflicts = new HashMap<>();
 
     /** Hash conflicts. */
     @GridToStringInclude
-    private Map<PartitionKeyV2, List<PartitionHashRecordV2>> hashConflicts = new HashMap<>();
+    private Map<PartitionKey, List<PartitionHashRecord>> hashConflicts = new HashMap<>();
 
     /** Moving partitions. */
     @GridToStringInclude
-    private Map<PartitionKeyV2, List<PartitionHashRecordV2>> movingPartitions = new HashMap<>();
+    private Map<PartitionKey, List<PartitionHashRecord>> movingPartitions = new HashMap<>();
 
     /** Lost partitions. */
     @GridToStringInclude
-    private Map<PartitionKeyV2, List<PartitionHashRecordV2>> lostPartitions = new HashMap<>();
+    private Map<PartitionKey, List<PartitionHashRecord>> lostPartitions = new HashMap<>();
 
     /** Transaction hashes conflicts. */
     @GridToStringInclude
@@ -96,7 +96,7 @@ public IdleVerifyResult(Map<ClusterNode, Exception> exceptions) {
      * @param txHashConflicts Transaction hashes conflicts.
      */
     public IdleVerifyResult(
-        Map<PartitionKeyV2, List<PartitionHashRecordV2>> clusterHashes,
+        Map<PartitionKey, List<PartitionHashRecord>> clusterHashes,
         @Nullable List<List<TransactionsHashRecord>> txHashConflicts,
         @Nullable Map<ClusterNode, Collection<GridCacheVersion>> partiallyCommittedTxs
     ) {
@@ -111,23 +111,23 @@ public IdleVerifyResult(
      * @param exceptions Exceptions on each cluster node.
      */
     public IdleVerifyResult(
-        Map<PartitionKeyV2, List<PartitionHashRecordV2>> clusterHashes,
+        Map<PartitionKey, List<PartitionHashRecord>> clusterHashes,
         Map<ClusterNode, Exception> exceptions
     ) {
-        for (Map.Entry<PartitionKeyV2, List<PartitionHashRecordV2>> e : clusterHashes.entrySet()) {
+        for (Map.Entry<PartitionKey, List<PartitionHashRecord>> e : clusterHashes.entrySet()) {
             Integer partHash = null;
             Integer partVerHash = null;
             Object updateCntr = null;
 
-            for (PartitionHashRecordV2 record : e.getValue()) {
-                if (record.partitionState() == PartitionHashRecordV2.PartitionState.MOVING) {
+            for (PartitionHashRecord record : e.getValue()) {
+                if (record.partitionState() == PartitionHashRecord.PartitionState.MOVING) {
                     movingPartitions.computeIfAbsent(e.getKey(), k -> new ArrayList<>())
                         .add(record);
 
                     continue;
                 }
 
-                if (record.partitionState() == PartitionHashRecordV2.PartitionState.LOST) {
+                if (record.partitionState() == PartitionHashRecord.PartitionState.LOST) {
                     lostPartitions.computeIfAbsent(e.getKey(), k -> new ArrayList<>())
                         .add(record);
 
@@ -191,28 +191,28 @@ public IdleVerifyResult(
     /**
      * @return Counter conflicts.
      */
-    public Map<PartitionKeyV2, List<PartitionHashRecordV2>> counterConflicts() {
+    public Map<PartitionKey, List<PartitionHashRecord>> counterConflicts() {
         return cntrConflicts;
     }
 
     /**
      * @return Hash conflicts.
      */
-    public Map<PartitionKeyV2, List<PartitionHashRecordV2>> hashConflicts() {
+    public Map<PartitionKey, List<PartitionHashRecord>> hashConflicts() {
         return hashConflicts;
     }
 
     /**
      * @return Moving partitions.
      */
-    public Map<PartitionKeyV2, List<PartitionHashRecordV2>> movingPartitions() {
+    public Map<PartitionKey, List<PartitionHashRecord>> movingPartitions() {
         return Collections.unmodifiableMap(movingPartitions);
     }
 
     /**
      * @return Lost partitions.
      */
-    public Map<PartitionKeyV2, List<PartitionHashRecordV2>> lostPartitions() {
+    public Map<PartitionKey, List<PartitionHashRecord>> lostPartitions() {
         return lostPartitions;
     }
 
@@ -244,7 +244,7 @@ public void print(Consumer<String> printer, boolean printExceptionMessages) {
             else
                 printConflicts(printer);
 
-            Map<PartitionKeyV2, List<PartitionHashRecordV2>> moving = movingPartitions();
+            Map<PartitionKey, List<PartitionHashRecord>> moving = movingPartitions();
 
             if (!moving.isEmpty())
                 printer.accept("Possible results are not full due to rebalance still in progress." + nl());
@@ -287,13 +287,13 @@ public void print(Consumer<String> printer, boolean printExceptionMessages) {
      */
     private void printSkippedPartitions(
         Consumer<String> printer,
-        Map<PartitionKeyV2, List<PartitionHashRecordV2>> map,
+        Map<PartitionKey, List<PartitionHashRecord>> map,
         String partitionState
     ) {
         if (!F.isEmpty(map)) {
             printer.accept("Verification was skipped for " + map.size() + " " + partitionState + " partitions:\n");
 
-            for (Map.Entry<PartitionKeyV2, List<PartitionHashRecordV2>> entry : map.entrySet()) {
+            for (Map.Entry<PartitionKey, List<PartitionHashRecord>> entry : map.entrySet()) {
                 printer.accept("Skipped partition: " + entry.getKey() + "\n");
 
                 printer.accept("Partition instances: " + entry.getValue() + "\n");
@@ -314,14 +314,14 @@ private void printConflicts(Consumer<String> printer) {
             + (partiallyCommittedTxs == null ? "" : ", partiallyCommittedSize=" + partiallyCommittedTxs.size())
             + "]" + nl());
 
-        Set<PartitionKeyV2> allConflicts = new HashSet<>();
+        Set<PartitionKey> allConflicts = new HashSet<>();
 
         if (!F.isEmpty(counterConflicts())) {
             allConflicts.addAll(counterConflicts().keySet());
 
             printer.accept("Update counter conflicts:" + nl());
 
-            for (Map.Entry<PartitionKeyV2, List<PartitionHashRecordV2>> entry : counterConflicts().entrySet()) {
+            for (Map.Entry<PartitionKey, List<PartitionHashRecord>> entry : counterConflicts().entrySet()) {
                 printer.accept("Conflict partition: " + entry.getKey() + nl());
 
                 printer.accept("Partition instances: " + entry.getValue() + nl());
@@ -335,7 +335,7 @@ private void printConflicts(Consumer<String> printer) {
 
             printer.accept("Hash conflicts:" + nl());
 
-            for (Map.Entry<PartitionKeyV2, List<PartitionHashRecordV2>> entry : hashConflicts().entrySet()) {
+            for (Map.Entry<PartitionKey, List<PartitionHashRecord>> entry : hashConflicts().entrySet()) {
                 printer.accept("Conflict partition: " + entry.getKey() + nl());
 
                 printer.accept("Partition instances: " + entry.getValue() + nl());
@@ -364,9 +364,9 @@ private void printConflicts(Consumer<String> printer) {
 
         Map<String, TreeSet<Integer>> conflictsSummary = allConflicts.stream()
             .collect(Collectors.groupingBy(
-                PartitionKeyV2::groupName,
+                PartitionKey::groupName,
                 Collectors.mapping(
-                    PartitionKeyV2::partitionId,
+                    PartitionKey::partitionId,
                     Collectors.toCollection(TreeSet::new))));
 
         for (Map.Entry<String, TreeSet<Integer>> grpConflicts : conflictsSummary.entrySet()) {

modules/core/src/main/java/org/apache/ignite/internal/management/cache/PartitionKey.java

@@ -30,7 +30,7 @@ public class PartitionKey implements Serializable {
     private final int grpId;
 
     /** Group name. Optional field, used only for output. */
-    private volatile String grpName;
+    private final String grpName;
 
     /** Partition id. */
     private final int partId;
@@ -67,13 +67,6 @@ public String groupName() {
         return grpName;
     }
 
-    /**
-     * @param grpName Group name.
-     */
-    public void groupName(String grpName) {
-        this.grpName = grpName;
-    }
-
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (this == o)