Ignite-54 clearAll() renamed to clearLocally()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e31f6b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e31f6b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e31f6b6 Branch: refs/heads/ignite-54 Commit: 7e31f6b669171fb43f7f557a2f4ee426137578af Parents: 8241e41 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jan 22 17:38:28 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jan 22 17:38:28 2015 +0300 ---------------------------------------------------------------------- .../ScalarCachePopularNumbersExample.scala | 2 +- ...GridClientAbstractMultiThreadedSelfTest.java | 3 +- .../integration/GridClientAbstractSelfTest.java | 4 +-- .../rest/GridAbstractRestProcessorSelfTest.java | 2 +- .../rest/GridRestBinaryProtocolSelfTest.java | 6 ++-- .../rest/GridRestMemcacheProtocolSelfTest.java | 7 ++--- .../client/GridClientTcpSslLoadTest.java | 2 +- .../grid/cache/GridCacheProjection.java | 6 ++-- .../processors/cache/GridCacheAdapter.java | 12 ++++---- .../cache/GridCacheClearAllRunnable.java | 9 +++--- .../processors/cache/GridCacheMapAdapter.java | 3 +- .../cache/GridCacheProjectionImpl.java | 4 +-- .../processors/cache/GridCacheProxyImpl.java | 4 +-- .../near/GridNearCacheClearAllRunnable.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 32 ++++++++++---------- .../cache/GridCacheAbstractTxReadTest.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 8 ++--- ...acheBasicStoreMultithreadedAbstractTest.java | 2 +- .../cache/GridCacheClearAllSelfTest.java | 28 ++++++++--------- ...idCacheGetAndTransformStoreAbstractTest.java | 2 +- .../GridCacheWriteBehindStoreAbstractTest.java | 6 ++-- .../GridCacheBasicOpAbstractTest.java | 2 +- .../GridCacheMultiNodeLockAbstractTest.java | 2 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 +-- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- ...ReplicatedFullApiMultithreadedSelfTest1.java | 2 +- .../ggfs/GridGgfsDataManagerSelfTest.java | 4 +-- .../loadtests/cache/GridCacheBenchmark.java | 2 +- .../loadtests/cache/GridCacheLoadTest.java | 3 +- .../GridCacheWriteBehindStoreLoadTest.java | 2 +- ...idHibernateL2CacheConfigurationSelfTest.java | 2 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 2 +- 33 files changed, 85 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala index 39531d6..68f886f 100644 --- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala +++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala @@ -80,7 +80,7 @@ object ScalarCachePopularNumbersExample extends App { query(POPULAR_NUMBERS_CNT) // Clean up caches on all nodes after run. - grid$.cluster().forCache(CACHE_NAME).bcastRun(() => grid$.cache(CACHE_NAME).clearAll(), null) + grid$.cluster().forCache(CACHE_NAME).bcastRun(() => grid$.cache(CACHE_NAME).clearLocally(), null) } finally { popularNumbersQryTimer.cancel() http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java index dfa8a5b..33065d1 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.resources.*; import org.gridgain.client.balancer.*; import org.gridgain.client.impl.*; import org.gridgain.client.ssl.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; @@ -498,7 +497,7 @@ public abstract class GridClientAbstractMultiThreadedSelfTest extends GridCommon } for (Ignite g : gridMap.values()) - g.cache(PARTITIONED_CACHE_NAME).clearAll(); + g.cache(PARTITIONED_CACHE_NAME).clearLocally(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java index 58d6894..357a50f 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java @@ -131,8 +131,8 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest for (HashMapStore cacheStore : cacheStores.values()) cacheStore.map.clear(); - grid().cache(null).clearAll(); - grid().cache(CACHE_NAME).clearAll(); + grid().cache(null).clearLocally(); + grid().cache(CACHE_NAME).clearLocally(); INTERCEPTED_OBJECTS.clear(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java index 3f9c238..d718cf0 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java @@ -56,7 +56,7 @@ abstract class GridAbstractRestProcessorSelfTest extends GridCommonAbstractTest /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - cache().clearAll(); + cache().clearLocally(); assertTrue(cache().isEmpty()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java index 88392d1..d88288e 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java @@ -79,8 +79,8 @@ public class GridRestBinaryProtocolSelfTest extends GridCommonAbstractTest { @Override protected void afterTest() throws Exception { client.shutdown(); - grid().cache(null).clearAll(); - grid().cache(CACHE_NAME).clearAll(); + grid().cache(null).clearLocally(); + grid().cache(CACHE_NAME).clearLocally(); } /** {@inheritDoc} */ @@ -312,7 +312,7 @@ public class GridRestBinaryProtocolSelfTest extends GridCommonAbstractTest { assertTrue(grid().cache(null).putx("key2", "val1")); assertTrue(client.cacheReplace(null, "key2", "val2")); - grid().cache(null).clearAll(); + grid().cache(null).clearLocally(); assertFalse(client.cacheReplace(CACHE_NAME, "key1", "val1")); assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java index 3f590e5..04ab967 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.processors.rest; import junit.framework.*; import org.apache.ignite.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -72,8 +71,8 @@ public class GridRestMemcacheProtocolSelfTest extends GridCommonAbstractTest { @Override protected void afterTest() throws Exception { client.shutdown(); - grid().cache(null).clearAll(); - grid().cache(CACHE_NAME).clearAll(); + grid().cache(null).clearLocally(); + grid().cache(CACHE_NAME).clearLocally(); } /** {@inheritDoc} */ @@ -194,7 +193,7 @@ public class GridRestMemcacheProtocolSelfTest extends GridCommonAbstractTest { assertTrue(grid().cache(null).putx("key2", "val1")); assertTrue(client.cacheReplace(null, "key2", "val2")); - grid().cache(null).clearAll(); + grid().cache(null).clearLocally(); assertFalse(client.cacheReplace(CACHE_NAME, "key1", "val1")); assertTrue(grid().cache(CACHE_NAME).putx("key1", "val1")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/clients/src/test/java/org/gridgain/loadtests/client/GridClientTcpSslLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/loadtests/client/GridClientTcpSslLoadTest.java b/modules/clients/src/test/java/org/gridgain/loadtests/client/GridClientTcpSslLoadTest.java index a9115e7..f4de872 100644 --- a/modules/clients/src/test/java/org/gridgain/loadtests/client/GridClientTcpSslLoadTest.java +++ b/modules/clients/src/test/java/org/gridgain/loadtests/client/GridClientTcpSslLoadTest.java @@ -78,6 +78,6 @@ public class GridClientTcpSslLoadTest extends GridClientTcpSslMultiThreadedSelfT @SuppressWarnings("ConstantConditions") private void clearCaches() { for (int i = 0; i < NODES_CNT; i++) - grid(i).cache(PARTITIONED_CACHE_NAME).clearAll(); + grid(i).cache(PARTITIONED_CACHE_NAME).clearLocally(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/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 c4ae74b..2ca683e 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 @@ -1346,7 +1346,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * This method is not available if any of the following flags are set on projection: * {@link GridCacheFlag#READ}. */ - public void clearAll(); + public void clearLocally(); /** * Clears an entry from this cache and swap storage only if the entry @@ -1373,7 +1373,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> /** * Clears cache on all nodes that store it's data. That is, caches are cleared on remote - * nodes and local node, as opposed to {@link GridCacheProjection#clearAll()} method which only + * nodes and local node, as opposed to {@link GridCacheProjection#clearLocally()} method which only * clears local node's cache. * <p> * GridGain will make the best attempt to clear caches on all nodes. If some caches @@ -1389,7 +1389,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> /** * Clears cache on all nodes that store it's data. That is, caches are cleared on remote - * nodes and local node, as opposed to {@link GridCacheProjection#clearAll()} method which only + * nodes and local node, as opposed to {@link GridCacheProjection#clearLocally()} method which only * clears local node's cache. * <p> * GridGain will make the best attempt to clear caches on all nodes. If some caches http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/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 2e640d9..6b94c39 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 @@ -77,7 +77,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im /** */ private static final long serialVersionUID = 0L; - /** clearAll() split threshold. */ + /** clearLocally() split threshold. */ public static final int CLEAR_ALL_SPLIT_THRESHOLD = 10000; /** removeAll() batch size. */ @@ -1176,7 +1176,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } /** {@inheritDoc} */ - @Override public void clearAll() { + @Override public void clearLocally() { ctx.denyOnFlag(READ); ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE); @@ -1204,7 +1204,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im execSvc.awaitTermination(1000, TimeUnit.MILLISECONDS); } catch (InterruptedException ignore) { - U.warn(log, "Got interrupted while waiting for GridCache.clearAll() executor service to " + + U.warn(log, "Got interrupted while waiting for GridCache.clearLocally() executor service to " + "finish."); Thread.currentThread().interrupt(); @@ -1286,7 +1286,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } // Clear local cache synchronously. - clearAll(); + clearLocally(); if (fut != null) fut.get(); @@ -4823,7 +4823,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } /** - * Internal callable which performs {@link GridCacheProjection#clearAll()} + * Internal callable which performs {@link GridCacheProjection#clearLocally()} * operation on a cache with the given name. */ @GridInternal @@ -4854,7 +4854,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im /** {@inheritDoc} */ @Override public Object call() throws Exception { - ((GridEx) ignite).cachex(cacheName).clearAll(); + ((GridEx) ignite).cachex(cacheName).clearLocally(); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java index 0fd1c1e..95e45fc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java @@ -18,13 +18,12 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.internal.*; import java.util.*; /** - * Base runnable for {@link GridCacheAdapter#clearAll()} routine. + * Base runnable for {@link GridCacheAdapter#clearLocally()} routine. */ public class GridCacheClearAllRunnable<K, V> implements Runnable { /** Cache to be cleared. */ @@ -36,7 +35,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable { /** Mod for the given runnable. */ protected final int id; - /** Mods count across all spawned clearAll runnables. */ + /** Mods count across all spawned clearLocally runnables. */ protected final int totalCnt; /** Cache context. */ @@ -51,7 +50,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable { * @param cache Cache to be cleared. * @param obsoleteVer Obsolete version. * @param id Mod for the given runnable. - * @param totalCnt Mods count across all spawned clearAll runnables. + * @param totalCnt Mods count across all spawned clearLocally runnables. */ public GridCacheClearAllRunnable(GridCacheAdapter<K, V> cache, GridCacheVersion obsoleteVer, int id, int totalCnt) { assert cache != null; @@ -161,7 +160,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable { } /** - * @return Total count across all spawned clearAll runnables. + * @return Total count across all spawned clearLocally runnables. */ public int totalCount() { return totalCnt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapAdapter.java index b6ebcb7..8a2d24b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapAdapter.java @@ -18,7 +18,6 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.jetbrains.annotations.*; @@ -153,7 +152,7 @@ public class GridCacheMapAdapter<K, V> implements ConcurrentMap<K, V> { /** {@inheritDoc} */ @Override public void clear() { - prj.clearAll(); + prj.clearLocally(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/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 5b9a099..e3925c4 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 @@ -1029,8 +1029,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void clearAll() { - cache.clearAll(); + @Override public void clearLocally() { + cache.clearLocally(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/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 ba42d4b..9c85222 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 @@ -1249,11 +1249,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void clearAll() { + @Override public void clearLocally() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - delegate.clearAll(); + delegate.clearLocally(); } finally { gate.leave(prev); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java index f8543d1..1e0f881 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java @@ -21,7 +21,7 @@ import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.internal.*; /** - * Runnable for {@link GridCacheAdapter#clearAll()} routine for near cache. + * Runnable for {@link GridCacheAdapter#clearLocally()} routine for near cache. */ public class GridNearCacheClearAllRunnable<K, V> extends GridCacheClearAllRunnable<K, V> { /** Runnable for DHT cache. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/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 2df8daa..12971e0 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 @@ -2871,7 +2871,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.get(key)); - cache.clearAll(); + cache.clearLocally(); assertNull(cache.peek(key)); @@ -2892,7 +2892,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.get("key")); - cache.clearAll(); + cache.clearLocally(); assertNull(cache.projection(entryKeyFilterInv).reload("key")); assertEquals((Integer)1, cache.projection(entryKeyFilter).reload("key")); @@ -2912,7 +2912,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.get("key")); - cache.clearAll(); + cache.clearLocally(); assertNull(cache.projection(entryKeyFilterInv).reloadAsync("key").get()); assertEquals((Integer) 1, cache.projection(entryKeyFilter).reloadAsync("key").get()); @@ -2946,7 +2946,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearAll(); + cache.clearLocally(); for (String key : keys) assertNull(cache.peek(key)); @@ -2956,7 +2956,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearAll(); + cache.clearLocally(); for (String key : keys) assertNull(cache.peek(key)); @@ -3000,7 +3000,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearAll(); + cache.clearLocally(); for (String key : keys) assertNull(cache.peek(key)); @@ -3010,7 +3010,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearAll(); + cache.clearLocally(); for (String key : keys) assertNull(cache.peek(key)); @@ -3057,7 +3057,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearAll(); + cache.clearLocally(); for (String key : keys) assertNull(cache.peek(key)); @@ -3104,7 +3104,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearAll(); + cache.clearLocally(); for (String key : keys) assertNull(cache.peek(key)); @@ -3250,13 +3250,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), peek(cache, key)); - cache.clearAll(); + cache.clearLocally(); for (String key : keys) assertNull(peek(cache, key)); for (i = 0; i < gridCount(); i++) - cache(i).clearAll(); + cache(i).clearLocally(); for (i = 0; i < gridCount(); i++) assert cache(i).isEmpty(); @@ -3272,14 +3272,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (lockingEnabled()) { assertTrue(cache.lock(first, 0)); - cache.clearAll(); + cache.clearLocally(); assertEquals(vals.get(first), peek(cache, first)); cache.unlock(first); } else { - cache.clearAll(); + cache.clearLocally(); cache.put(first, vals.get(first)); } @@ -3308,7 +3308,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert cache().isEmpty(); - cache().clearAll(); + cache().clearLocally(); assert cache().promote("key1") == null; assert cache().promote("key2") == null; @@ -3318,7 +3318,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testGlobalClearAll() throws Exception { - // Save entries only on their primary nodes. If we didn't do so, clearAll() will not remove all entries + // Save entries only on their primary nodes. If we didn't do so, clearLocally() will not remove all entries // because some of them were blocked due to having readers. for (int i = 0; i < gridCount(); i++) { for (String key : primaryKeysForCache(cache(i), 3, 100_000)) @@ -4578,7 +4578,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(cnt, swapEvts.get()); assertEquals(cnt, unswapEvts.get()); - cache().clearAll(); + cache().clearLocally(); // Check with multiple arguments. cache().put(k1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java index 33af5ea..36b31a0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java @@ -101,7 +101,7 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT throws IgniteCheckedException { GridCache<String, Integer> cache = cache(0); - cache.clearAll(); + cache.clearLocally(); IgniteTx tx = cache.txStart(concurrency, isolation); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java index 7a075bf..c0b61dc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java @@ -61,7 +61,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - cache().clearAll(); + cache().clearLocally(); store.reset(); } @@ -242,7 +242,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assert val.equals(Integer.toString(i)); } - cache.clearAll(); + cache.clearLocally(); assert cache.isEmpty(); assert cache.isEmpty(); @@ -261,7 +261,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assert cache.size() == 10; - cache.clearAll(); + cache.clearLocally(); assert cache.isEmpty(); assert cache.isEmpty(); @@ -402,7 +402,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract checkLastMethod(null); } - cache.clearAll(); + cache.clearLocally(); cache.loadCache(new P2<Integer, String>() { @Override public boolean apply(Integer k, String v) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java index e89cfc8..58302bb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java @@ -50,7 +50,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC GridCache<?, ?> cache = cache(); if (cache != null) - cache.clearAll(); + cache.clearLocally(); stopAllGrids(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java index b8d4151..c39a3a6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java @@ -35,7 +35,7 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheAdapter.*; /** - * Test {@link GridCache#clearAll()} operations in multinode environment with nodes having caches with different names. + * Test {@link GridCache#clearLocally()} operations in multinode environment with nodes having caches with different names. */ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { /** Local cache. */ @@ -148,7 +148,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on LOCAL cache with no split. + * Test {@link GridCache#clearLocally()} on LOCAL cache with no split. * * @throws Exception If failed. */ @@ -157,7 +157,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on LOCAL cache with split. + * Test {@link GridCache#clearLocally()} on LOCAL cache with split. * * @throws Exception If failed. */ @@ -166,7 +166,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on PARTITIONED cache with no split. + * Test {@link GridCache#clearLocally()} on PARTITIONED cache with no split. * * @throws Exception If failed. */ @@ -175,7 +175,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on PARTITIONED cache with split. + * Test {@link GridCache#clearLocally()} on PARTITIONED cache with split. * * @throws Exception If failed. */ @@ -184,7 +184,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on co-located cache with no split. + * Test {@link GridCache#clearLocally()} on co-located cache with no split. * * @throws Exception If failed. */ @@ -193,7 +193,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on co-located cache with split. + * Test {@link GridCache#clearLocally()} on co-located cache with split. * * @throws Exception If failed. */ @@ -202,7 +202,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on REPLICATED cache with no split. + * Test {@link GridCache#clearLocally()} on REPLICATED cache with no split. * * @throws Exception If failed. */ @@ -211,7 +211,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { } /** - * Test {@link GridCache#clearAll()} on REPLICATED cache with split. + * Test {@link GridCache#clearLocally()} on REPLICATED cache with split. * * @throws Exception If failed. */ @@ -236,7 +236,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { fillCache(cache, keysCnt); - cache.clearAll(); + cache.clearLocally(); assert cache.isEmpty(); @@ -249,7 +249,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { // Ensure correct no-op clean of CLIENT_ONLY cache. warmCache(cachesPartitioned[2], keysCnt); assert cachesPartitioned[2].isEmpty(); - cachesPartitioned[2].clearAll(); + cachesPartitioned[2].clearLocally(); assert cachesPartitioned[2].isEmpty(); stopGrid(2); // Shutdown Grid in order to remove reader in NEAR_PARTITIONED cache. @@ -257,7 +257,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { // Ensure correct clear of NEA_ONLY cache. warmCache(cachesPartitioned[1], keysCnt); assert !cachesPartitioned[1].isEmpty(); - cachesPartitioned[1].clearAll(); + cachesPartitioned[1].clearLocally(); assert cachesPartitioned[1].isEmpty(); fillCache(cachesPartitioned[1], keysCnt); @@ -265,7 +265,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { // Ensure correct clear of NEAR_PARTITIONED cache. assert !cachesPartitioned[0].isEmpty(); - cachesPartitioned[0].clearAll(); + cachesPartitioned[0].clearLocally(); assert cachesPartitioned[0].isEmpty(); break; @@ -280,7 +280,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { for (GridCache<Integer, Integer> cache : caches) { assert !cache.isEmpty(); - cache.clearAll(); + cache.clearLocally(); assert cache.isEmpty(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java index 9f6936e..5f822c4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java @@ -60,7 +60,7 @@ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridComm /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - cache().clearAll(); + cache().clearLocally(); store.reset(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index 47112a5..229f4fc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java @@ -64,7 +64,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb GridCache<?, ?> cache = cache(); if (cache != null) - cache.clearAll(); + cache.clearLocally(); store.reset(); } @@ -194,7 +194,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb assert val.equals(Integer.toString(i)); } - cache.clearAll(); + cache.clearLocally(); assert cache.isEmpty(); assert cache.isEmpty(); @@ -216,7 +216,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb assert cache.size() == 10; - cache.clearAll(); + cache.clearLocally(); assert cache.isEmpty(); assert cache.isEmpty(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index 5dc50cb..a824d37 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -87,7 +87,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { for (Ignite g : G.allGrids()) - g.cache(null).clearAll(); + g.cache(null).clearLocally(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index 0b5b44e..9774906 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -108,7 +108,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr lsnrs.clear(); for (int i = 1; i <= 3; i++) { - cache(i).clearAll(); + cache(i).clearLocally(); assertTrue( "Cache isn't empty [i=" + i + ", entries=" + ((GridKernal)grid(i)).internalCache().entries() + "]", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index 47a74cb..a01023e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java @@ -121,7 +121,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache for (String key : keys) assertEquals(null, nearCache.peek(key)); - nearCache.clearAll(); + nearCache.clearLocally(); for (String key : keys) assertNull(nearCache.peek(key)); @@ -379,7 +379,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache assertEquals(cnt, swapEvts.get()); assertEquals(cnt, unswapEvts.get()); - cache().clearAll(); + cache().clearLocally(); // Check with multiple arguments. cache().put(k1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/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 11cc51d..0569e8c 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 @@ -211,7 +211,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio /** {@inheritDoc} */ @Override public void testGlobalClearAll() throws Exception { - // Save entries only on their primary nodes. If we didn't do so, clearAll() will not remove all entries + // Save entries only on their primary nodes. If we didn't do so, clearLocally() will not remove all entries // because some of them were blocked due to having readers. for (int i = 0; i < gridCount(); i++) { if (i != nearIdx) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java index f74e301..dc75a14 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiMultithreadedSelfTest1.java @@ -1628,7 +1628,7 @@ public class GridCacheReplicatedFullApiMultithreadedSelfTest1 extends GridCacheA // for(int i = 0; i < gridCnt; i++) { // GridCache cache = cache(i); // -// cache.clearAll(); +// cache.clearLocally(); // // assert cache.isEmpty(); // } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java index 9d8116a..c8d1844 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java @@ -133,9 +133,9 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { for (int i = 0; i < NODES_CNT; i++) { - grid(i).cachex(META_CACHE_NAME).clearAll(); + grid(i).cachex(META_CACHE_NAME).clearLocally(); - grid(i).cachex(DATA_CACHE_NAME).clearAll(); + grid(i).cachex(DATA_CACHE_NAME).clearLocally(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java index 0176cc9..f8a6a3b 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java @@ -118,7 +118,7 @@ public class GridCacheBenchmark { } }, THREADS, WARM_UP_TIME); - cache.clearAll(); + cache.clearLocally(); System.gc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java index ed37ce9..cdd865e 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java @@ -18,7 +18,6 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; @@ -151,7 +150,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest { if (LOAD) test.loadTest(test.writeClos, test.readClos); - G.ignite().cache(null).clearAll(); + G.ignite().cache(null).clearLocally(); System.gc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index 813d3da..a0d8162 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -84,7 +84,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { GridCache<?, ?> cache = cache(); if (cache != null) - cache.clearAll(); + cache.clearLocally(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java index 3b39f7f..0873e03 100644 --- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java +++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java @@ -78,7 +78,7 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { for (GridCache<?, ?> cache : grid(0).caches()) - cache.clearAll(); + cache.clearLocally(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index a443bed..dae7cc9 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -175,7 +175,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid(0).cache(null).clearAll(); + grid(0).cache(null).clearLocally(); } /** Resets event counters. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e31f6b6/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index 33a843f..337fdfa 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -184,7 +184,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf * @throws Exception If test failed. */ public void testLocalQuery() throws Exception { - cache1.clearAll(); + cache1.clearLocally(); IgniteTx tx = cache1.txStart();
