Remove isFastMap method in GridDhtAtomicCache class because always returns false.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a61e5661 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a61e5661 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a61e5661 Branch: refs/heads/ignite-4587 Commit: a61e5661d182fec218f7a0ee6a3b8f484e9a7643 Parents: bc7a9bd Author: Max Kozlov <[email protected]> Authored: Mon Feb 27 14:40:22 2017 +0300 Committer: Max Kozlov <[email protected]> Committed: Mon Feb 27 14:40:22 2017 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridDhtAtomicCache.java | 14 +------------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a61e5661/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- 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 b5b1a30..b101b3e 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 @@ -1332,8 +1332,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { CacheEntryPredicate[] filters = CU.filterArray(filter); if (conflictPutVal == null && - conflictRmvVer == null && - !isFastMap(filters, op)) { + conflictRmvVer == null) { return new GridNearAtomicSingleUpdateFuture( ctx, this, @@ -1379,17 +1378,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** - * Whether this is fast-map operation. - * - * @param filters Filters. - * @param op Operation. - * @return {@code True} if fast-map. - */ - public boolean isFastMap(CacheEntryPredicate[] filters, GridCacheOperation op) { - return false; - } - - /** * Entry point for all public API remove methods. * * @param keys Keys to remove. http://git-wip-us.apache.org/repos/asf/ignite/blob/a61e5661/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 64163c8..5d12dce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -149,7 +149,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu this.conflictPutVals = conflictPutVals; this.conflictRmvVals = conflictRmvVals; - fastMap = cache.isFastMap(filter, op); + fastMap = false; } /** {@inheritDoc} */
