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

NSAmelchev 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 f86d8e17172 IGNITE-29272 Remove unused code from cache entry locking 
(#13812)
f86d8e17172 is described below

commit f86d8e171727c09b8d7aae2e8d2f600043852e7e
Author: Nikita Amelchev <[email protected]>
AuthorDate: Thu Nov 12 11:43:36 2026 +0300

    IGNITE-29272 Remove unused code from cache entry locking (#13812)
---
 .../processors/cache/GridCacheAdapter.java         |   6 -
 .../processors/cache/GridCacheContext.java         |  10 --
 .../processors/cache/GridCacheEntryEx.java         |  27 +----
 .../cache/GridCacheExplicitLockSpan.java           |  10 +-
 .../processors/cache/GridCacheMapEntry.java        |  43 +------
 .../internal/processors/cache/GridCacheMvcc.java   | 133 ++++-----------------
 .../processors/cache/GridCacheMvccCandidate.java   |  16 ---
 .../processors/cache/GridCacheMvccManager.java     |  49 ++------
 .../distributed/GridDistributedCacheAdapter.java   |  11 +-
 .../distributed/GridDistributedCacheEntry.java     |  32 +----
 .../cache/distributed/dht/GridDhtCacheEntry.java   |  22 +---
 .../cache/distributed/dht/GridDhtLockFuture.java   |  20 +---
 .../dht/GridDhtTransactionalCacheAdapter.java      |   9 --
 .../distributed/dht/GridDhtTxLocalAdapter.java     |   2 -
 .../distributed/dht/atomic/GridDhtAtomicCache.java |   3 -
 .../dht/colocated/GridDhtColocatedCache.java       |   3 -
 .../distributed/near/GridNearAtomicCache.java      |   3 -
 .../cache/distributed/near/GridNearCacheEntry.java |   3 +-
 .../cache/distributed/near/GridNearLockFuture.java |  20 +---
 .../near/GridNearTransactionalCache.java           |   3 -
 .../cache/distributed/near/GridNearTxLocal.java    |  10 --
 .../cache/transactions/IgniteTxManager.java        |   6 +-
 .../loadtests/hashmap/GridHashMapLoadTest.java     |   1 -
 23 files changed, 62 insertions(+), 380 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 74285ab5cc9..7bcdf6cebc4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -545,8 +545,6 @@ public abstract class GridCacheAdapter<K, V> implements 
IgniteInternalCache<K, V
      * @param tx Transaction.
      * @param isRead {@code True} for read operations.
      * @param retval Flag to return value.
-     * @param isolation Transaction isolation.
-     * @param invalidate Invalidate flag.
      * @param createTtl TTL for create operation.
      * @param accessTtl TTL for read operation.
      * @return Locks future.
@@ -558,8 +556,6 @@ public abstract class GridCacheAdapter<K, V> implements 
IgniteInternalCache<K, V
         IgniteTxLocalEx tx,
         boolean isRead,
         boolean retval,
-        TransactionIsolation isolation,
-        boolean invalidate,
         long createTtl,
         long accessTtl);
 
@@ -3163,8 +3159,6 @@ public abstract class GridCacheAdapter<K, V> implements 
IgniteInternalCache<K, V
             tx,
             /*isRead*/true,
             /*retval*/false,
-            tx.isolation(),
-            /*invalidate*/false,
             /*createTtl*/0L,
             /*accessTtl*/0L);
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 10ca046d700..2cce886c3f8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -145,9 +145,6 @@ public class GridCacheContext<K, V> implements 
Externalizable {
         }
     };
 
-    /** Empty cache version array. */
-    private static final GridCacheVersion[] EMPTY_VERSION = new 
GridCacheVersion[0];
-
     /** @see IgniteSystemProperties#IGNITE_READ_LOAD_BALANCING */
     public static final boolean DFLT_READ_LOAD_BALANCING = true;
 
@@ -1201,13 +1198,6 @@ public class GridCacheContext<K, V> implements 
Externalizable {
         return new CacheEntryPredicateAdapter(toCacheObject(val));
     }
 
-    /**
-     * @return Empty cache version array.
-     */
-    public GridCacheVersion[] emptyVersion() {
-        return EMPTY_VERSION;
-    }
-
     /**
      * Sets cache object context.
      *
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index 35c480ff4b7..9a8445292d7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -490,7 +490,6 @@ public interface GridCacheEntryEx {
      * @param tx Cache transaction.
      * @param timeout Timeout for lock acquisition.
      * @param serOrder Version for serializable transactions ordering.
-     * @param serReadVer Optional read entry version for optimistic 
serializable transaction.
      * @param read Read lock flag.
      * @return {@code True} if lock was acquired, {@code false} otherwise.
      * @throws GridCacheEntryRemovedException If this entry is obsolete.
@@ -499,7 +498,6 @@ public interface GridCacheEntryEx {
     public boolean tmLock(IgniteInternalTx tx,
         long timeout,
         @Nullable GridCacheVersion serOrder,
-        @Nullable GridCacheVersion serReadVer,
         boolean read
     ) throws GridCacheEntryRemovedException, 
GridDistributedLockCancelledException;
 
@@ -683,15 +681,6 @@ public interface GridCacheEntryEx {
      */
     public boolean hasLockCandidate(GridCacheVersion ver) throws 
GridCacheEntryRemovedException;
 
-    /**
-     * Checks if the candidate is either owner or pending.
-     *
-     * @param threadId ThreadId.
-     * @return {@code True} if the candidate is either owner or pending.
-     * @throws GridCacheEntryRemovedException If entry was removed.
-     */
-    public boolean hasLockCandidate(long threadId) throws 
GridCacheEntryRemovedException;
-
     /**
      * @param exclude Exclude versions.
      * @return {@code True} if lock is owned by any thread or node.
@@ -756,30 +745,20 @@ public interface GridCacheEntryEx {
      */
     public boolean hasLockCandidateUnsafe(GridCacheVersion ver);
 
