[ignite] branch master updated: IGNITE-19874 GridDhtTxLocal initial cleanup WIP (#10814)

[av]

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

av 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 8d0e5e23cf7 IGNITE-19874 GridDhtTxLocal initial cleanup WIP (#10814)
8d0e5e23cf7 is described below

commit 8d0e5e23cf7747cebc093663c7316148e89248bb
Author: Anton Vinogradov <a...@apache.org>
AuthorDate: Thu Jun 29 18:24:24 2023 +0300

    IGNITE-19874 GridDhtTxLocal initial cleanup WIP (#10814)
---
 .../cache/distributed/dht/GridDhtTxLocal.java          | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index 5b86c8c521a..216db584660 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -68,13 +68,13 @@ import static 
org.apache.ignite.transactions.TransactionState.PREPARING;
  */
 public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements 
GridCacheMappedVersion {
     /** */
-    private UUID nearNodeId;
+    private final UUID nearNodeId;
 
     /** Near future ID. */
     private IgniteUuid nearFutId;
 
     /** Near future ID. */
-    private int nearMiniId;
+    private final int nearMiniId;
 
     /** Near future ID. */
     private IgniteUuid nearFinFutId;
@@ -83,7 +83,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter 
implements GridCacheMa
     private int nearFinMiniId;
 
     /** Near XID. */
-    private GridCacheVersion nearXidVer;
+    private final GridCacheVersion nearXidVer;
 
     /** Future updater. */
     private static final AtomicReferenceFieldUpdater<GridDhtTxLocal, 
GridDhtTxPrepareFuture> PREP_FUT_UPD =
@@ -94,7 +94,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter 
implements GridCacheMa
     private volatile GridDhtTxPrepareFuture prepFut;
 
     /** Transaction label. */
-    private @Nullable String lb;
+    private final @Nullable String lb;
 
     /**
      * @param nearNodeId Near node ID that initiated transaction.
@@ -244,13 +244,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter 
implements GridCacheMa
         return cacheCtx.isDht() && isNearEnabled(cacheCtx) && 
!cctx.localNodeId().equals(nearNodeId());
     }
 
-    /**
-     * @return Near future ID.
-     */
-    public IgniteUuid nearFinishFutureId() {
-        return nearFinFutId;
-    }
-
     /**
      * @param nearFinFutId Near future ID.
      */
@@ -289,8 +282,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter 
implements GridCacheMa
     }
 
     /** {@inheritDoc} */
-    @Override protected void updateExplicitVersion(IgniteTxEntry txEntry, 
GridCacheEntryEx entry)
-        throws GridCacheEntryRemovedException {
+    @Override protected void updateExplicitVersion(IgniteTxEntry txEntry, 
GridCacheEntryEx entry) {
         // DHT local transactions don't have explicit locks.
         // No-op.
     }