You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/13 13:09:52 UTC
[1/4] incubator-ignite git commit: #ignite-683: Remove method
putAll(Map m,
CacheEntryPredicate[] filter) from GridCacheAdapter.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-683-2 edb0e3fc3 -> 8113edd05
#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-683-2
Commit: 0bc8cbc6583f5a94810149dceba78c1ac373f8b4
Parents: edb0e3f
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 13 13:46:37 2015 +0300
Committer: ivasilinets <iv...@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;
}
[3/4] incubator-ignite git commit: #ignite-683: Remove method
removex(final K key, CacheEntryPredicate... filter) from GridCacheAdapter.
Posted by sb...@apache.org.
#ignite-683: Remove method removex(final 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/db252df6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db252df6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db252df6
Branch: refs/heads/ignite-683-2
Commit: db252df6bb542519450ad06a5986345a0b17d609
Parents: 25a5f09
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 13 13:56:12 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Apr 13 13:56:12 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 26 +++-----------------
.../dht/atomic/GridDhtAtomicCache.java | 4 +--
.../distributed/near/GridNearAtomicCache.java | 4 +--
.../local/atomic/GridLocalAtomicCache.java | 4 +--
4 files changed, 9 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db252df6/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 ad68409..c0f6a62 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
@@ -2823,27 +2823,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public boolean removex(final K key)
- throws IgniteCheckedException {
- boolean statsEnabled = ctx.config().isStatisticsEnabled();
-
- long start = statsEnabled ? System.nanoTime() : 0L;
-
- boolean rmv = removex(key, CU.empty0());
-
- if (statsEnabled && rmv)
- metrics0().addRemoveTimeNanos(System.nanoTime() - start);
-
- return rmv;
- }
-
- /**
- * @param key Key to remove.
- * @param filter Optional filter.
- * @return Previous value.
- * @throws IgniteCheckedException If failed.
- */
- public boolean removex(final K key, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException {
+ @Override public boolean removex(final K key) throws IgniteCheckedException {
boolean statsEnabled = ctx.config().isStatisticsEnabled();
long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2855,11 +2835,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
boolean rmv = syncOp(new SyncOp<Boolean>(true) {
@Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException {
- return tx.removeAllAsync(ctx, Collections.singletonList(key), null, false, filter).get().success();
+ return tx.removeAllAsync(ctx, Collections.singletonList(key), null, false, CU.empty0()).get().success();
}
@Override public String toString() {
- return "removex [key=" + key + ", filter=" + Arrays.toString(filter) + ']';
+ return "removex [key=" + key + ']';
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db252df6/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 d665855..614770e 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
@@ -503,8 +503,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public boolean removex(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException {
- return removexAsync(key, filter).get();
+ @Override public boolean removex(K key) throws IgniteCheckedException {
+ return removexAsync(key, CU.empty0()).get();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db252df6/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 b817470..ce19bb4 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
@@ -568,8 +568,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public boolean removex(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException {
- return dht.removex(key, filter);
+ @Override public boolean removex(K key) throws IgniteCheckedException {
+ return dht.removex(key);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db252df6/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 c4735e3..fd0c4cf 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
@@ -326,7 +326,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override public boolean removex(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException {
+ @Override public boolean removex(K key) throws IgniteCheckedException {
boolean statsEnabled = ctx.config().isStatisticsEnabled();
long start = statsEnabled ? System.nanoTime() : 0L;
@@ -340,7 +340,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
expiryPerCall(),
false,
false,
- filter,
+ CU.empty0(),
ctx.writeThrough());
if (statsEnabled && rmv)
[4/4] incubator-ignite git commit: #ignite-683: Remove method evict(K
key, CacheEntryPredicate[] filter) and evictAll(Collection keys,
CacheEntryPredicate[] filter) from GridCacheAdapter.
Posted by sb...@apache.org.
#ignite-683: Remove method evict(K key, CacheEntryPredicate[] filter) and evictAll(Collection<? extends K> keys, 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/8113edd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8113edd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8113edd0
Branch: refs/heads/ignite-683-2
Commit: 8113edd05bbc2a84df64c31ef7b038c4106f6a32
Parents: db252df
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 13 14:04:44 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Apr 13 14:04:44 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 43 ++++++--------------
.../distributed/near/GridNearCacheAdapter.java | 11 +++--
2 files changed, 18 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8113edd0/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 c0f6a62..c2ea41a 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
@@ -924,7 +924,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/** {@inheritDoc} */
@Override public Set<Cache.Entry<K, V>> entrySet() {
- return entrySet((CacheEntryPredicate[])null);
+ return entrySet((CacheEntryPredicate[]) null);
}
/** {@inheritDoc} */
@@ -939,17 +939,17 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/** {@inheritDoc} */
@Override public Set<K> keySet() {
- return keySet((CacheEntryPredicate[])null);
+ return keySet((CacheEntryPredicate[]) null);
}
/** {@inheritDoc} */
@Override public Set<K> primaryKeySet() {
- return primaryKeySet((CacheEntryPredicate[])null);
+ return primaryKeySet((CacheEntryPredicate[]) null);
}
/** {@inheritDoc} */
@Override public Collection<V> values() {
- return values((CacheEntryPredicate[])null);
+ return values((CacheEntryPredicate[]) null);
}
/**
@@ -1271,7 +1271,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return getAllAsync(Collections.singletonList(key), /*force primary*/true, /*skip tx*/false, null, null,
taskName, true, false).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
- @Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
+ @Override
+ public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException {
return e.get().get(key);
}
});
@@ -1478,16 +1479,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public boolean evict(K key) {
- return evict(key, (CacheEntryPredicate[])null);
- }
-
- /** {@inheritDoc} */
- @Override public void evictAll(Collection<? extends K> keys) {
- evictAll(keys, (CacheEntryPredicate[])null);
- }
-
- /** {@inheritDoc} */
@Nullable @Override public V get(K key) throws IgniteCheckedException {
A.notNull(key, "key");
@@ -4376,26 +4367,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return clearLocally(ctx.versions().next(), key, filter);
}
- /**
- * @param key Key.
- * @param filter Filters to evaluate.
- * @return {@code True} if evicted.
- */
- public boolean evict(K key, @Nullable CacheEntryPredicate... filter) {
+ /** {@inheritDoc} */
+ @Override public boolean evict(K key) {
A.notNull(key, "key");
if (keyCheck)
validateCacheKey(key);
- return evictx(key, ctx.versions().next(), filter);
+ return evictx(key, ctx.versions().next(), CU.empty0());
}
- /**
- * @param keys Keys.
- * @param filter Filters to evaluate.
- */
- public void evictAll(Collection<? extends K> keys,
- @Nullable CacheEntryPredicate... filter) {
+ /** {@inheritDoc} */
+ @Override public void evictAll(Collection<? extends K> keys) {
A.notNull(keys, "keys");
if (F.isEmpty(keys))
@@ -4406,7 +4389,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
GridCacheVersion obsoleteVer = ctx.versions().next();
- if (!ctx.evicts().evictSyncOrNearSync() && F.isEmptyOrNulls(filter) && ctx.isSwapOrOffheapEnabled()) {
+ if (!ctx.evicts().evictSyncOrNearSync() && ctx.isSwapOrOffheapEnabled()) {
try {
ctx.evicts().batchEvict(keys, obsoleteVer);
}
@@ -4416,7 +4399,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
else {
for (K k : keys)
- evictx(k, obsoleteVer, filter);
+ evictx(k, obsoleteVer, CU.empty0());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8113edd0/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 50f4fa7..f153bd6 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
@@ -387,17 +387,16 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
}
/** {@inheritDoc} */
- @Override public boolean evict(K key, @Nullable CacheEntryPredicate[] filter) {
+ @Override public boolean evict(K key) {
// Use unary 'and' to make sure that both sides execute.
- return super.evict(key, filter) & dht().evict(key, filter);
+ return super.evict(key) & dht().evict(key);
}
/** {@inheritDoc} */
- @Override public void evictAll(Collection<? extends K> keys,
- @Nullable CacheEntryPredicate[] filter) {
- super.evictAll(keys, filter);
+ @Override public void evictAll(Collection<? extends K> keys) {
+ super.evictAll(keys);
- dht().evictAll(keys, filter);
+ dht().evictAll(keys);
}
/** {@inheritDoc} */
[2/4] incubator-ignite git commit: #ignite-683: Remove method
putAllAsync(Map m,
CacheEntryPredicate[] filter) from GridCacheAdapter.
Posted by sb...@apache.org.
#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-683-2
Commit: 25a5f09a25e328b6f2e0dee02abb22ff3a3b511a
Parents: 0bc8cbc
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Apr 13 13:50:45 2015 +0300
Committer: ivasilinets <iv...@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} */