IGNITE-22918 Remove GridDhtLockResponse#nearEvicted (#11475)

apache · Sep 6, 2024 · effb262 · effb262
1 parent 3c3deb1
commit effb262
Showing 1 changed file with 1 addition and 47 deletions.
diff --git a/...java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/...java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -30,7 +30,6 @@
 import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
 import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
 import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponse;
-import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -46,11 +45,6 @@ public class GridDhtLockResponse extends GridDistributedLockResponse {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** Evicted readers. */
-    @GridToStringInclude
-    @GridDirectCollection(IgniteTxKey.class)
-    private Collection<IgniteTxKey> nearEvicted;
-
     /** Mini ID. */
     private IgniteUuid miniId;
 
@@ -102,20 +96,6 @@ public GridDhtLockResponse(int cacheId, GridCacheVersion lockVer, IgniteUuid fut
         this.miniId = miniId;
     }
 
-    /**
-     * @return Evicted readers.
-     */
-    public Collection<IgniteTxKey> nearEvicted() {
-        return nearEvicted;
-    }
-
-    /**
-     * @param nearEvicted Evicted readers.
-     */
-    public void nearEvicted(Collection<IgniteTxKey> nearEvicted) {
-        this.nearEvicted = nearEvicted;
-    }
-
     /**
      * @return Mini future ID.
      */
@@ -167,11 +147,6 @@ public Collection<GridCacheEntryInfo> preloadEntries() {
 
         GridCacheContext<?, ?> cctx = ctx.cacheContext(cacheId);
 
-        if (nearEvicted != null) {
-            for (IgniteTxKey key : nearEvicted)
-                key.prepareMarshal(cctx);
-        }
-
         if (preloadEntries != null)
             marshalInfos(preloadEntries, cctx.shared(), cctx.cacheObjectContext());
     }
@@ -180,13 +155,6 @@ public Collection<GridCacheEntryInfo> preloadEntries() {
     @Override public void finishUnmarshal(GridCacheSharedContext<?, ?> ctx, ClassLoader ldr) throws IgniteCheckedException {
         super.finishUnmarshal(ctx, ldr);
 
-        GridCacheContext<?, ?> cctx = ctx.cacheContext(cacheId);
-
-        if (nearEvicted != null) {
-            for (IgniteTxKey key : nearEvicted)
-                key.finishUnmarshal(cctx, ldr);
-        }
-
         if (preloadEntries != null)
             unmarshalInfos(preloadEntries, ctx.cacheContext(cacheId), ldr);
     }
@@ -219,12 +187,6 @@ public Collection<GridCacheEntryInfo> preloadEntries() {
                 writer.incrementState();
 
             case 13:
-                if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG))
-                    return false;
-
-                writer.incrementState();
-
-            case 14:
                 if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG))
                     return false;
 
@@ -263,14 +225,6 @@ public Collection<GridCacheEntryInfo> preloadEntries() {
                 reader.incrementState();
 
             case 13:
-                nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG);
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
-            case 14:
                 preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG);
 
                 if (!reader.isLastRead())
@@ -290,7 +244,7 @@ public Collection<GridCacheEntryInfo> preloadEntries() {
 
     /** {@inheritDoc} */
     @Override public byte fieldsCount() {
-        return 15;
+        return 14;
     }
 
     /** {@inheritDoc} */