-    /**
-     * @param threadId Thread ID.
-     * @return Local candidate.
-     * @throws GridCacheEntryRemovedException If entry was removed.
-     */
-    @Nullable public GridCacheMvccCandidate localCandidate(long threadId) 
throws GridCacheEntryRemovedException;
-
     /**
      * Gets all local candidates.
      *
-     * @param exclude Versions to exclude from check.
      * @return All local candidates.
      * @throws GridCacheEntryRemovedException If entry was removed.
      */
-    public Collection<GridCacheMvccCandidate> localCandidates(@Nullable 
GridCacheVersion... exclude)
-        throws GridCacheEntryRemovedException;
+    public Collection<GridCacheMvccCandidate> localCandidates() throws 
GridCacheEntryRemovedException;
 
     /**
      * Gets all remote versions.
      *
-     * @param exclude Exclude version.
-     * @return All remote versions minus the excluded ones, if any.
+     * @return All remote versions.
      */
-    public Collection<GridCacheMvccCandidate> 
remoteMvccSnapshot(GridCacheVersion... exclude);
+    public Collection<GridCacheMvccCandidate> remoteMvccSnapshot();
 
     /**
      * Gets lock candidate for given lock ID.
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
index feaff015837..88b164f20ba 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
@@ -34,7 +34,6 @@ import 
org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.P1;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.jetbrains.annotations.Nullable;
@@ -347,10 +346,9 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
      * Gets explicit lock candidate for given key.
      *
      * @param key Key to lookup.
-     * @param ver Version to lookup (if {@code null} - return any).
      * @return Last added explicit lock candidate, if any, or {@code null}.
      */
