#ignite-683: Remove method putAll(Map<? extends K, ? extends V> m, CacheEntryPredicate[] filter) from GridCacheAdapter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bc8cbc6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bc8cbc6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bc8cbc6 Branch: refs/heads/ignite-218 Commit: 0bc8cbc6583f5a94810149dceba78c1ac373f8b4 Parents: edb0e3f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 13 13:46:37 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 13 13:46:37 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 14 ++------------ .../distributed/dht/atomic/GridDhtAtomicCache.java | 5 ++--- .../cache/distributed/near/GridNearAtomicCache.java | 4 ++-- .../cache/local/atomic/GridLocalAtomicCache.java | 5 ++--- .../datastructures/GridAtomicCacheQueueImpl.java | 2 +- .../GridTransactionalCacheQueueImpl.java | 2 +- 6 files changed, 10 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bc8cbc6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- 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 e16227a..788d3d1 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 @@ -2658,16 +2658,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public void putAll(@Nullable final Map<? extends K, ? extends V> m) throws IgniteCheckedException { - putAll(m, CU.empty0()); - } - - /** - * @param m Map to put. - * @param filter Filter. - * @throws IgniteCheckedException If put operation failed. - */ - public void putAll(@Nullable final Map<? extends K, ? extends V> m, - final CacheEntryPredicate[] filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; @@ -2682,11 +2672,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, syncOp(new SyncInOp(m.size() == 1) { @Override public void inOp(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - tx.putAllAsync(ctx, m, false, null, -1, filter).get(); + tx.putAllAsync(ctx, m, false, null, -1, CU.empty0()).get(); } @Override public String toString() { - return "putAll [map=" + m + ", filter=" + Arrays.toString(filter) + ']'; + return "putAll [map=" + m + ']'; } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bc8cbc6/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 8e4e3cb..729511f 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 @@ -439,9 +439,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void putAll(Map<? extends K, ? extends V> m, - CacheEntryPredicate[] filter) throws IgniteCheckedException { - putAllAsync(m, filter).get(); + @Override public void putAll(Map<? extends K, ? extends V> m) throws IgniteCheckedException { + putAllAsync(m, CU.empty0()).get(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bc8cbc6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- 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 c37acf1..620be70 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 @@ -482,9 +482,9 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void putAll(Map<? extends K, ? extends V> m, CacheEntryPredicate[] filter) + @Override public void putAll(Map<? extends K, ? extends V> m) throws IgniteCheckedException { - dht.putAll(m, filter); + dht.putAll(m); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bc8cbc6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 1b6d683..6804580 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -263,8 +263,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void putAll(Map<? extends K, ? extends V> m, - CacheEntryPredicate[] filter) throws IgniteCheckedException { + @Override public void putAll(Map<? extends K, ? extends V> m) throws IgniteCheckedException { updateAllInternal(UPDATE, m.keySet(), m.values(), @@ -272,7 +271,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { expiryPerCall(), false, false, - filter, + CU.empty0(), ctx.writeThrough()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bc8cbc6/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java index 83f646c..a2c8f8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java @@ -161,7 +161,7 @@ public class GridAtomicCacheQueueImpl<T> extends GridCacheQueueAdapter<T> { while (true) { try { - cache.putAll(putMap, null); + cache.putAll(putMap); break; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bc8cbc6/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java index c14011c..f2eaa9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java @@ -165,7 +165,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T> idx++; } - cache.putAll(putMap, null); + cache.putAll(putMap); retVal = true; }
