IGNITE-26909 Thin client optimizations for MultiDC

Author: alex-plekhanov

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java

@@ -258,7 +258,7 @@ public void writeDataCenterNodesRequest(PayloadOutputChannel ch) {
     /**
      * @param ch Payload input channel.
      */
-    public boolean readDataCenterNodesRequest(PayloadInputChannel ch) {
+    public boolean readDataCenterNodesResponse(PayloadInputChannel ch) {
         TopologyNodes top = lastTop.get();
 
         if (top == null)

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java

@@ -217,13 +217,13 @@ public static ClientCacheAffinityMapping readResponse(
                         cacheKeyCfg.put(in.readInt(), readCacheKeyConfiguration(in));
 
                     UUID[] primaryPartToNode = readNodePartitions(in);
-                    UUID[] dcBackupPartToNode = primaryPartToNode;
+                    UUID[] dcPartToNode = primaryPartToNode;
 
                     if (ch.clientChannel().protocolCtx().isFeatureSupported(DC_AWARE)) {
-                        dcBackupPartToNode = readNodePartitions(in);
+                        dcPartToNode = readNodePartitions(in);
 
-                        if (dcBackupPartToNode.length == 0)
-                            dcBackupPartToNode = primaryPartToNode;
+                        if (dcPartToNode.length == 0)
+                            dcPartToNode = primaryPartToNode;
                     }
 
                     boolean dfltMapping = true;
@@ -240,7 +240,7 @@ public static ClientCacheAffinityMapping readResponse(
                             continue;
 
                         aff.cacheAff.put(keyCfg.getKey(),
-                            new CacheAffinityInfo(keyCfg.getValue(), primaryPartToNode, dcBackupPartToNode,
+                            new CacheAffinityInfo(keyCfg.getValue(), primaryPartToNode, dcPartToNode,
                                 factory.apply(primaryPartToNode.length))
                         );
                     }
@@ -318,8 +318,8 @@ private static class CacheAffinityInfo {
         /** Primary partition mapping. */
         private final UUID[] primaryPartMapping;
 
-        /** Backup partition mapping, located in current DC. */
-        private final UUID[] dcBackupPartMapping;
+        /** Partition mapping to nodes located in current DC. */
+        private final UUID[] dcPartMapping;
 
         /** Mapper a cache key to a partition. */
         private final ClientPartitionAwarenessMapper keyMapper;
@@ -328,17 +328,17 @@ private static class CacheAffinityInfo {
          * @param keyCfg Cache key configuration or {@code null} if partition awareness is not applicable for this cache.
          * @param primaryPartMapping Primary partition to node mapping or {@code null} if partition awareness
          * is not applicable for this cache.
-         * @param dcBackupPartMapping Backup partition to node mapping, located in current DC.
+         * @param dcPartMapping Partition to node mapping located in current DC.
          */
         private CacheAffinityInfo(
             Map<Integer, Integer> keyCfg,
             UUID[] primaryPartMapping,
-            UUID[] dcBackupPartMapping,
+            UUID[] dcPartMapping,
             ClientPartitionAwarenessMapper keyMapper
         ) {
             this.keyCfg = keyCfg;
             this.primaryPartMapping = primaryPartMapping;
-            this.dcBackupPartMapping = dcBackupPartMapping;
+            this.dcPartMapping = dcPartMapping;
             this.keyMapper = keyMapper;
         }
 
@@ -362,7 +362,7 @@ private UUID nodeForKey(Object key, boolean primary) {
          * @param primary Force primary node.
          */
         private UUID nodeForPartition(int part, boolean primary) {
-            UUID[] partMapping = primary ? primaryPartMapping : dcBackupPartMapping;
+            UUID[] partMapping = primary ? primaryPartMapping : dcPartMapping;
 
             if (part < 0 || partMapping == null || part >= partMapping.length)
                 return null;

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java

@@ -527,7 +527,7 @@ private boolean affinityInfoIsUpToDate(int cacheId) {
                                     && channel.protocolCtx().isFeatureSupported(ProtocolBitmaskFeature.DC_AWARE)) {
                                     channel.service(ClientOperation.CLUSTER_GET_DC_NODES,
                                         affinityCtx::writeDataCenterNodesRequest,
-                                        affinityCtx::readDataCenterNodesRequest);
+                                        affinityCtx::readDataCenterNodesResponse);
                                 }
 
                                 return updated;

modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionMapping.java

@@ -33,20 +33,20 @@ public class ClientCachePartitionMapping {
     /** Primary partitions map for caches. */
     private final Map<UUID, Set<Integer>> primaryPartitionMap;
 
-    /** Backups partitions map, located in current data center for caches. */
-    @Nullable private final Map<UUID, Set<Integer>> dcBackupPartitionMap;
+    /** Partitions map to nodes located in current data center for caches. */
+    @Nullable private final Map<UUID, Set<Integer>> dcPartitionMap;
 
     /**
      * @param primaryPartitionMap Primary partition mapping.
-     * @param dcBackupPartitionMap Backup partition mapping, located in current data center.
+     * @param dcPartitionMap Partition mapping to nodes located in current data center.
      */
     @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
     public ClientCachePartitionMapping(
         Map<UUID, Set<Integer>> primaryPartitionMap,
-        @Nullable Map<UUID, Set<Integer>> dcBackupPartitionMap
+        @Nullable Map<UUID, Set<Integer>> dcPartitionMap
     ) {
         this.primaryPartitionMap = primaryPartitionMap;
-        this.dcBackupPartitionMap = dcBackupPartitionMap;
+        this.dcPartitionMap = dcPartitionMap;
     }
 
     /**
@@ -57,7 +57,7 @@ public void write(ClientProtocolContext ctx, BinaryRawWriter writer) {
         writePartitionMap(writer, primaryPartitionMap);
 
         if (ctx.isFeatureSupported(ClientBitmaskFeature.DC_AWARE))
-            writePartitionMap(writer, dcBackupPartitionMap);
+            writePartitionMap(writer, dcPartitionMap);
     }
 
     /** */
@@ -93,11 +93,11 @@ private static void writePartitionMap(BinaryRawWriter writer, @Nullable Map<UUID
         ClientCachePartitionMapping mapping = (ClientCachePartitionMapping)o;
 
         return Objects.equals(primaryPartitionMap, mapping.primaryPartitionMap)
-            && Objects.equals(dcBackupPartitionMap, mapping.dcBackupPartitionMap);
+            && Objects.equals(dcPartitionMap, mapping.dcPartitionMap);
     }
 
     /** {@inheritDoc} */
     @Override public int hashCode() {
-        return Objects.hash(primaryPartitionMap, dcBackupPartitionMap);
+        return Objects.hash(primaryPartitionMap, dcPartitionMap);
     }
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsRequest.java

@@ -193,12 +193,12 @@ private ClientCachePartitionAwarenessGroup processCache(
                 primaryPartitionMap.put(nodeId, parts);
             }
 
-            Map<UUID, Set<Integer>> dcBackupPartitionMap = null;
+            Map<UUID, Set<Integer>> dcPartitionMap = null;
 
             if (dcId != null && cacheCtx.config().isReadFromBackup()
                 && cacheCtx.config().getWriteSynchronizationMode() != CacheWriteSynchronizationMode.PRIMARY_SYNC) {
-                // Filter backup partitions, located in current DC.
-                dcBackupPartitionMap = new HashMap<>();
+                // Filter partitions, located in current DC.
+                dcPartitionMap = new HashMap<>();
 
                 List<List<ClusterNode>> partAssignments = assignment.assignment();
 
@@ -208,16 +208,16 @@ private ClientCachePartitionAwarenessGroup processCache(
                     ClusterNode node = F.find(partAssignment, null, n -> dcId.equals(n.dataCenterId()));
 
                     if (node != null)
-                        dcBackupPartitionMap.computeIfAbsent(node.id(), id -> new HashSet<>()).add(p);
+                        dcPartitionMap.computeIfAbsent(node.id(), id -> new HashSet<>()).add(p);
                     else {
-                        dcBackupPartitionMap = null;
+                        dcPartitionMap = null;
 
                         break;
                     }
                 }
             }
 
-            return new ClientCachePartitionMapping(primaryPartitionMap, dcBackupPartitionMap);
+            return new ClientCachePartitionMapping(primaryPartitionMap, dcPartitionMap);
         }
         catch (Exception e) {
             return null;