This is an automated email from the ASF dual-hosted git repository.

wernerdv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 9011f2d67cb IGNITE-29260 Remove unused compact ID to node ID mapping 
from discovery (#13800)
9011f2d67cb is described below

commit 9011f2d67cbe58e4a8b436f80e223c479bc7561b
Author: Dmitry Werner <[email protected]>
AuthorDate: Tue Nov 10 17:07:40 2026 +0800

    IGNITE-29260 Remove unused compact ID to node ID mapping from discovery 
(#13800)
---
 .../managers/discovery/ConsistentIdMapper.java     | 28 +++-------------------
 .../internal/managers/discovery/DiscoCache.java    | 12 ----------
 .../managers/discovery/GridDiscoveryManager.java   | 20 +---------------
 .../cache/transactions/IgniteTxManager.java        |  2 +-
 4 files changed, 5 insertions(+), 57 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/ConsistentIdMapper.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/ConsistentIdMapper.java
index cc3c120f223..c504682deba 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/ConsistentIdMapper.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/ConsistentIdMapper.java
@@ -23,12 +23,11 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cluster.BaselineTopology;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Class is needed for map UUID to consistent id and vice versa.
+ * Class is needed for map UUID to consistent id.
  */
 public class ConsistentIdMapper {
     /** Optimization for short store full nodes set. */
@@ -68,36 +67,15 @@ public class ConsistentIdMapper {
     }
 
     /**
-     * Maps UUID to compact ID for given baseline topology.
+     * Map primary -> backup node compact ID accordingly to baseline topology.
      *
      * @param topVer Topology version.
-     * @param nodeConstId UUID of node.
-     * @return Compact ID of node for given baseline topology.
-     */
-    public UUID mapToUuid(AffinityTopologyVersion topVer, short nodeConstId) {
-        Map<Short, UUID> map = discoveryMgr.nodeIdMap(topVer);
-
-        if (map == null)
-            return null;
-
-        UUID constId = map.get(nodeConstId);
-
-        if (constId == null)
-            throw new IllegalStateException("Unable to find UUID by constId 
[nodeId=" + nodeConstId + ", topVer=" + topVer + ']');
-
-        return constId;
-    }
-
-    /**
-     * Map primary -> backup node compact ID accordingly to baseline topology..
-     *
      * @param txNodes Primary -> backup UUID nodes.
      * @return Primary -> backup compact ID nodes.
      */
     public Map<Short, Collection<Short>> mapToCompactIds(
         AffinityTopologyVersion topVer,
-        @Nullable Map<UUID, Collection<UUID>> txNodes,
-        BaselineTopology baselineTop
+        @Nullable Map<UUID, Collection<UUID>> txNodes
     ) {
         if (txNodes == null)
             return null;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
index a10731bf3cd..5312406abbe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java
@@ -96,9 +96,6 @@ public class DiscoCache {
     /** */
     final Map<UUID, Short> nodeIdToConsIdx;
 
-    /** */
-    final Map<Short, UUID> consIdxToNodeId;
-
     /** */
     private final P1<BaselineNode> aliveBaselineNodePred;
 
@@ -119,7 +116,6 @@ public class DiscoCache {
      * @param nodeMap Node map.
      * @param alives0 Alive nodes.
      * @param nodeIdToConsIdx Node ID to consistent ID mapping.
-     * @param consIdxToNodeId Consistent ID to node ID mapping.
      * @param minNodeVer Minimum node version.
      */
     DiscoCache(
@@ -136,7 +132,6 @@ public class DiscoCache {
         Map<UUID, ClusterNode> nodeMap,
         Set<UUID> alives0,
         @Nullable Map<UUID, Short> nodeIdToConsIdx,
-        @Nullable Map<Short, UUID> consIdxToNodeId,
         IgniteProductVersion minNodeVer,
         IgniteProductVersion minSrvNodeVer
     ) {
@@ -155,7 +150,6 @@ public class DiscoCache {
         this.minNodeVer = minNodeVer;
         this.minSrvNodeVer = minSrvNodeVer;
         this.nodeIdToConsIdx = nodeIdToConsIdx;
-        this.consIdxToNodeId = consIdxToNodeId;
 
         aliveBaselineNodePred = new P1<BaselineNode>() {
             @Override public boolean apply(BaselineNode node) {
@@ -240,11 +234,6 @@ public class DiscoCache {
         return nodeIdToConsIdx;
     }
 
-    /** @return Consistent id map Short (compacted consistent id) -> UUID. */
-    public Map<Short, UUID> nodeIdMap() {
-        return consIdxToNodeId;
-    }
-
     /**
      * Gets all alive remote nodes that have at least one cache configured.
      *
@@ -460,7 +449,6 @@ public class DiscoCache {
             nodeMap,
             alives,
             nodeIdToConsIdx,
-            consIdxToNodeId,
             minNodeVer,
             minSrvNodeVer);
     }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index d8f9a4e428f..a163dd9b34e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -1997,16 +1997,6 @@ public class GridDiscoveryManager extends 
GridManagerAdapter<DiscoverySpi> {
         return resolveDiscoCache(CU.cacheId(null), topVer).consistentIdMap();
     }
 
-    /**
-     * Gets consistentId from history for given topology version.
-     *
-     * @param topVer Topology version.
-     * @return Compacted consistent id map.
-     */
-    public Map<Short, UUID> nodeIdMap(AffinityTopologyVersion topVer) {
-        return resolveDiscoCache(CU.cacheId(null), topVer).nodeIdMap();
-    }
-
     /**
      * Gets cache nodes for cache with given name.
      *
@@ -2475,7 +2465,6 @@ public class GridDiscoveryManager extends 
GridManagerAdapter<DiscoverySpi> {
         ArrayList<ClusterNode> allNodes = new ArrayList<>(topSnapshot.size());
 
         Map<UUID, Short> nodeIdToConsIdx;
-        Map<Short, UUID> consIdxToNodeId;
         List<? extends BaselineNode> baselineNodes;
 
         IgniteProductVersion minVer = null;
@@ -2514,7 +2503,6 @@ public class GridDiscoveryManager extends 
GridManagerAdapter<DiscoverySpi> {
 
         if (blt != null) {
             nodeIdToConsIdx = U.newHashMap(srvNodes.size());
-            consIdxToNodeId = U.newHashMap(srvNodes.size());
 
             Map<Object, Short> m = blt.consistentIdMapping();
 
@@ -2523,12 +2511,9 @@ public class GridDiscoveryManager extends 
GridManagerAdapter<DiscoverySpi> {
             for (ClusterNode node : srvNodes) {
                 Short compactedId = m.get(node.consistentId());
 
-                if (compactedId != null) {
+                if (compactedId != null)
                     nodeIdToConsIdx.put(node.id(), compactedId);
 
-                    consIdxToNodeId.put(compactedId, node.id());
-                }
-
                 aliveNodesByConsId.put(node.consistentId(), node);
             }
 
@@ -2547,7 +2532,6 @@ public class GridDiscoveryManager extends 
GridManagerAdapter<DiscoverySpi> {
         }
         else {
             nodeIdToConsIdx = null;
-            consIdxToNodeId = null;
 
             baselineNodes = null;
         }
@@ -2573,7 +2557,6 @@ public class GridDiscoveryManager extends 
GridManagerAdapter<DiscoverySpi> {
             Collections.unmodifiableMap(nodeMap),
             alives,
             nodeIdToConsIdx == null ? null : 
Collections.unmodifiableMap(nodeIdToConsIdx),
-            consIdxToNodeId == null ? null : 
Collections.unmodifiableMap(consIdxToNodeId),
             minVer,
             minSrvVer);
     }
@@ -3547,7 +3530,6 @@ public class GridDiscoveryManager extends 
GridManagerAdapter<DiscoverySpi> {
             discoCache.nodeMap,
             discoCache.alives,
             nodeIdToConsIdx,
-            discoCache.consIdxToNodeId,
             discoCache.minimumNodeVersion(),
             discoCache.minimumServerNodeVersion());
     }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 656e668931e..566b76492ce 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -2647,7 +2647,7 @@ public class IgniteTxManager extends 
GridCacheSharedManagerAdapter {
             || 
!baselineTop.consistentIds().contains(cctx.localNode().consistentId()))
             return null;
 
-        Map<Short, Collection<Short>> nodes = 
tx.consistentIdMapper.mapToCompactIds(tx.topVer, tx.txNodes, baselineTop);
+        Map<Short, Collection<Short>> nodes = 
tx.consistentIdMapper.mapToCompactIds(tx.topVer, tx.txNodes);
 
         TxRecord record = new TxRecord(tx.state(), tx.nearXidVersion(), 
tx.writeVersion(), nodes);
 

Reply via email to