#ignite-683: Remove unused methods evictAll.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/554ff4ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/554ff4ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/554ff4ff Branch: refs/heads/ignite-683-2 Commit: 554ff4ffbb571ea7f1c310bd0f36825c3881c33b Parents: 048ba0d Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 9 19:02:40 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 9 19:02:40 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheProjection.java | 10 ---------- .../internal/processors/cache/GridCacheAdapter.java | 5 ----- .../processors/cache/GridCacheProjectionImpl.java | 5 ----- .../internal/processors/cache/GridCacheProxyImpl.java | 12 ------------ .../cache/GridCacheAbstractFullApiSelfTest.java | 10 +++++----- .../GridCacheSequenceApiSelfAbstractTest.java | 2 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +- 7 files changed, 7 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/554ff4ff/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 2fbb46f..d68adcf 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 @@ -935,16 +935,6 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { public boolean evict(K key); /** - * Attempts to evict all cache entries. Note, that entry will be - * evicted only if it's not used (not participating in any locks or - * transactions). - * <p> - * If {@link org.apache.ignite.configuration.CacheConfiguration#isSwapEnabled()} is set to {@code true}, the evicted entry will - * be swapped to offheap, and then to disk. - * */ - public void evictAll(); - - /** * Attempts to evict all entries associated with keys. Note, * that entry will be evicted only if it's not used (not * participating in any locks or transactions). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/554ff4ff/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 6f61fa9..8dcbe5e 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 @@ -1510,11 +1510,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public void evictAll() { - evictAll(keySet()); - } - - /** {@inheritDoc} */ @Override public void evictAll(Collection<? extends K> keys) { evictAll(keys, (CacheEntryPredicate[])null); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/554ff4ff/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 f3b38f9..a163340 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 @@ -542,11 +542,6 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void evictAll() { - cache.evictAll(keySet()); - } - - /** {@inheritDoc} */ @Override public void clearLocally() { cache.clearLocally(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/554ff4ff/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 93090f0..0ed5a04 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 @@ -1025,18 +1025,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void evictAll() { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - delegate.evictAll(); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public void clearLocally() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/554ff4ff/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index b1dd3ab..4e782e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -3443,8 +3443,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract }, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED); } - assert cache.evict(k2); - assert cache.evict(k3); + cache.evictAll(Collections.singleton(k2)); + cache.evictAll(Collections.singleton(k3)); assertNotNull(cache.localPeek(k1, new CachePeekMode[] {CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP}, null)); assertNull(cache.localPeek(k2, new CachePeekMode[] {CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP}, null)); @@ -3485,7 +3485,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(cnt, swapEvts.get()); assertEquals(cnt, unswapEvts.get()); - assert cache.evict(k1); + cache.evictAll(Collections.singleton(k1)); assertEquals((Integer)1, cache.get(k1)); @@ -3505,8 +3505,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract swapEvts.set(0); unswapEvts.set(0); - cache.evict(k2); - cache.evict(k3); + cache.evictAll(Collections.singleton(k2)); + cache.evictAll(Collections.singleton(k3)); assertNotNull(cache.localPeek(k1, new CachePeekMode[] {CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP}, null)); assertNull(cache.localPeek(k2, new CachePeekMode[] {CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP}, null)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/554ff4ff/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java index 0c923a9..49e78c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java @@ -319,7 +319,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends IgniteAtomics assertNotNull(cache); - cache.evictAll(); + cache.evictAll(cache.keySet()); assert null != cache.get(new GridCacheInternalKeyImpl(locSeqName)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/554ff4ff/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index ad41bc5..b9bd6df 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -101,7 +101,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { for (int i = 0; i < cnt; i++) { assertNotNull(localPeek(cache, i)); - cache.evict(i); // Swap. + cache.evictAll(Collections.singleton(i)); // Swap. } CacheQuery<Map.Entry<Integer, ObjectValue>> qry =
