Ignite-54 globalClearAll() renamed to clear()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ed2b274 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ed2b274 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ed2b274 Branch: refs/heads/ignite-54 Commit: 2ed2b274e16421a6d5ac8c3c00af06776008de1a Parents: 7e31f6b Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jan 22 17:55:35 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jan 22 17:55:35 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 2 +- .../grid/cache/GridCacheProjection.java | 5 ++-- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheProjectionImpl.java | 4 +-- .../processors/cache/GridCacheProxyImpl.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 28 ++++++++++---------- .../GridCacheAbstractProjectionSelfTest.java | 6 ++--- .../cache/GridCacheGlobalClearAllSelfTest.java | 6 ++--- .../GridCacheMultiNodeAbstractTest.java | 2 +- ...heAbstractTransformWriteThroughSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../GridCacheNearPartitionedClearSelfTest.java | 4 +-- .../GridHibernateAccessStrategyAdapter.java | 8 +----- .../hibernate/GridHibernateL2CacheSelfTest.java | 2 +- .../cache/GridCacheQueryLoadSelfTest.java | 8 +++--- 15 files changed, 38 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 48d30a9..5f516fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -716,7 +716,7 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - delegate.globalClearAll(0); + delegate.clear(); } catch (IgniteCheckedException e) { throw cacheException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java index 2ca683e..3f7eda3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java @@ -1379,13 +1379,12 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * GridGain will make the best attempt to clear caches on all nodes. If some caches * could not be cleared, then exception will be thrown. * <p> - * This method is identical to calling {@link #globalClearAll(long) globalClearAll(0)}. + * This method is identical to calling {@link #globalClearAll(long) clear(0)}. * * @throws IgniteCheckedException In case of cache could not be cleared on any of the nodes. * @deprecated Deprecated in favor of {@link #globalClearAll(long)} method. */ - @Deprecated - public void globalClearAll() throws IgniteCheckedException; + public void clear() throws IgniteCheckedException; /** * Clears cache on all nodes that store it's data. That is, caches are cleared on remote http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 6b94c39..5e2f0b9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -1267,7 +1267,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } /** {@inheritDoc} */ - @Override public void globalClearAll() throws IgniteCheckedException { + @Override public void clear() throws IgniteCheckedException { globalClearAll(0); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java index e3925c4..aee7b11 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java @@ -1034,8 +1034,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void globalClearAll() throws IgniteCheckedException { - cache.globalClearAll(); + @Override public void clear() throws IgniteCheckedException { + cache.clear(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java index 9c85222..8faf3ce 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java @@ -1261,7 +1261,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void globalClearAll() throws IgniteCheckedException { + @Override public void clear() throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 12971e0..690692c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -1866,7 +1866,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract tx.close(); } - cache().globalClearAll(); + cache().clear(); // Same checks inside tx. tx = txEnabled() ? cache().txStart() : null; @@ -1940,7 +1940,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract tx.close(); } - cache().globalClearAll(); + cache().clear(); // Same checks inside tx. tx = txEnabled() ? cache().txStart() : null; @@ -1999,7 +1999,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract tx.close(); } - cache().globalClearAll(); + cache().clear(); // Same checks inside tx. tx = txEnabled() ? cache().txStart() : null; @@ -2078,7 +2078,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache().get("key2")); - cache().globalClearAll(); + cache().clear(); // Same checks inside tx. tx = inTx ? cache().txStart() : null; @@ -2187,7 +2187,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract tx.close(); } - cache().globalClearAll(); + cache().clear(); tx = txEnabled() ? cache().txStart() : null; @@ -2249,7 +2249,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert cache().get("key") == 5; - cache().globalClearAll(); + cache().clear(); tx = txEnabled() ? cache().txStart() : null; @@ -2324,7 +2324,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert cache().get("key") == 5; - cache().globalClearAll(); + cache().clear(); tx = txEnabled() ? cache().txStart() : null; @@ -2387,7 +2387,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert cache().get("key") == 5; - cache().globalClearAll(); + cache().clear(); tx = txEnabled() ? cache().txStart() : null; @@ -2848,7 +2848,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.peek(key)); - cache.globalClearAll(); + cache.clear(); assertNull(cache.peek(key)); @@ -2966,7 +2966,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.reloadAll(F.asList(keysArr)); - cache.globalClearAll(); + cache.clear(); cache.reloadAll(keys); @@ -3023,7 +3023,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.globalClearAll(); + cache.clear(); cache.reloadAllAsync(keys).get(); @@ -3161,7 +3161,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (Integer k : keys) cache.put(k, k); - cache.globalClearAll(); + cache.clear(); for (int g = 0; g < gridCount(); g++) { Ignite grid0 = grid(g); @@ -3207,7 +3207,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (Integer k : keys) cache.put(k, k + 1); - cache.globalClearAll(); + cache.clear(); for (int g = 0; g < gridCount(); g++) { Ignite grid0 = grid(g); @@ -3325,7 +3325,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache(i).put(key, 1); } - cache().globalClearAll(); + cache().clear(); for (int i = 0; i < gridCount(); i++) assert cache(i).isEmpty(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java index 5055419..adae61b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -348,7 +348,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr assert locPrj.containsKey("key"); - locPrj.globalClearAll(); + locPrj.clear(); assert !locPrj.containsKey("key"); } @@ -490,9 +490,9 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr @Override public void apply() { try { - readPrj.globalClearAll(); + readPrj.clear(); } catch (IgniteCheckedException e) { - log.error("globalClearAll method failed", e); + log.error("clear method failed", e); } } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java index e973ffa..b26a64e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java @@ -29,7 +29,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; /** - * Test {@link GridCache#globalClearAll()} operation in multinode environment with nodes + * Test {@link GridCache#clear()} operation in multinode environment with nodes * having caches with different names. */ public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest { @@ -131,7 +131,7 @@ public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest { } /** - * Ensure that globalClearAll() clears correct cache and is only executed on nodes with the cache excluding + * Ensure that clear() clears correct cache and is only executed on nodes with the cache excluding * master-node where it is executed locally. * * @throws Exception If failed. @@ -155,7 +155,7 @@ public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest { assert grid(GRID_CNT - 1).cache(CACHE_NAME_OTHER).size() == KEY_CNT_OTHER; // Perform clear. - grid(0).cache(CACHE_NAME).globalClearAll(); + grid(0).cache(CACHE_NAME).clear(); // Expect caches with the given name to be clear on all nodes. for (int i = 0; i < GRID_CNT - 1; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index 5e1041d..66ff5b4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -409,7 +409,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT assert cache2.size() == 3; assert cache3.size() == 3; - cache1.globalClearAll(); + cache1.clear(); assert cache1.isEmpty(); assert cache2.isEmpty(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java index 5f6dafe..5814221 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java @@ -251,7 +251,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri nearStore.reset(); - cache(0).globalClearAll(); + cache(0).clear(); info(">>> Starting transform transaction"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index 0569e8c..f8976d8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -219,7 +219,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio cache(i).put(key, 1); } - cache().globalClearAll(); + cache().clear(); for (int i = 0; i < gridCount(); i++) assertTrue(String.valueOf(cache(i).entrySet()), cache(i).isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java index 7c0e5bd..66c70de 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java @@ -104,7 +104,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes int key = primaryKey0(grid(0), cache); cache.putx(key, 1); - cache.globalClearAll(); + cache.clear(); for (int i = 0; i < GRID_CNT; i++) { GridCache cache0 = cacheForIndex(i); @@ -115,7 +115,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes } cache.putx(key, 1); - cache.globalClearAll(); + cache.clear(); assertEquals(0, cache.size()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java index a9cfa49..62b7075 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java @@ -18,17 +18,11 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.util.typedef.internal.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.access.*; import org.jetbrains.annotations.*; -import java.io.*; -import java.util.concurrent.*; - /** * Common interface used to implement Hibernate L2 cache access strategies ({@link RegionAccessStrategy}, * {@link EntityRegionAccessStrategy} and {@link CollectionRegionAccessStrategy}). @@ -300,7 +294,7 @@ public abstract class GridHibernateAccessStrategyAdapter { */ static void evictAll(GridCacheProjection<Object,Object> cache) throws CacheException { try { - cache.globalClearAll(); + cache.clear(); } catch (IgniteCheckedException e) { throw new CacheException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java index 862db45..96ff26b 100644 --- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java +++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java @@ -1917,6 +1917,6 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest { sesFactory2 = null; for (GridCache<?, ?> cache : grid(0).caches()) - cache.globalClearAll(); + cache.clear(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ed2b274/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java index ea94cdf..6b69899 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -251,7 +251,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { assert res.size() == PUT_CNT - 5; assert size(ValueObject.class) == PUT_CNT - 5; - cache.globalClearAll(); + cache.clear(); assert cache.isEmpty(); assertEquals(0, cache.size()); @@ -292,7 +292,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { assert res.size() == PUT_CNT - 5; assert size(ValueObject.class) == PUT_CNT - 5; - cache.globalClearAll(); + cache.clear(); assert cache.isEmpty(); assertEquals(0, cache.size()); @@ -324,7 +324,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < PUT_CNT; i++) keys[i] = i; - cache.globalClearAll(); + cache.clear(); assert cache.isEmpty(); assertEquals(0, cache.size()); @@ -361,7 +361,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { for (int i = 0; i < PUT_CNT; i++) keys[i] = i; - cache.globalClearAll(); + cache.clear(); assert cache.isEmpty(); assertEquals(0, cache.size());
