IGNITE-22920 Final cleanup of GridDhtTxFinishRequest (#11477)

apache · Sep 6, 2024 · 2280dea · 2280dea
1 parent effb262
commit 2280dea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 212 deletions.
diff --git a/...va/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/...va/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -364,7 +364,6 @@ private boolean rollbackLockTransactions(Collection<ClusterNode> nodes) {
                 tx.xidVersion(),
                 tx.commitVersion(),
                 tx.threadId(),
-                tx.isolation(),
                 false,
                 tx.isInvalidate(),
                 tx.system(),
@@ -374,7 +373,6 @@ private boolean rollbackLockTransactions(Collection<ClusterNode> nodes) {
                 tx.completedBase(),
                 tx.committedVersions(),
                 tx.rolledbackVersions(),
-                tx.pendingVersions(),
                 tx.size(),
                 tx.taskNameHash(),
                 tx.activeCachesDeploymentEnabled(),
@@ -461,7 +459,6 @@ private boolean finish(boolean commit,
                 tx.xidVersion(),
                 tx.commitVersion(),
                 tx.threadId(),
-                tx.isolation(),
                 commit,
                 tx.isInvalidate(),
                 tx.system(),
@@ -471,17 +468,13 @@ private boolean finish(boolean commit,
                 tx.completedBase(),
                 tx.committedVersions(),
                 tx.rolledbackVersions(),
-                tx.pendingVersions(),
                 tx.size(),
                 tx.taskNameHash(),
                 tx.activeCachesDeploymentEnabled(),
-                null,
                 false,
                 false,
                 commit ? null : cctx.tm().txHandler().filterUpdateCountersForBackupNode(tx, n));
 
-            req.writeVersion(tx.writeVersion() != null ? tx.writeVersion() : tx.xidVersion());
-
             try {
                 if (isNull(cctx.discovery().getAlive(n.id()))) {
                     log.error("Unable to send message (node left topology): " + n);
@@ -538,7 +531,6 @@ private boolean finish(boolean commit,
                     tx.xidVersion(),
                     tx.commitVersion(),
                     tx.threadId(),
-                    tx.isolation(),
                     commit,
                     tx.isInvalidate(),
                     tx.system(),
@@ -548,16 +540,13 @@ private boolean finish(boolean commit,
                     tx.completedBase(),
                     tx.committedVersions(),
                     tx.rolledbackVersions(),
-                    tx.pendingVersions(),
                     tx.size(),
                     tx.taskNameHash(),
                     tx.activeCachesDeploymentEnabled(),
                     false,
                     false,
                     null);
 
-                req.writeVersion(tx.writeVersion());
-
                 try {
                     cctx.io().send(nearMapping.primary(), req, tx.ioPolicy());