ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [05/22] ignite git commit: Removed "localRemoveAll".
Date Fri, 01 Apr 2016 08:24:50 GMT
Removed "localRemoveAll".


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b7ad1d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b7ad1d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b7ad1d4

Branch: refs/heads/ignite-2931
Commit: 6b7ad1d40405196196d2729da9068815b84c4186
Parents: 7524efa
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Mar 31 17:36:53 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Mar 31 17:36:53 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 22 --------------------
 .../dht/atomic/GridDhtAtomicCache.java          |  5 -----
 .../distributed/near/GridNearAtomicCache.java   |  5 -----
 .../distributed/near/GridNearCacheAdapter.java  |  8 -------
 4 files changed, 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7ad1d4/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 7cc6f5f..0e4bb2c 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
@@ -3276,28 +3276,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
         return fut;
     }
 
-    /**
-     * @param filter Filter.
-     * @return Future.
-     */
-    public IgniteInternalFuture<?> localRemoveAll(final CacheEntryPredicate filter)
{
-        final Set<? extends K> keys = filter != null ? keySet(filter) : keySet();
-
-        return asyncOp(new AsyncInOp(keys) {
-            @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter tx)
{
-                return tx.removeAllAsync(ctx,
-                    keys,
-                    /*retval*/false,
-                    null,
-                    /*singleRmv*/false);
-            }
-
-            @Override public String toString() {
-                return "removeAllAsync [filter=" + filter + ']';
-            }
-        });
-    }
-
     /** {@inheritDoc} */
     @Override public CacheMetrics clusterMetrics() {
         return clusterMetrics(ctx.grid().cluster().forCacheNodes(ctx.name()));

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7ad1d4/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 1f5c817..6e759ee 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
@@ -675,11 +675,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<?> localRemoveAll(CacheEntryPredicate filter)
{
-        return removeAllAsync(keySet(filter));
-    }
-
-    /** {@inheritDoc} */
     @Override public void removeAllConflict(Map<KeyCacheObject, GridCacheVersion> conflictMap)
         throws IgniteCheckedException {
         removeAllConflictAsync(conflictMap).get();

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7ad1d4/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 63c073d..512de47 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
@@ -645,11 +645,6 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<?> localRemoveAll(CacheEntryPredicate filter)
{
-        return dht.localRemoveAll(filter);
-    }
-
-    /** {@inheritDoc} */
     @Override public void removeAllConflict(Map<KeyCacheObject, GridCacheVersion> drMap)
         throws IgniteCheckedException {
         dht.removeAllConflict(drMap);

http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7ad1d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 509f7d6..4ba9601 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -395,14 +395,6 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
         return new GridCacheKeySet<>(ctx, entrySet(filter), null);
     }
 
-    /**
-     * @param filter Entry filter.
-     * @return Keys for near cache only.
-     */
-    public Set<K> nearKeySet(@Nullable CacheEntryPredicate filter) {
-        return super.keySet(filter);
-    }
-
     /** {@inheritDoc} */
     @Override public Set<K> primaryKeySet() {
         return new GridCacheKeySet<>(ctx, primaryEntrySet(), null);


Mime
View raw message