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 b195eb97a64 IGNITE-29269 Use a single ConsistentIdMapper instance in
IgniteTxManager (#13809)
b195eb97a64 is described below
commit b195eb97a64fe9c756aeb359068e5cb029dcf95a
Author: Dmitry Werner <[email protected]>
AuthorDate: Wed Nov 11 03:21:41 2026 +0800
IGNITE-29269 Use a single ConsistentIdMapper instance in IgniteTxManager
(#13809)
---
.../internal/processors/cache/transactions/IgniteTxAdapter.java | 8 --------
.../internal/processors/cache/transactions/IgniteTxManager.java | 8 +++++++-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index fa877cd4a45..edd383519f8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -41,7 +41,6 @@ import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.events.TransactionStateChangedEvent;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.managers.discovery.ConsistentIdMapper;
import
org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheInvokeEntry;
@@ -253,9 +252,6 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter implement
/** Store used flag. */
private boolean storeEnabled = true;
- /** UUID to consistent id mapper. */
- protected final ConsistentIdMapper consistentIdMapper;
-
/** Incremental snapshot ID. */
private @Nullable UUID incSnpId;
@@ -329,8 +325,6 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter implement
if (log == null)
log = U.logger(cctx.kernalContext(), logRef, this);
- consistentIdMapper = new ConsistentIdMapper(cctx.discovery());
-
boolean needTaskName =
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_READ) ||
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_PUT) ||
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_REMOVED);
@@ -386,8 +380,6 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter implement
if (log == null)
log = U.logger(cctx.kernalContext(), logRef, this);
- consistentIdMapper = new ConsistentIdMapper(cctx.discovery());
-
boolean needTaskName =
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_READ) ||
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_PUT) ||
cctx.gridEvents().isRecordable(EVT_CACHE_OBJECT_REMOVED);
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 566b76492ce..8cd0c12ae3e 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
@@ -54,6 +54,7 @@ import
org.apache.ignite.internal.cluster.DistributedTransactionConfiguration;
import
org.apache.ignite.internal.managers.communication.CommunicationMarshalling;
import org.apache.ignite.internal.managers.communication.GridIoPolicy;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.managers.discovery.ConsistentIdMapper;
import org.apache.ignite.internal.managers.discovery.DiscoCache;
import org.apache.ignite.internal.managers.eventstorage.DiscoveryEventListener;
import org.apache.ignite.internal.managers.eventstorage.HighPriorityListener;
@@ -248,6 +249,9 @@ public class IgniteTxManager extends
GridCacheSharedManagerAdapter {
/** TX handler. */
private IgniteTxHandler txHnd;
+ /** UUID to consistent ID mapper. */
+ private ConsistentIdMapper consistentIdMapper;
+
/** Committed local transactions. */
private final GridBoundedConcurrentOrderedMap<GridCacheVersion, Boolean>
completedVersSorted =
new GridBoundedConcurrentOrderedMap<>(
@@ -319,6 +323,8 @@ public class IgniteTxManager extends
GridCacheSharedManagerAdapter {
@Override protected void start0() {
txHnd = new IgniteTxHandler(cctx);
+ consistentIdMapper = new ConsistentIdMapper(cctx.discovery());
+
deferredAckMsgSnd = new
GridDeferredAckMessageSender<GridCacheVersion>(cctx.time(),
cctx.kernalContext().closure()) {
@Override public int getTimeout() {
return DEFERRED_ONE_PHASE_COMMIT_ACK_REQUEST_TIMEOUT;
@@ -2647,7 +2653,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);
+ Map<Short, Collection<Short>> nodes =
consistentIdMapper.mapToCompactIds(tx.topVer, tx.txNodes);
TxRecord record = new TxRecord(tx.state(), tx.nearXidVersion(),
tx.writeVersion(), nodes);