ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [35/50] incubator-ignite git commit: #ignite-683: Remove method removeAsync(K key, CacheEntryPredicate... filter) from GridCacheAdapter.
Date Mon, 13 Apr 2015 17:40:23 GMT
#ignite-683: Remove method  removeAsync(K key, 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/aa1964f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa1964f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa1964f3

Branch: refs/heads/ignite-sprint-4
Commit: aa1964f3f8a62ad3ae9cdf5f51a8ef54c73bb3f9
Parents: 4229801
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Apr 13 13:12:34 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Apr 13 13:12:34 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java  | 15 +++------------
 .../distributed/dht/atomic/GridDhtAtomicCache.java   |  6 +++---
 .../cache/distributed/near/GridNearAtomicCache.java  |  4 ++--
 .../cache/local/atomic/GridLocalAtomicCache.java     |  4 ++--
 4 files changed, 10 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa1964f3/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 5efd0f8..6782ab7 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
@@ -2758,16 +2758,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<V> removeAsync(K key) {
-        return removeAsync(key, CU.empty0());
-    }
-
-    /**
-     * @param key Key to remove.
-     * @param filter Optional filter.
-     * @return Put operation future.
-     */
-    public IgniteInternalFuture<V> removeAsync(final K key, @Nullable final CacheEntryPredicate...
filter) {
+    @Override public IgniteInternalFuture<V> removeAsync(final K key) {
         final boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2780,12 +2771,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
         IgniteInternalFuture<V> fut = asyncOp(new AsyncOp<V>(key) {
             @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) {
                 // TODO should we invoke interceptor here?
-                return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true,
filter)
+                return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true,
CU.empty0())
                     .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn>,
V>) RET2VAL);
             }
 
             @Override public String toString() {
-                return "removeAsync [key=" + key + ", filter=" + Arrays.toString(filter)
+ ']';
+                return "removeAsync [key=" + key + ']';
             }
         });
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa1964f3/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 09b724e..502a3d1 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
@@ -481,15 +481,15 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @Override public V remove(K key) throws IgniteCheckedException {
-        return removeAsync(key, CU.empty0()).get();
+        return removeAsync(key).get();
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable CacheEntryPredicate...
filter) {
+    @Override public IgniteInternalFuture<V> removeAsync(K key) {
         A.notNull(key, "key");
 
-        return removeAllAsync0(Collections.singletonList(key), null, true, false, filter);
+        return removeAllAsync0(Collections.singletonList(key), null, true, false, CU.empty0());
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa1964f3/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 692f712..4721ca3 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
@@ -553,8 +553,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable CacheEntryPredicate...
filter) {
-        return dht.removeAsync(key, filter);
+    @Override public IgniteInternalFuture<V> removeAsync(K key) {
+        return dht.removeAsync(key);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa1964f3/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 7dcb3b1..c57085d 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
@@ -303,8 +303,8 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable CacheEntryPredicate...
filter) {
-        return removeAllAsync0(Collections.singletonList(key), true, false, filter);
+    @Override public IgniteInternalFuture<V> removeAsync(K key) {
+        return removeAllAsync0(Collections.singletonList(key), true, false, CU.empty0());
     }
 
     /** {@inheritDoc} */


Mime
View raw message