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 195b9cb6e4828..ccd41cd6e5050 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 @@ -333,7 +333,6 @@ public EntryGetResult innerGetAndReserveForLoad(boolean updateMetrics, * @param oldValPresent {@code True} if oldValue present. * @param oldVal Old value. * @param topVer Topology version. - * @param filter Filter. * @param drType DR type. * @param drExpireTime DR expire time (if any). * @param explicitVer Explicit version (if any). @@ -359,7 +358,6 @@ public GridCacheUpdateTxResult innerSet( boolean oldValPresent, @Nullable CacheObject oldVal, AffinityTopologyVersion topVer, - CacheEntryPredicate[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion explicitVer, @@ -379,7 +377,6 @@ public GridCacheUpdateTxResult innerSet( * @param oldValPresent {@code True} if oldValue present. * @param oldVal Old value. * @param topVer Topology version. - * @param filter Filter. * @param drType DR type. * @param explicitVer Explicit version (if any). * @param taskName Task name. @@ -400,7 +397,6 @@ public GridCacheUpdateTxResult innerRemove( boolean oldValPresent, @Nullable CacheObject oldVal, AffinityTopologyVersion topVer, - CacheEntryPredicate[] filter, GridDrType drType, @Nullable GridCacheVersion explicitVer, String taskName, 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 fea3e4cd7e511..fba18aff20db0 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 @@ -986,7 +986,6 @@ protected void recordNodeId(UUID nodeId, AffinityTopologyVersion topVer) { boolean oldValPresent, @Nullable CacheObject oldVal, AffinityTopologyVersion topVer, - CacheEntryPredicate[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion explicitVer, @@ -998,10 +997,6 @@ protected void recordNodeId(UUID nodeId, AffinityTopologyVersion topVer) { final boolean valid = valid(tx != null ? tx.topologyVersion() : topVer); - // Lock should be held by now. - if (!cctx.isAll(this, filter)) - return new GridCacheUpdateTxResult(false); - final GridCacheVersion newVer; boolean intercept = cctx.config().getInterceptor() != null; @@ -1206,7 +1201,6 @@ protected Object keyValue(boolean cpy) { boolean oldValPresent, @Nullable CacheObject oldVal, AffinityTopologyVersion topVer, - CacheEntryPredicate[] filter, GridDrType drType, @Nullable GridCacheVersion explicitVer, String taskName, @@ -1221,10 +1215,6 @@ protected Object keyValue(boolean cpy) { final boolean valid = valid(tx != null ? tx.topologyVersion() : topVer); - // Lock should be held by now. - if (!cctx.isAll(this, filter)) - return new GridCacheUpdateTxResult(false); - GridCacheVersion obsoleteVer = null; boolean intercept = cctx.config().getInterceptor() != null; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index 0be4dca2f6327..9b5112af621a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -628,7 +628,6 @@ else if (conflictCtx.isMerge()) { txEntry.hasOldValue(), txEntry.oldValue(), topVer, - null, replicate ? DR_BACKUP : DR_NONE, near() ? null : explicitVer, resolveTaskName(), @@ -650,7 +649,6 @@ else if (conflictCtx.isMerge()) { txEntry.hasOldValue(), txEntry.oldValue(), topVer, - null, replicate ? DR_BACKUP : DR_NONE, txEntry.conflictExpireTime(), near() ? null : explicitVer, @@ -688,7 +686,6 @@ else if (op == DELETE) { txEntry.hasOldValue(), txEntry.oldValue(), topVer, - null, replicate ? DR_BACKUP : DR_NONE, near() ? null : explicitVer, resolveTaskName(), 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 ded81ed40f2bc..4f19378c1cbf0 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 @@ -33,7 +33,6 @@ import org.apache.ignite.internal.NodeStoppingException; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; import org.apache.ignite.internal.processors.cache.CacheInvalidStateException; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.CacheOperationContext; @@ -737,7 +736,6 @@ else if (txLockMsgLog.isDebugEnabled()) { isolation, createTtl, accessTtl, - CU.empty0(), opCtx != null && opCtx.skipStore(), opCtx != null && opCtx.isKeepBinary()); } @@ -754,7 +752,6 @@ else if (txLockMsgLog.isDebugEnabled()) { * @param isolation Transaction isolation. * @param createTtl TTL for create operation. * @param accessTtl TTL for read operation. - * @param filter Optional filter. * @param skipStore Skip store flag. * @return Lock future. */ @@ -767,7 +764,6 @@ public GridDhtFuture lockAllAsyncInternal(@Nullable Collection obtainLockAsync( isolation, createTtl, accessTtl, - CU.empty0(), skipStore, keepBinary); 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 fd3dee277c647..0c67626cb24cc 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 @@ -30,7 +30,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.CacheOperationContext; import org.apache.ignite.internal.processors.cache.EntryGetResult; @@ -659,7 +658,6 @@ else if (!skipVals && ctx.statisticsEnabled()) timeout, createTtl, accessTtl, - CU.empty0(), opCtx != null && opCtx.skipStore(), opCtx != null && opCtx.isKeepBinary(), opCtx != null && opCtx.recovery()); @@ -903,7 +901,6 @@ public void removeLocks(long threadId, GridCacheVersion ver, Collection lockAllAsync( final long timeout, final long createTtl, final long accessTtl, - @Nullable final CacheEntryPredicate[] filter, final boolean skipStore, final boolean keepBinary ) { @@ -944,7 +940,6 @@ IgniteInternalFuture lockAllAsync( timeout, createTtl, accessTtl, - filter, skipStore, keepBinary); } @@ -966,7 +961,6 @@ IgniteInternalFuture lockAllAsync( timeout, createTtl, accessTtl, - filter, skipStore, keepBinary); } @@ -987,7 +981,6 @@ IgniteInternalFuture lockAllAsync( * @param timeout Lock timeout. * @param createTtl TTL for create operation. * @param accessTtl TTL for read operation. - * @param filter filter Optional filter. * @param skipStore Skip store flag. * @return Lock future. */ @@ -1003,7 +996,6 @@ private IgniteInternalFuture lockAllAsync0( final long timeout, final long createTtl, final long accessTtl, - @Nullable final CacheEntryPredicate[] filter, boolean skipStore, boolean keepBinary) { int cnt = keys.size(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 1baa667c04d6a..1059edb4b430b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -39,7 +39,6 @@ import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; import org.apache.ignite.internal.processors.cache.CacheInvalidStateException; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.CacheOperationContext; @@ -146,9 +145,6 @@ public final class GridDhtColocatedLockFuture extends GridCacheCompoundIdentityF /** Lock timeout. */ private final long timeout; - /** Filter. */ - private final CacheEntryPredicate[] filter; - /** Transaction. */ @GridToStringExclude private final GridNearTxLocal tx; @@ -198,7 +194,6 @@ public final class GridDhtColocatedLockFuture extends GridCacheCompoundIdentityF * @param timeout Lock acquisition timeout. * @param createTtl TTL for create operation. * @param accessTtl TTL for read operation. - * @param filter Filter. * @param skipStore Skip store flag. */ public GridDhtColocatedLockFuture( @@ -210,7 +205,6 @@ public GridDhtColocatedLockFuture( long timeout, long createTtl, long accessTtl, - CacheEntryPredicate[] filter, boolean skipStore, boolean keepBinary, boolean recovery @@ -227,7 +221,6 @@ public GridDhtColocatedLockFuture( this.timeout = timeout; this.createTtl = createTtl; this.accessTtl = accessTtl; - this.filter = filter; this.skipStore = skipStore; this.keepBinary = keepBinary; this.recovery = recovery; @@ -1037,15 +1030,6 @@ private synchronized void map0( if (entry == null) entry = cctx.colocated().entryExx(key, topVer, true); - if (!cctx.isAll(entry, filter)) { - if (log.isDebugEnabled()) - log.debug("Entry being locked did not pass filter (will not lock): " + entry); - - onComplete(false, false); - - return; - } - assert loc ^ entry.detached() : "Invalid entry [loc=" + loc + ", entry=" + entry + ']'; GridCacheMvccCandidate cand = addEntry(entry); @@ -1219,9 +1203,6 @@ private void proceedMapping0() final Collection mappedKeys = map.distributedKeys(); final ClusterNode node = map.node(); - if (filter != null && filter.length != 0) - req.filter(filter); - if (node.isLocal()) lockLocally(mappedKeys, req.topologyVersion()); else { @@ -1271,7 +1252,6 @@ private void lockLocally( timeout, createTtl, accessTtl, - filter, skipStore, keepBinary); @@ -1400,15 +1380,6 @@ private boolean addLocalKey( assert !entry.detached(); - if (!cctx.isAll(entry, filter)) { - if (log.isDebugEnabled()) - log.debug("Entry being locked did not pass filter (will not lock): " + entry); - - onComplete(false, false); - - return false; - } - GridCacheMvccCandidate cand = addEntry(entry); if (cand != null && !cand.reentry()) 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 07590718dcce4..ee1ec02e8b480 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 @@ -38,7 +38,6 @@ import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.CacheStoppedException; import org.apache.ignite.internal.processors.cache.GridCacheCompoundIdentityFuture; @@ -132,9 +131,6 @@ public final class GridNearLockFuture extends GridCacheCompoundIdentityFuture keys, boolean remap, boolean topLocked try { entry = cctx.near().entryExx(key, topVer); - if (!cctx.isAll(entry, filter)) { - if (log.isDebugEnabled()) - log.debug("Entry being locked did not pass filter (will not lock): " + entry); - - onComplete(false, false); - - return; - } - // Removed exception may be thrown here. GridCacheMvccCandidate cand = addEntry( topVer, @@ -1213,9 +1173,6 @@ private void proceedMapping0() final Collection mappedKeys = map.distributedKeys(); final ClusterNode node = map.node(); - if (filter != null && filter.length != 0) - req.filter(filter); - if (node.isLocal()) { req.miniId(-1); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index 6106872d83474..ce1b4d6b71769 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -19,13 +19,8 @@ import java.io.Externalizable; import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.UUID; -import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; -import org.apache.ignite.internal.processors.cache.GridCacheContext; -import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; @@ -64,9 +59,6 @@ public class GridNearLockRequest extends GridDistributedLockRequest { /** Mini future ID. */ private int miniId; - /** Filter. */ - private CacheEntryPredicate[] filter; - /** Array of mapped DHT versions for this entry. */ @GridToStringInclude private GridCacheVersion[] dhtVers; @@ -240,20 +232,6 @@ public boolean syncCommit() { return isFlag(SYNC_COMMIT_FLAG_MASK); } - /** - * @return Filter. - */ - public CacheEntryPredicate[] filter() { - return filter; - } - - /** - * @param filter Filter. - */ - public void filter(CacheEntryPredicate[] filter) { - this.filter = filter; - } - /** * @return Mini future ID. */ @@ -318,34 +296,6 @@ public long accessTtl() { return txLbl; } - /** {@inheritDoc} */ - @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { - super.prepareMarshal(ctx); - - if (filter != null) { - GridCacheContext cctx = ctx.cacheContext(cacheId); - - for (CacheEntryPredicate p : filter) { - if (p != null) - p.prepareMarshal(cctx); - } - } - } - - /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { - super.finishUnmarshal(ctx, ldr); - - if (filter != null) { - GridCacheContext cctx = ctx.cacheContext(cacheId); - - for (CacheEntryPredicate p : filter) { - if (p != null) - p.finishUnmarshal(cctx, ldr); - } - } - } - /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); @@ -380,36 +330,30 @@ public long accessTtl() { writer.incrementState(); case 24: - if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG)) - return false; - - writer.incrementState(); - - case 25: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 26: + case 25: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 27: + case 26: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 28: + case 27: if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 29: + case 28: if (!writer.writeString("txLbl", txLbl)) return false; @@ -455,14 +399,6 @@ public long accessTtl() { reader.incrementState(); case 24: - filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 25: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -470,7 +406,7 @@ public long accessTtl() { reader.incrementState(); - case 26: + case 25: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -478,7 +414,7 @@ public long accessTtl() { reader.incrementState(); - case 27: + case 26: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -486,7 +422,7 @@ public long accessTtl() { reader.incrementState(); - case 28: + case 27: topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) @@ -494,7 +430,7 @@ public long accessTtl() { reader.incrementState(); - case 29: + case 28: txLbl = reader.readString("txLbl"); if (!reader.isLastRead()) @@ -514,12 +450,11 @@ public long accessTtl() { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 30; + return 29; } /** {@inheritDoc} */ @Override public String toString() { - return S.toString(GridNearLockRequest.class, this, "filter", Arrays.toString(filter), - "super", super.toString()); + return S.toString(GridNearLockRequest.class, this, "super", super.toString()); } } 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 4494fda136a6d..f4cdf274b98c0 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 @@ -302,7 +302,6 @@ private void processLockResponse(UUID nodeId, GridNearLockResponse res) { timeout, createTtl, accessTtl, - CU.empty0(), opCtx != null && opCtx.skipStore(), opCtx != null && opCtx.isKeepBinary(), opCtx != null && opCtx.recovery()); 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 6798c08fc9e4a..e414eedd07140 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 @@ -3885,7 +3885,6 @@ public IgniteInternalFuture lockAllAsync(GridCacheContext c isolation, createTtl, accessTtl, - CU.empty0(), skipStore, keepBinary); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index ff71005cd2a05..b45173c8c7044 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -707,7 +707,6 @@ else if (conflictCtx.isUseNew()) { txEntry.hasOldValue(), txEntry.oldValue(), topVer, - null, cached.detached() ? DR_NONE : drType, txEntry.conflictExpireTime(), cached.isNear() ? null : explicitVer, @@ -740,7 +739,6 @@ else if (conflictCtx.isUseNew()) { txEntry.hasOldValue(), txEntry.oldValue(), topVer, - CU.empty0(), DR_NONE, txEntry.conflictExpireTime(), null, @@ -762,7 +760,6 @@ else if (op == DELETE) { txEntry.hasOldValue(), txEntry.oldValue(), topVer, - null, cached.detached() ? DR_NONE : drType, cached.isNear() ? null : explicitVer, resolveTaskName(), @@ -790,7 +787,6 @@ else if (op == DELETE) { txEntry.hasOldValue(), txEntry.oldValue(), topVer, - CU.empty0(), DR_NONE, null, resolveTaskName(), diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index c73b963482347..f7a399dfab6b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -451,7 +451,6 @@ void recheckLock() { boolean hasOldVal, @Nullable CacheObject oldVal, AffinityTopologyVersion topVer, - CacheEntryPredicate[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion drVer, @@ -513,7 +512,6 @@ void recheckLock() { boolean oldValPresent, @Nullable CacheObject oldVal, AffinityTopologyVersion topVer, - CacheEntryPredicate[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, String taskName, diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/consistency/ReadRepairDataGenerator.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/consistency/ReadRepairDataGenerator.java index f73ed0f31a8b9..441fbbcc267cf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/consistency/ReadRepairDataGenerator.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/consistency/ReadRepairDataGenerator.java @@ -54,7 +54,6 @@ import org.apache.ignite.internal.processors.dr.GridDrType; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.T2; -import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.JUnitAssertAware; import org.mockito.ArgumentMatchers; @@ -411,7 +410,6 @@ private InconsistentMapping setDifferentValuesForSameKey( false, null, AffinityTopologyVersion.NONE, - CU.empty0(), GridDrType.DR_NONE, null, null,