#ignite-683: Remove filters from CacheProjection putAllAsync.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/10bd6d21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/10bd6d21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/10bd6d21 Branch: refs/heads/ignite-683 Commit: 10bd6d217049e3bc6bca939b060cc1569d88bd76 Parents: 23d7136 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Apr 8 00:30:49 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Apr 8 00:30:49 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheProjection.java | 10 ++-------- .../internal/processors/cache/GridCacheAdapter.java | 15 ++++++--------- .../processors/cache/GridCacheProjectionImpl.java | 10 ++++------ .../processors/cache/GridCacheProxyImpl.java | 10 ++++------ .../distributed/dht/atomic/GridDhtAtomicCache.java | 10 ++++------ .../cache/distributed/near/GridNearAtomicCache.java | 9 ++++----- .../cache/local/atomic/GridLocalAtomicCache.java | 10 ++++------ .../datastructures/GridAtomicCacheQueueImpl.java | 2 +- .../GridTransactionalCacheQueueImpl.java | 2 +- 9 files changed, 30 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10bd6d21/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java index 2e959d6..5feaadb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java @@ -794,12 +794,9 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * if there is one. * * @param m Key-value pairs to store in cache. - * @param filter Optional entry filter. If provided, then entry will - * be stored only if the filter returned {@code true}. * @throws IgniteCheckedException If put operation failed. */ - public void putAll(@Nullable Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; + public void putAll(@Nullable Map<? extends K, ? extends V> m) throws IgniteCheckedException; /** * Asynchronously stores given key-value pairs in cache. If filters are provided, then entries will @@ -813,12 +810,9 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * if there is one. * * @param m Key-value pairs to store in cache. - * @param filter Optional entry filter. If provided, then entry will - * be stored only if the filter returned {@code true}. * @return Future for putAll operation. */ - public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate... filter); + public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m); /** * Set of keys cached on this node. You can remove elements from this set, but you cannot add elements http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10bd6d21/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 0481f7b..8a7b639 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 @@ -461,7 +461,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param isolation Transaction isolation. * @param invalidate Invalidate flag. * @param accessTtl TTL for read operation. - * @param filter Optional filter. * @return Locks future. */ public abstract IgniteInternalFuture<Boolean> txLockAsync( @@ -2794,8 +2793,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public void putAll(@Nullable final Map<? extends K, ? extends V> m, - final CacheEntryPredicate[] filter) throws IgniteCheckedException { + @Override public void putAll(@Nullable final Map<? extends K, ? extends V> m) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; @@ -2810,11 +2808,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, filter).get(); + tx.putAllAsync(ctx, m, false, null, null).get(); } @Override public String toString() { - return "putAll [map=" + m + ", filter=" + Arrays.toString(filter) + ']'; + return "putAll [map=" + m + ']'; } }); @@ -2823,8 +2821,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m, - @Nullable final CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m) { if (F.isEmpty(m)) return new GridFinishedFuture<Object>(); @@ -2835,11 +2832,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, filter).chain(RET2NULL); + return tx.putAllAsync(ctx, m, false, null, 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/10bd6d21/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 26cb783..edf0943 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -502,15 +502,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void putAll(Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { - putAllAsync(m, filter).get(); + @Override public void putAll(Map<? extends K, ? extends V> m) throws IgniteCheckedException { + putAllAsync(m).get(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) { - return cache.putAllAsync(m, filter); + @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m) { + return cache.putAllAsync(m); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10bd6d21/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index b7665a3..c2a7f91 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -912,12 +912,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void putAll(@Nullable Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { + @Override public void putAll(@Nullable Map<? extends K, ? extends V> m) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - delegate.putAll(m, filter); + delegate.putAll(m); } finally { gate.leave(prev); @@ -925,12 +924,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) { + @Override public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.putAllAsync(m, filter); + return delegate.putAllAsync(m); } finally { gate.leave(prev); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10bd6d21/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 3b68223..b31d37a 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 @@ -460,14 +460,12 @@ 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).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, @@ -475,7 +473,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/10bd6d21/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 ab661ca..61c8629 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 @@ -503,15 +503,14 @@ 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} */ - @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/10bd6d21/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 3874b9d..a5cfff5 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 @@ -298,8 +298,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(), @@ -307,19 +306,18 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { expiryPerCall(), false, false, - filter, + CU.empty0(), ctx.writeThrough()); } /** {@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} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10bd6d21/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/10bd6d21/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; }
