This is an automated email from the ASF dual-hosted git repository. av pushed a commit to branch ignite-20177 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 0e59a9720aa372e8ad4c0c0d4f2e4dcb991552d1 Author: Anton Vinogradov <a...@apache.org> AuthorDate: Mon Aug 7 22:49:15 2023 +0300 WIP --- .../cache/distributed/dht/GridDhtLockFuture.java | 62 ---------------------- 1 file changed, 62 deletions(-) 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 ca64565bf4b..ef3640dbd33 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 @@ -663,30 +663,6 @@ public final class GridDhtLockFuture extends GridCacheCompoundIdentityFuture<Boo onComplete(false, false, true); } - /** - * @param cached Entry to check. - * @return {@code True} if filter passed. - */ - private boolean filter(GridCacheEntryEx cached) { - try { - if (!cctx.isAll(cached, filter)) { - if (log.isDebugEnabled()) - log.debug("Filter didn't pass for entry (will fail lock): " + cached); - - onFailed(true); - - return false; - } - - return true; - } - catch (IgniteCheckedException e) { - onError(e); - - return false; - } - } - /** * Callback for whenever entry lock ownership changes. * @@ -1428,44 +1404,6 @@ public final class GridDhtLockFuture extends GridCacheCompoundIdentityFuture<Boo } } - /** - * @param cacheCtx Context. - * @param keys Keys to evict readers for. - * @param nodeId Node ID. - * @param msgId Message ID. - * @param entries Entries to check. - */ - private void evictReaders(GridCacheContext<?, ?> cacheCtx, Collection<IgniteTxKey> keys, UUID nodeId, long msgId, - @Nullable List<GridDhtCacheEntry> entries) { - if (entries == null || keys == null || entries.isEmpty() || keys.isEmpty()) - return; - - for (ListIterator<GridDhtCacheEntry> it = entries.listIterator(); it.hasNext(); ) { - GridDhtCacheEntry cached = it.next(); - - if (keys.contains(cached.txKey())) { - while (true) { - try { - cached.removeReader(nodeId, msgId); - - if (tx != null) - tx.removeNearMapping(nodeId, cached); - - break; - } - catch (GridCacheEntryRemovedException ignore) { - GridDhtCacheEntry e = cacheCtx.dht().peekExx(cached.key()); - - if (e == null) - break; - - it.set(e); - } - } - } - } - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(MiniFuture.class, this, "nodeId", node.id(), "super", super.toString());