-    @Nullable public GridCacheMvccCandidate candidate(IgniteTxKey key, 
@Nullable final GridCacheVersion ver) {
+    @Nullable public GridCacheMvccCandidate candidate(IgniteTxKey key) {
         lock();
 
         try {
@@ -361,11 +359,7 @@ public class GridCacheExplicitLockSpan extends 
ReentrantLock {
 
                 assert !deque.isEmpty();
 
-                return ver == null ? deque.peekFirst() : F.find(deque, null, 
new P1<GridCacheMvccCandidate>() {
-                    @Override public boolean apply(GridCacheMvccCandidate 
cand) {
-                        return cand.version().equals(ver);
-                    }
-                });
+                return deque.peekFirst();
             }
 
             return null;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 816a66f2505..176dfc102bb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1277,7 +1277,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
                             clearReaders();
                         else {
                             // Optimize memory usage - do not allocate 
additional array.
-                            List<GridCacheMvccCandidate> locs = 
mvcc.localCandidatesNoCopy(false);
+                            List<GridCacheMvccCandidate> locs = 
mvcc.localCandidatesNoCopy();
 
                             GridCacheVersion txVer = tx.xidVersion();
 
@@ -1286,7 +1286,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
                             boolean hasOriginatingNodeId = false;
 
                             for (GridCacheMvccCandidate c : locs) {
-                                if (c.reentry() || Objects.equals(c.version(), 
txVer))
+                                if (Objects.equals(c.version(), txVer))
                                     continue;
 
                                 if (Objects.equals(c.otherNodeId(), 
originatingNodeId)) {
@@ -2779,22 +2779,6 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public boolean hasLockCandidate(long threadId) throws 
GridCacheEntryRemovedException {
-        lockEntry();
-
-        try {
-            checkObsolete();
-
-            GridCacheMvcc mvcc = mvccExtras();
-
-            return mvcc != null && mvcc.localCandidate(threadId) != null;
-        }
-        finally {
-            unlockEntry();
-        }
-    }
-
     /** {@inheritDoc} */
     @Override public boolean lockedByAny(GridCacheVersion... exclude)
         throws GridCacheEntryRemovedException {
@@ -2927,7 +2911,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<GridCacheMvccCandidate> 
localCandidates(GridCacheVersion... exclude)
+    @Override public Collection<GridCacheMvccCandidate> localCandidates()
         throws GridCacheEntryRemovedException {
         lockEntry();
 
@@ -2936,7 +2920,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 
             GridCacheMvcc mvcc = mvccExtras();
 
-            return mvcc == null ? 
Collections.<GridCacheMvccCandidate>emptyList() : mvcc.localCandidates(exclude);
+            return mvcc == null ? 
Collections.<GridCacheMvccCandidate>emptyList() : mvcc.localCandidates();
         }
         finally {
             unlockEntry();
@@ -2944,7 +2928,7 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<GridCacheMvccCandidate> 
remoteMvccSnapshot(GridCacheVersion... exclude) {
+    @Override public Collection<GridCacheMvccCandidate> remoteMvccSnapshot() {
         return Collections.emptyList();
     }
 
@@ -2965,23 +2949,6 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public GridCacheMvccCandidate localCandidate(long threadId)
-        throws GridCacheEntryRemovedException {
-        lockEntry();
-
-        try {
-            checkObsolete();
-
-            GridCacheMvcc mvcc = mvccExtras();
-
-            return mvcc == null ? null : mvcc.localCandidate(threadId);
-        }
-        finally {
-            unlockEntry();
-        }
-    }
-
     /** {@inheritDoc} */
     @Override public GridCacheMvccCandidate candidate(UUID nodeId, long 
threadId)
         throws GridCacheEntryRemovedException {
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index cc2add5814d..59f99b0cb3c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -217,26 +217,6 @@ public final class GridCacheMvcc {
         return null;
     }
 
-    /**
-     *
-     * @param threadId Thread ID.
-     * @param reentry Reentry flag.
-     * @return Local candidate for the thread.
-     */
-    @Nullable private GridCacheMvccCandidate localCandidate(long threadId, 
boolean reentry) {
-        if (locs != null)
-            for (GridCacheMvccCandidate cand : locs) {
-                if (cand.isHeldByThread(threadId)) {
-                    if (cand.reentry() && !reentry)
-                        continue;
-
-                    return cand;
-                }
-            }
-
-        return null;
-    }
-
     /**
      * @param cand Existing candidate.
      * @param newCand New candidate.
@@ -309,24 +289,6 @@ public final class GridCacheMvcc {
                         return true;
                     }
 
-                    GridCacheMvccCandidate first = locs.getFirst();
-
-                    if (first.owner()) {
-                        // If reentry, add at the beginning. Note that
-                        // no reentry happens for DHT-local candidates.
-                        if (!cand.dhtLocal() && first.hasSameHolderAs(cand)) {
-                            assert !first.serializable();
-
-                            cand.setOwner();
-                            cand.setReady();
-                            cand.setReentry();
-
-                            locs.addFirst(cand);
-
-                            return true;
-                        }
-                    }
-
                     // Iterate in reverse order.
                     for (ListIterator<GridCacheMvccCandidate> it = 
locs.listIterator(locs.size()); it.hasPrevious(); ) {
                         GridCacheMvccCandidate c = it.previous();
@@ -336,7 +298,7 @@ public final class GridCacheMvcc {
 
                         // Add after the owner or serializable tx.
                         if (c.owner() || c.serializable()) {
-                            // Threads are checked above.
+                            // Threads are checked in addLocal(..).
                             assert cand.dhtLocal() || !c.hasSameHolderAs(cand);
 
                             // Reposition.
@@ -573,11 +535,10 @@ public final class GridCacheMvcc {
      * @param threadId Thread ID.
      * @param ver Lock version.
      * @param timeout Lock acquisition timeout.
-     * @param reenter Reentry flag ({@code true} if reentry is allowed).
      * @param tx Transaction flag.
      * @param implicitSingle Implicit transaction flag.
      * @param read Read lock flag.
-     * @return New lock candidate if lock was added, or current owner if lock 
was reentered,
+     * @return New lock candidate if lock was added,
      *      or <tt>null</tt> if lock was owned by another thread and timeout 
is negative.
      */
     @Nullable public GridCacheMvccCandidate addLocal(
@@ -585,7 +546,6 @@ public final class GridCacheMvcc {
         long threadId,
         GridCacheVersion ver,
         long timeout,
-        boolean reenter,
         boolean tx,
         boolean implicitSingle,
         boolean read) {
@@ -597,7 +557,6 @@ public final class GridCacheMvcc {
             ver,
             timeout,
             /*serializable order*/null,
-            reenter,
             tx,
             implicitSingle,
             /*dht-local*/false,
@@ -613,12 +572,11 @@ public final class GridCacheMvcc {
      * @param ver Lock version.
      * @param timeout Lock acquisition timeout.
      * @param serOrder Version for serializable transactions ordering.
-     * @param reenter Reentry flag ({@code true} if reentry is allowed).
      * @param tx Transaction flag.
      * @param implicitSingle Implicit flag.
      * @param dhtLoc DHT local flag.
      * @param read Read lock flag.
-     * @return New lock candidate if lock was added, or current owner if lock 
was reentered,
+     * @return New lock candidate if lock was added,
      *      or <tt>null</tt> if lock was owned by another thread and timeout 
is negative.
      */
     @Nullable public GridCacheMvccCandidate addLocal(
@@ -629,17 +587,16 @@ public final class GridCacheMvcc {
         GridCacheVersion ver,
         long timeout,
         @Nullable GridCacheVersion serOrder,
-        boolean reenter,
         boolean tx,
         boolean implicitSingle,
         boolean dhtLoc,
         boolean read) {
         if (log.isDebugEnabled())
             log.debug("Adding local candidate [mvcc=" + this + ", parent=" + 
parent + ", threadId=" + threadId +
-                ", ver=" + ver + ", timeout=" + timeout + ", reenter=" + 
reenter + ", tx=" + tx + "]");
+                ", ver=" + ver + ", timeout=" + timeout + ", tx=" + tx + "]");
 
         // Don't check reenter for DHT candidates.
-        if (!dhtLoc && !reenter) {
+        if (!dhtLoc) {
             GridCacheMvccCandidate owner = localOwner();
 
             if (owner != null && owner.isHeldByThreadOrVer(threadId, ver))
@@ -660,7 +617,6 @@ public final class GridCacheMvcc {
 
         UUID locNodeId = cctx.nodeId();
 
-        // If this is a reentry, then reentry flag will be flipped within 
'add0(..)' method.
         GridCacheMvccCandidate cand = new GridCacheMvccCandidate(
             parent,
             locNodeId,
@@ -701,7 +657,6 @@ public final class GridCacheMvcc {
      * @param ver Lock version.
      * @param tx Transaction flag.
      * @param implicitSingle Implicit flag.
-     * @param nearLoc Near local flag.
      * @return Add remote candidate.
      */
     public GridCacheMvccCandidate addRemote(
@@ -711,8 +666,7 @@ public final class GridCacheMvcc {
         long threadId,
         GridCacheVersion ver,
         boolean tx,
-        boolean implicitSingle,
-        boolean nearLoc) {
+        boolean implicitSingle) {
         GridCacheMvccCandidate cand = new GridCacheMvccCandidate(
             parent,
             nodeId,
@@ -724,7 +678,7 @@ public final class GridCacheMvcc {
             /*reentry*/false,
             tx,
             implicitSingle,
-            nearLoc,
+            /*near-local*/false,
             false,
             null,
             /*read*/false
@@ -1270,8 +1224,13 @@ public final class GridCacheMvcc {
      * @return Candidate or <tt>null</tt> if there is no candidate for given 
ID.
      */
     @Nullable GridCacheMvccCandidate localCandidate(long threadId) {
-        // Don't return reentries.
-        return localCandidate(threadId, false);
+        if (locs != null)
+            for (GridCacheMvccCandidate cand : locs) {
+                if (cand.isHeldByThread(threadId))
+                    return cand;
+            }
+
+        return null;
     }
 
     /**
@@ -1333,11 +1292,10 @@ public final class GridCacheMvcc {
     }
 
     /**
-     * @param reentry Reentry flag.
      * @return Collection of local candidates.
      */
-    public List<GridCacheMvccCandidate> localCandidatesNoCopy(boolean reentry) 
{
-        return candidates(locs, reentry, false, cctx.emptyVersion());
+    public List<GridCacheMvccCandidate> localCandidatesNoCopy() {
+        return candidates(locs, false);
     }
 
     /**
@@ -1350,78 +1308,37 @@ public final class GridCacheMvcc {
         if (src == null)
             return Collections.emptyList();
 
-        return candidatesCopy(src, dst, false);
-    }
+        dst.addAll(src);
 
-    /**
-     * @param excludeVers Exclude versions.
-     * @return Collection of local candidates.
-     */
-    public Collection<GridCacheMvccCandidate> 
localCandidates(GridCacheVersion... excludeVers) {
-        return candidates(locs, false, true, excludeVers);
+        return dst;
     }
 
     /**
-     * @param reentries Flag to include reentries.
-     * @param excludeVers Exclude versions.
      * @return Collection of local candidates.
      */
-    public List<GridCacheMvccCandidate> localCandidates(boolean reentries,
-        GridCacheVersion... excludeVers) {
-        return candidates(locs, reentries, true, excludeVers);
+    public Collection<GridCacheMvccCandidate> localCandidates() {
+        return candidates(locs, true);
     }
 
     /**
-     * @param excludeVers Exclude versions.
      * @return Collection of remote candidates.
      */
-    public List<GridCacheMvccCandidate> remoteCandidates(GridCacheVersion... 
excludeVers) {
-        return candidates(rmts, false, true, excludeVers);
+    public List<GridCacheMvccCandidate> remoteCandidates() {
+        return candidates(rmts, true);
     }
 
     /**
      * @param col Collection of candidates.
-     * @param reentries Reentry flag.
      * @param cp Whether to copy or not.
-     * @param excludeVers Exclude versions.
-     * @return Collection of candidates minus the exclude versions.
+     * @return Collection of candidates.
      */
-    private List<GridCacheMvccCandidate> 
candidates(List<GridCacheMvccCandidate> col,
-        boolean reentries, boolean cp, GridCacheVersion... excludeVers) {
+    private List<GridCacheMvccCandidate> 
candidates(List<GridCacheMvccCandidate> col, boolean cp) {
         if (col == null)
             return Collections.emptyList();
 
         assert !col.isEmpty();
 
-        if (!cp && F.isEmpty(excludeVers))
-            return col;
-
-        List<GridCacheMvccCandidate> cands = new ArrayList<>(col.size());
-
-        return candidatesCopy(col, cands, reentries, excludeVers);
-    }
-
-    /**
-     * Copy candidates collection from {@code src} to {@code dst}.
-     * @param src Source collection.
-     * @param dst Destination collection.
-     * @param reentries Flag to include reentries.
-     * @param excludeVers Exclude versions.
-     * @return Copied collection of candidates.
-     */
-    private List<GridCacheMvccCandidate> candidatesCopy(
-        List<GridCacheMvccCandidate> src,
-        List<GridCacheMvccCandidate> dst,
-        boolean reentries,
-        GridCacheVersion... excludeVers
-    ) {
-        for (GridCacheMvccCandidate c : src) {
-            // Don't include reentries.
-            if ((reentries || !c.reentry()) && 
!U.containsObjectArray(excludeVers, c.version()))
-                dst.add(c);
-        }
-
-        return dst;
+        return cp ? new ArrayList<>(col) : col;
     }
 
     /**
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
index 68106588371..ca0e2d47d42 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java
@@ -242,15 +242,6 @@ public class GridCacheMvccCandidate implements 
CacheLockCandidates {
         return null;
     }
 
-    /**
-     * @param parent Sets locks parent entry.
-     */
-    public void parent(GridCacheEntryEx parent) {
-        assert parent != null;
-
-        this.parent = parent;
-    }
-
     /**
      * @return Node ID.
      */
@@ -474,13 +465,6 @@ public class GridCacheMvccCandidate implements 
CacheLockCandidates {
         return REENTRY.get(flags());
     }
 
-    /**
-     * Sets reentry flag.
-     */
-    public void setReentry() {
-        mask(REENTRY, true);
-    }
-
     /**
      * @return Ready flag.
      */
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index 0d31a9ca1f6..a5e4fca6039 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -879,40 +879,6 @@ public class GridCacheMvccManager extends 
GridCacheSharedManagerAdapter {
         return nearLocked.keySet();
     }
 
-    /**
-     * This method has poor performance, so use with care. It is currently 
only used by {@code DGC}.
-     *
-     * @return Remote candidates.
-     */
-    public Collection<GridCacheMvccCandidate> remoteCandidates() {
-        Collection<GridCacheMvccCandidate> rmtCands = new ArrayList<>();
-
-        for (GridDistributedCacheEntry entry : locked())
-            rmtCands.addAll(entry.remoteMvccSnapshot());
-
-        return rmtCands;
-    }
-
-    /**
-     * This method has poor performance, so use with care. It is currently 
only used by {@code DGC}.
-     *
-     * @return Local candidates.
-     */
-    public Collection<GridCacheMvccCandidate> localCandidates() {
-        Collection<GridCacheMvccCandidate> locCands = new ArrayList<>();
-
-        for (GridDistributedCacheEntry entry : locked()) {
-            try {
-                locCands.addAll(entry.localCandidates());
-            }
-            catch (GridCacheEntryRemovedException ignore) {
-                // No-op.
-            }
-        }
-
-        return locCands;
-    }
-
     /**
      * @param cacheCtx Cache context.
      * @param cand Cache lock candidate to add.
@@ -1014,7 +980,7 @@ public class GridCacheMvccManager extends 
GridCacheSharedManagerAdapter {
     public boolean isLockedByThread(IgniteTxKey key, long threadId) {
         if (threadId < 0) {
             for (GridCacheExplicitLockSpan span : pendingExplicit.values()) {
-                GridCacheMvccCandidate cand = span.candidate(key, null);
+                GridCacheMvccCandidate cand = span.candidate(key);
 
                 if (cand != null && cand.owner())
                     return true;
@@ -1024,7 +990,7 @@ public class GridCacheMvccManager extends 
GridCacheSharedManagerAdapter {
             GridCacheExplicitLockSpan span = pendingExplicit.get(threadId);
 
             if (span != null) {
-                GridCacheMvccCandidate cand = span.candidate(key, null);
+                GridCacheMvccCandidate cand = span.candidate(key);
 
                 return cand != null && cand.owner();
             }
@@ -1085,24 +1051,23 @@ public class GridCacheMvccManager extends 
GridCacheSharedManagerAdapter {
      */
     @Nullable public GridCacheMvccCandidate explicitLock(long threadId, 
IgniteTxKey key) {
         if (threadId < 0)
-            return explicitLock(key, null);
+            return explicitLock(key);
         else {
             GridCacheExplicitLockSpan span = pendingExplicit.get(threadId);
 
-            return span == null ? null : span.candidate(key, null);
+            return span == null ? null : span.candidate(key);
         }
     }
 
     /**
-     * Gets explicit lock candidate added by any thread by given key and lock 
version.
+     * Gets explicit lock candidate added by any thread by given key.
      *
      * @param key Key.
-     * @param ver Version.
      * @return Lock candidate that satisfies given criteria or {@code null} if 
no such candidate.
      */
-    @Nullable public GridCacheMvccCandidate explicitLock(IgniteTxKey key, 
@Nullable GridCacheVersion ver) {
+    @Nullable public GridCacheMvccCandidate explicitLock(IgniteTxKey key) {
         for (GridCacheExplicitLockSpan span : pendingExplicit.values()) {
-            GridCacheMvccCandidate cand = span.candidate(key, ver);
+            GridCacheMvccCandidate cand = span.candidate(key);
 
             if (cand != null)
                 return cand;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 7586312d1bd..52bbc6182fb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -58,7 +58,6 @@ import 
org.apache.ignite.internal.util.lang.GridCloseableIterator;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteInClosure;
-import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -106,14 +105,12 @@ public abstract class GridDistributedCacheAdapter<K, V> 
extends GridCacheAdapter
         IgniteTxLocalEx tx,
         boolean isRead,
         boolean retval,
-        TransactionIsolation isolation,
-        boolean isInvalidate,
         long createTtl,
         long accessTtl
     ) {
         assert tx != null;
 
-        return lockAllAsync(keys, timeout, waitTimeout, tx, isInvalidate, 
isRead, retval, isolation, createTtl, accessTtl);
+        return lockAllAsync(keys, timeout, waitTimeout, tx, isRead, retval, 
createTtl, accessTtl);
     }
 
     /** {@inheritDoc} */
@@ -126,9 +123,7 @@ public abstract class GridDistributedCacheAdapter<K, V> 
extends GridCacheAdapter
             timeout,
             tx,
             false,
-            false,
             /*retval*/true,
-            null,
             -1L,
             -1L);
     }
@@ -138,10 +133,8 @@ public abstract class GridDistributedCacheAdapter<K, V> 
extends GridCacheAdapter
      * @param timeout Transaction timeout.
      * @param waitTimeout Lock wait timeout.
      * @param tx Transaction
-     * @param isInvalidate Invalidation flag.
      * @param isRead Indicates whether value is read or written.
      * @param retval Flag to return value.
-     * @param isolation Transaction isolation.
      * @param createTtl TTL for create operation.
      * @param accessTtl TTL for read operation.
      * @return Future for locks.
@@ -150,10 +143,8 @@ public abstract class GridDistributedCacheAdapter<K, V> 
extends GridCacheAdapter
         long timeout,
         long waitTimeout,
         @Nullable IgniteTxLocalEx tx,
-        boolean isInvalidate,
         boolean isRead,
         boolean retval,
-        @Nullable TransactionIsolation isolation,
         long createTtl,
         long accessTtl);
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index 6ea7fcd9e80..d5dfcafcd09 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.processors.cache.distributed;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -35,7 +34,6 @@ import 
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -73,7 +71,6 @@ public class GridDistributedCacheEntry extends 
GridCacheMapEntry {
      * @param ver Lock version.
      * @param topVer Topology version.
      * @param timeout Timeout to acquire lock.
-     * @param reenter Reentry flag.
      * @param tx Transaction flag.
      * @param implicitSingle Implicit flag.
      * @param read Read lock flag.
@@ -85,7 +82,6 @@ public class GridDistributedCacheEntry extends 
GridCacheMapEntry {
         GridCacheVersion ver,
         AffinityTopologyVersion topVer,
         long timeout,
-        boolean reenter,
         boolean tx,
         boolean implicitSingle,
         boolean read) throws GridCacheEntryRemovedException {
@@ -116,7 +112,6 @@ public class GridDistributedCacheEntry extends 
GridCacheMapEntry {
                 threadId,
                 ver,
                 timeout,
-                reenter,
                 tx,
                 implicitSingle,
                 read);
@@ -139,8 +134,7 @@ public class GridDistributedCacheEntry extends 
GridCacheMapEntry {
             unlockEntry();
         }
 
-        // Don't link reentries.
-        if (cand != null && !cand.reentry())
+        if (cand != null)
             // Link with other candidates in the same thread.
             cctx.mvcc().addNext(cctx, cand);
 
@@ -150,23 +144,8 @@ public class GridDistributedCacheEntry extends 
GridCacheMapEntry {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<GridCacheMvccCandidate> 
remoteMvccSnapshot(GridCacheVersion... exclude) {
-        Collection<GridCacheMvccCandidate> rmts = this.rmts;
-
-        if (rmts.isEmpty() || F.isEmpty(exclude))
-            return rmts;
-
-        Collection<GridCacheMvccCandidate> cands = new 
ArrayList<>(rmts.size());
-
-        for (GridCacheMvccCandidate c : rmts) {
-            assert !c.reentry();
-
-            // Don't include reentries.
-            if (!U.containsObjectArray(exclude, c.version()))
-                cands.add(c);
-        }
-
-        return cands;
+    @Override public Collection<GridCacheMvccCandidate> remoteMvccSnapshot() {
+        return rmts;
     }
 
     /**
@@ -223,8 +202,7 @@ public class GridDistributedCacheEntry extends 
GridCacheMapEntry {
                 threadId,
                 ver,
                 tx,
-                implicitSingle,
-                /*near-local*/false
+                implicitSingle
             );
 
             if (owned != null)
@@ -691,7 +669,6 @@ public class GridDistributedCacheEntry extends 
GridCacheMapEntry {
     @Override public boolean tmLock(IgniteInternalTx tx,
         long timeout,
         @Nullable GridCacheVersion serOrder,
-        GridCacheVersion serReadVer,
         boolean read
     ) throws GridCacheEntryRemovedException, 
GridDistributedLockCancelledException {
         if (tx.local())
@@ -701,7 +678,6 @@ public class GridDistributedCacheEntry extends 
GridCacheMapEntry {
                 tx.xidVersion(),
                 tx.topologyVersion(),
                 timeout,
-                /*reenter*/false,
                 /*tx*/true,
                 tx.implicitSingle(),
                 read) != null;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
index 05de436568e..b7490adc080 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -190,7 +190,7 @@ public class GridDhtCacheEntry extends 
GridDistributedCacheEntry {
             GridCacheMvcc mvcc = mvccExtras();
 
             if (mvcc != null) {
-                for (GridCacheMvccCandidate c : 
mvcc.localCandidatesNoCopy(false)) {
+                for (GridCacheMvccCandidate c : mvcc.localCandidatesNoCopy()) {
                     GridCacheVersion ver = c.otherVersion();
 
                     if (ver != null && ver.equals(nearVer))
@@ -218,7 +218,6 @@ public class GridDhtCacheEntry extends 
GridDistributedCacheEntry {
      * @param ver Lock version.
      * @param serOrder Version for serializable transactions ordering.
      * @param timeout Timeout to acquire lock.
-     * @param reenter Reentry flag.
      * @param tx Tx flag.
      * @param implicitSingle Implicit flag.
      * @param read Read lock flag.
@@ -234,13 +233,10 @@ public class GridDhtCacheEntry extends 
GridDistributedCacheEntry {
         GridCacheVersion ver,
         @Nullable GridCacheVersion serOrder,
         long timeout,
-        boolean reenter,
         boolean tx,
         boolean implicitSingle,
         boolean read)
         throws GridCacheEntryRemovedException, 
GridDistributedLockCancelledException {
-        assert !reenter || serOrder == null;
-
         GridCacheMvccCandidate cand;
         CacheLockCandidates prev;
         CacheLockCandidates owner;
@@ -276,7 +272,6 @@ public class GridDhtCacheEntry extends 
GridDistributedCacheEntry {
                 ver,
                 timeout,
                 serOrder,
-                reenter,
                 tx,
                 implicitSingle,
                 /*dht-local*/true,
@@ -306,10 +301,8 @@ public class GridDhtCacheEntry extends 
GridDistributedCacheEntry {
             unlockEntry();
         }
 
-        // Don't link reentries.
-        if (!cand.reentry())
-            // Link with other candidates in the same thread.
-            cctx.mvcc().addNext(cctx, cand);
+        // Link with other candidates in the same thread.
+        cctx.mvcc().addNext(cctx, cand);
 
         checkOwnerChanged(prev, owner, val);
 
@@ -320,7 +313,6 @@ public class GridDhtCacheEntry extends 
GridDistributedCacheEntry {
     @Override public boolean tmLock(IgniteInternalTx tx,
         long timeout,
         @Nullable GridCacheVersion serOrder,
-        GridCacheVersion serReadVer,
         boolean read
     ) throws GridCacheEntryRemovedException, 
GridDistributedLockCancelledException {
         if (tx.local()) {
@@ -335,7 +327,6 @@ public class GridDhtCacheEntry extends 
GridDistributedCacheEntry {
                 tx.xidVersion(),
                 serOrder,
                 timeout,
-                /*reenter*/false,
                 /*tx*/true,
                 tx.implicitSingle(),
                 read) != null;
@@ -829,13 +820,6 @@ public class GridDhtCacheEntry extends 
GridDistributedCacheEntry {
         }
     }
 
-    /**
-     * @return Cache name.
-     */
-    protected final String cacheName() {
-        return cctx.name();
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return toStringWithTryLock(() -> S.toString(GridDhtCacheEntry.class, 
this,
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 44d8e56abc9..051b5bd0a38 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -344,20 +344,13 @@ public final class GridDhtLockFuture extends 
GridCacheCompoundIdentityFuture<Boo
         trackable = false;
     }
 
-    /**
-     * @return Entries.
-     */
-    public Collection<GridDhtCacheEntry> entries() {
-        return F.view(entries, F.notNull());
-    }
-
     /**
      * Need of synchronization here is explained in the field's {@link 
GridDhtLockFuture#entries} comment.
      *
      * @return Copy of entries collection.
      */
     private synchronized Collection<GridDhtCacheEntry> entriesCopy() {
-        return new ArrayList<>(entries());
+        return new ArrayList<>(entries);
     }
 
     /**
@@ -436,7 +429,6 @@ public final class GridDhtLockFuture extends 
GridCacheCompoundIdentityFuture<Boo
             lockVer,
             null,
             lockTimeout(),
-            /*reenter*/false,
             inTx(),
             implicitSingle(),
             false
@@ -455,10 +447,9 @@ public final class GridDhtLockFuture extends 
GridCacheCompoundIdentityFuture<Boo
         }
 
         synchronized (this) {
-            entries.add(c == null || c.reentry() ? null : entry);
+            entries.add(entry);
 
-            if (c != null && !c.reentry())
-                pendingLocks.add(entry.key());
+            pendingLocks.add(entry.key());
         }
 
         // Double check if the future has already timed out.
@@ -628,9 +619,6 @@ public final class GridDhtLockFuture extends 
GridCacheCompoundIdentityFuture<Boo
             while (true) {
                 GridDistributedCacheEntry entry = entries.get(i);
 
-                if (entry == null)
-                    break; // While.
-
                 try {
                     CacheLockCandidates owners = entry.readyLock(lockVer);
 
@@ -706,7 +694,7 @@ public final class GridDhtLockFuture extends 
GridCacheCompoundIdentityFuture<Boo
             }
 
             if (isEmpty)
-                map(entries());
+                map(entries);
 
             return true;
         }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index ed955e05e90..0bfe0c2c520 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -80,7 +80,6 @@ import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -723,10 +722,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, 
V> extends GridDhtCach
         long timeout,
         long waitTimeout,
         IgniteTxLocalEx txx,
-        boolean isInvalidate,
         boolean isRead,
         boolean retval,
-        TransactionIsolation isolation,
         long createTtl,
         long accessTtl) {
         CacheOperationContext opCtx = ctx.operationContextPerCall();
@@ -736,10 +733,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, 
V> extends GridDhtCach
             timeout,
             waitTimeout,
             txx,
-            isInvalidate,
             isRead,
             retval,
-            isolation,
             createTtl,
             accessTtl,
             opCtx != null && opCtx.skipStore(),
@@ -755,10 +750,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, 
V> extends GridDhtCach
      * @param timeout Transaction timeout.
      * @param waitTimeout Lock wait timeout.
      * @param txx Transaction.
-     * @param isInvalidate Invalidate flag.
      * @param isRead Read flag.
      * @param retval Return value flag.
-     * @param isolation Transaction isolation.
      * @param createTtl TTL for create operation.
      * @param accessTtl TTL for read operation.
      * @param skipStore Skip store flag.
@@ -770,10 +763,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, 
V> extends GridDhtCach
         long timeout,
         long waitTimeout,
         IgniteTxLocalEx txx,
-        boolean isInvalidate,
         boolean isRead,
         boolean retval,
-        TransactionIsolation isolation,
         long createTtl,
         long accessTtl,
         boolean skipStore,
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 577640682d3..4ffa51ed450 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -731,10 +731,8 @@ public abstract class GridDhtTxLocalAdapter extends 
IgniteTxLocalAdapter {
             timeout,
             waitTimeout,
             this,
-            isInvalidate(),
             read,
             needRetVal,
-            isolation,
             createTtl,
             accessTtl,
             skipStore,
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 496f579a33f..db11924a913 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -120,7 +120,6 @@ import org.apache.ignite.lang.IgniteRunnable;
 import org.apache.ignite.lang.IgniteUuid;
 import org.apache.ignite.plugin.security.SecurityPermission;
 import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
 
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE;
@@ -818,10 +817,8 @@ public class GridDhtAtomicCache<K, V> extends 
GridDhtCacheAdapter<K, V> {
         long timeout,
         long waitTimeout,
         @Nullable IgniteTxLocalEx tx,
-        boolean isInvalidate,
         boolean isRead,
         boolean retval,
-        @Nullable TransactionIsolation isolation,
         long createTtl,
         long accessTtl) {
         return new FinishedLockFuture(new UnsupportedOperationException("Locks 
are not supported for " +
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 5f6d6c13e83..cd539db5d93 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -74,7 +74,6 @@ import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.plugin.security.SecurityPermission;
-import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -641,10 +640,8 @@ public class GridDhtColocatedCache<K, V> extends 
GridDhtTransactionalCacheAdapte
         long timeout,
         long waitTimeout,
         @Nullable IgniteTxLocalEx tx,
-        boolean isInvalidate,
         boolean isRead,
         boolean retval,
-        @Nullable TransactionIsolation isolation,
         long createTtl,
         long accessTtl
     ) {
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 96a5d71e67b..67f7fd65605 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -59,7 +59,6 @@ import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.plugin.security.SecurityPermission;
-import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
 
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE;
@@ -592,10 +591,8 @@ public class GridNearAtomicCache<K, V> extends 
GridNearCacheAdapter<K, V> {
         long timeout,
         long waitTimeout,
         @Nullable IgniteTxLocalEx tx,
-        boolean isInvalidate,
         boolean isRead,
         boolean retval,
-        @Nullable TransactionIsolation isolation,
         long createTtl,
         long accessTtl) {
         return dht.lockAllAsync(null, timeout);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
index 5e98920b60c..5827d0fe742 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
@@ -495,7 +495,6 @@ public class GridNearCacheEntry extends 
GridDistributedCacheEntry {
         GridCacheVersion ver,
         AffinityTopologyVersion topVer,
         long timeout,
-        boolean reenter,
         boolean tx,
         boolean implicitSingle,
         boolean read) throws GridCacheEntryRemovedException {
@@ -505,7 +504,7 @@ public class GridNearCacheEntry extends 
GridDistributedCacheEntry {
             ver,
             topVer,
             timeout,
-            reenter,
+            /*reenter*/false,
             tx,
             implicitSingle,
             read
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 20923899b32..c5eb21e6b31 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -379,7 +379,7 @@ public final class GridNearLockFuture extends 
GridCacheCompoundIdentityFuture<Bo
                 onComplete(false, true, false);
             }
             else {
-                onFailed(false);
+                onFailed();
             }
 
             return null;
@@ -442,21 +442,11 @@ public final class GridNearLockFuture extends 
GridCacheCompoundIdentityFuture<Bo
         cctx.mvcc().recheckPendingLocks();
     }
 
-    /**
-     *
-     * @param dist {@code True} if need to distribute lock release.
-     */
-    private void onFailed(boolean dist) {
-        undoLocks(dist, true);
-
-        complete(false);
-    }
+    /** */
+    private void onFailed() {
+        undoLocks(false, true);
 
-    /**
-     * @param success Success flag.
-     */
-    public void complete(boolean success) {
-        onComplete(success, true);
+        onComplete(false, true);
     }
 
     /**
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index c72b98a6a74..c9d55cd6c57 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -50,7 +50,6 @@ import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.plugin.security.SecurityPermission;
-import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -290,10 +289,8 @@ public class GridNearTransactionalCache<K, V> extends 
GridNearCacheAdapter<K, V>
         long timeout,
         long waitTimeout,
         IgniteTxLocalEx tx,
-        boolean isInvalidate,
         boolean isRead,
         boolean retval,
-        TransactionIsolation isolation,
         long createTtl,
         long accessTtl
     ) {
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 7394baa1376..36630c33fb4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -651,8 +651,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter 
implements GridTimeou
                     this,
                     /*read*/entryProc != null, // Needed to force load from 
store.
                     retval,
-                    isolation,
-                    isInvalidate(),
                     -1L,
                     -1L);
 
@@ -828,8 +826,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter 
implements GridTimeou
                     this,
                     /*read*/invokeVals != null, // Needed to force load from 
store.
                     retval,
-                    isolation,
-                    isInvalidate(),
                     -1L,
                     -1L);
 
@@ -1733,8 +1729,6 @@ public class GridNearTxLocal extends 
GridDhtTxLocalAdapter implements GridTimeou
                 this,
                 false,
                 retval,
-                isolation,
-                isInvalidate(),
                 -1L,
                 -1L);
 
@@ -1928,8 +1922,6 @@ public class GridNearTxLocal extends 
GridDhtTxLocalAdapter implements GridTimeou
                     this,
                     true,
                     true,
-                    isolation,
-                    isInvalidate(),
                     createTtl,
                     accessTtl);
 
@@ -4282,10 +4274,8 @@ public class GridNearTxLocal extends 
GridDhtTxLocalAdapter implements GridTimeou
             timeout,
             waitTimeout,
             this,
-            isInvalidate(),
             read,
             retval,
-            isolation,
             createTtl,
             accessTtl,
             skipStore,
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 8cd0c12ae3e..d6dc0cd659a 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
@@ -1865,15 +1865,13 @@ public class IgniteTxManager extends 
GridCacheSharedManagerAdapter {
                     assert !entry1.detached() : "Expected non-detached entry 
for near transaction " +
                         "[locNodeId=" + cctx.localNodeId() + ", entry=" + 
entry1 + ']';
 
-                    GridCacheVersion serReadVer = txEntry1.entryReadVersion();
-
-                    assert serReadVer == null || (tx.optimistic() && 
tx.serializable()) : txEntry1;
+                    assert txEntry1.entryReadVersion() == null || 
(tx.optimistic() && tx.serializable()) : txEntry1;
 
                     boolean read = serOrder != null && txEntry1.op() == READ;
 
                     entry1.unswap();
 
-                    if (!entry1.tmLock(tx, timeout, serOrder, serReadVer, 
read)) {
+                    if (!entry1.tmLock(tx, timeout, serOrder, read)) {
                         // Unlock locks locked so far.
                         for (IgniteTxEntry txEntry2 : entries) {
                             if (txEntry2 == txEntry1)
diff --git 
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
 
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
index 7aa1861dbe0..d620c6329d3 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
@@ -88,7 +88,6 @@ public class GridHashMapLoadTest extends 
GridCommonAbstractTest {
                 @Override public boolean tmLock(IgniteInternalTx tx,
                     long timeout,
                     @Nullable GridCacheVersion serOrder,
-                    GridCacheVersion serReadVer,
                     boolean read) {
                     return false;
                 }

Reply via email to