#ignite-683: Remove method putAllAsync(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/25a5f09a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25a5f09a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25a5f09a Branch: refs/heads/ignite-218 Commit: 25a5f09a25e328b6f2e0dee02abb22ff3a3b511a Parents: 0bc8cbc Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 13 13:50:45 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 13 13:50:45 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 32 +++++++------------- .../dht/atomic/GridDhtAtomicCache.java | 7 ++--- .../distributed/near/GridNearAtomicCache.java | 5 ++- .../local/atomic/GridLocalAtomicCache.java | 5 ++- 4 files changed, 18 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25a5f09a/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 788d3d1..ad68409 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 @@ -1639,15 +1639,15 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, subjId = ctx.subjectIdPerCall(subjId, prj); return getAllAsync(keys, - true, - entry, - !skipTx, - subjId, - taskName, - deserializePortable, - forcePrimary, - skipVals ? null : expiryPolicy(prj != null ? prj.expiry() : null), - skipVals); + true, + entry, + !skipTx, + subjId, + taskName, + deserializePortable, + forcePrimary, + skipVals ? null : expiryPolicy(prj != null ? prj.expiry() : null), + skipVals); } /** @@ -2686,16 +2686,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m) { - return putAllAsync(m, CU.empty0()); - } - - /** - * @param m Map to put. - * @param filter Filter. - * @return Put future. - */ - public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m, - @Nullable final CacheEntryPredicate... filter) { if (F.isEmpty(m)) return new GridFinishedFuture<Object>(); @@ -2706,11 +2696,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return asyncOp(new AsyncInOp(m.keySet()) { @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter tx) { - return tx.putAllAsync(ctx, m, false, null, -1, filter).chain(RET2NULL); + return tx.putAllAsync(ctx, m, false, null, -1, CU.empty0()).chain(RET2NULL); } @Override public String toString() { - return "putAllAsync [map=" + m + ", filter=" + Arrays.toString(filter) + ']'; + return "putAllAsync [map=" + m + ']'; } }); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25a5f09a/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 729511f..d665855 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 @@ -440,12 +440,11 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> m) throws IgniteCheckedException { - putAllAsync(m, CU.empty0()).get(); + putAllAsync(m).get(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) { + @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m) { return updateAllAsync0(m, null, null, @@ -453,7 +452,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { null, false, false, - filter, + CU.empty0(), true).chain(RET2NULL); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25a5f09a/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 620be70..b817470 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 @@ -488,9 +488,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) { - return dht.putAllAsync(m, filter); + @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m) { + return dht.putAllAsync(m); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25a5f09a/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 6804580..c4735e3 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 @@ -276,14 +276,13 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) { + @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m) { return updateAllAsync0(m, null, null, false, false, - filter).chain(RET2NULL); + CU.empty0()).chain(RET2NULL); } /** {@inheritDoc} */
