Ignite-54-55 .clear() used instead of .clearLocally() in tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a6eb783 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a6eb783 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a6eb783 Branch: refs/heads/ignite-57 Commit: 5a6eb78345520ccb2c1cb8917a84aa44eead3154 Parents: f02ce98 Author: Anton Vinogradov <[email protected]> Authored: Sun Jan 25 18:42:54 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Sun Jan 25 18:42:54 2015 +0300 ---------------------------------------------------------------------- .../ScalarCachePopularNumbersExample.scala | 2 +- .../ClientAbstractMultiThreadedSelfTest.java | 2 +- .../integration/ClientAbstractSelfTest.java | 4 +-- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../rest/RestBinaryProtocolSelfTest.java | 6 ++-- .../rest/RestMemcacheProtocolSelfTest.java | 6 ++-- .../loadtests/client/ClientTcpSslLoadTest.java | 7 ++++- .../cache/GridCacheAbstractFullApiSelfTest.java | 32 ++++++++++---------- .../cache/GridCacheAbstractTxReadTest.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 8 ++--- ...acheBasicStoreMultithreadedAbstractTest.java | 2 +- .../cache/GridCacheClearAllSelfTest.java | 10 +++--- ...idCacheGetAndTransformStoreAbstractTest.java | 2 +- .../GridCacheWriteBehindStoreAbstractTest.java | 6 ++-- .../GridCacheBasicOpAbstractTest.java | 2 +- .../GridCacheMultiNodeLockAbstractTest.java | 2 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 6 ++-- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 6 ++-- .../fs/GridGgfsDataManagerSelfTest.java | 4 +-- .../loadtests/cache/GridCacheBenchmark.java | 2 +- .../loadtests/cache/GridCacheLoadTest.java | 2 +- .../GridCacheWriteBehindStoreLoadTest.java | 2 +- ...idHibernateL2CacheConfigurationSelfTest.java | 2 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 2 +- 26 files changed, 65 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala index 0106eac..58a19d3 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala @@ -81,7 +81,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).clearLocally(), null) + grid$.cluster().forCache(CACHE_NAME).bcastRun(() => grid$.cache(CACHE_NAME).clear(), null) } finally { popularNumbersQryTimer.cancel() http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java index 08b4d78..ce7687c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java @@ -497,7 +497,7 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst } for (Ignite g : gridMap.values()) - g.cache(PARTITIONED_CACHE_NAME).clearLocally(); + g.cache(PARTITIONED_CACHE_NAME).clear(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java index b27bba8..08db78d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java @@ -132,8 +132,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { for (HashMapStore cacheStore : cacheStores.values()) cacheStore.map.clear(); - grid().cache(null).clearLocally(); - grid().cache(CACHE_NAME).clearLocally(); + grid().cache(null).clear(); + grid().cache(CACHE_NAME).clear(); INTERCEPTED_OBJECTS.clear(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java index d497f47..97d77a1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java @@ -56,7 +56,7 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - cache().clearLocally(); + cache().clear(); assertTrue(cache().isEmpty()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index 33aca11..51f216b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -79,8 +79,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { @Override protected void afterTest() throws Exception { client.shutdown(); - grid().cache(null).clearLocally(); - grid().cache(CACHE_NAME).clearLocally(); + grid().cache(null).clear(); + grid().cache(CACHE_NAME).clear(); } /** {@inheritDoc} */ @@ -312,7 +312,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { assertTrue(grid().cache(null).putx("key2", "val1")); assertTrue(client.cacheReplace(null, "key2", "val2")); - grid().cache(null).clearLocally(); + grid().cache(null).clear(); 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/5a6eb783/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java index 61709d8..9f4675c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java @@ -71,8 +71,8 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { @Override protected void afterTest() throws Exception { client.shutdown(); - grid().cache(null).clearLocally(); - grid().cache(CACHE_NAME).clearLocally(); + grid().cache(null).clear(); + grid().cache(CACHE_NAME).clear(); } /** {@inheritDoc} */ @@ -193,7 +193,7 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { assertTrue(grid().cache(null).putx("key2", "val1")); assertTrue(client.cacheReplace(null, "key2", "val2")); - grid().cache(null).clearLocally(); + grid().cache(null).clear(); 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/5a6eb783/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java index ae23a6f..80776bb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.loadtests.client; +import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.client.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -78,6 +79,10 @@ public class ClientTcpSslLoadTest extends ClientTcpSslMultiThreadedSelfTest { @SuppressWarnings("ConstantConditions") private void clearCaches() { for (int i = 0; i < NODES_CNT; i++) - grid(i).cache(PARTITIONED_CACHE_NAME).clearLocally(); + try { + grid(i).cache(PARTITIONED_CACHE_NAME).clear(); + } catch (IgniteCheckedException e) { + log.error("Cache clear failed.", e); + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/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 aa363d2..d3a0582 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 @@ -2758,7 +2758,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.get(key)); - cache.clearLocally(); + cache.clear(); assertNull(cache.peek(key)); @@ -2779,7 +2779,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.get("key")); - cache.clearLocally(); + cache.clear(); assertNull(cache.projection(entryKeyFilterInv).reload("key")); assertEquals((Integer)1, cache.projection(entryKeyFilter).reload("key")); @@ -2799,7 +2799,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)1, cache.get("key")); - cache.clearLocally(); + cache.clear(); assertNull(cache.projection(entryKeyFilterInv).reloadAsync("key").get()); assertEquals((Integer) 1, cache.projection(entryKeyFilter).reloadAsync("key").get()); @@ -2833,7 +2833,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearLocally(); + cache.clear(); for (String key : keys) assertNull(cache.peek(key)); @@ -2843,7 +2843,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearLocally(); + cache.clear(); for (String key : keys) assertNull(cache.peek(key)); @@ -2891,7 +2891,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearLocally(); + cache.clear(); for (String key : keys) assertNull(cache.peek(key)); @@ -2901,7 +2901,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearLocally(); + cache.clear(); for (String key : keys) assertNull(cache.peek(key)); @@ -2952,7 +2952,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearLocally(); + cache.clear(); for (String key : keys) assertNull(cache.peek(key)); @@ -2999,7 +2999,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), cache.peek(key)); - cache.clearLocally(); + cache.clear(); for (String key : keys) assertNull(cache.peek(key)); @@ -3147,13 +3147,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertEquals(vals.get(key), peek(cache, key)); - cache.clearLocally(); + cache.clear(); for (String key : keys) assertNull(peek(cache, key)); for (i = 0; i < gridCount(); i++) - cache(i).clearLocally(); + cache(i).clear(); for (i = 0; i < gridCount(); i++) assert cache(i).isEmpty(); @@ -3169,14 +3169,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (lockingEnabled()) { assertTrue(cache.lock(first, 0)); - cache.clearLocally(); + cache.clear(); assertEquals(vals.get(first), peek(cache, first)); cache.unlock(first); } else { - cache.clearLocally(); + cache.clear(); cache.put(first, vals.get(first)); } @@ -3213,7 +3213,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert cache().isEmpty(); - cache().clearLocally(); + cache().clear(); assert cache().promote("key1") == null; assert cache().promote("key2") == null; @@ -3253,7 +3253,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(vals.get(lastKey), cache.peek(lastKey)); - cache.clearLocally(); + cache.clear(); vals.put(lastKey, 102); @@ -4521,7 +4521,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals(cnt, swapEvts.get()); assertEquals(cnt, unswapEvts.get()); - cache().clearLocally(); + cache().clear(); // Check with multiple arguments. cache().put(k1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java index 9c0061e..40089b9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java @@ -101,7 +101,7 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT throws IgniteCheckedException { GridCache<String, Integer> cache = cache(0); - cache.clearLocally(); + cache.clear(); IgniteTx tx = cache.txStart(concurrency, isolation); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java index f4e39d0..3063003 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java @@ -62,7 +62,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - cache().clearLocally(); + cache().clear(); store.reset(); } @@ -247,7 +247,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assert val.equals(Integer.toString(i)); } - cache.clearLocally(); + cache.clear(); assert cache.isEmpty(); assert cache.isEmpty(); @@ -266,7 +266,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assert cache.size() == 10; - cache.clearLocally(); + cache.clear(); assert cache.isEmpty(); assert cache.isEmpty(); @@ -407,7 +407,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract checkLastMethod(null); } - cache.clearLocally(); + cache.clear(); 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/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java index 398b307..6ab54dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java @@ -50,7 +50,7 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC GridCache<?, ?> cache = cache(); if (cache != null) - cache.clearLocally(); + cache.clear(); stopAllGrids(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java index 6c15b73..7883067 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java @@ -236,7 +236,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { fillCache(cache, keysCnt); - cache.clearLocally(); + cache.clear(); 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].clearLocally(); + cachesPartitioned[2].clear(); 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 clearLocally of NEA_ONLY cache. warmCache(cachesPartitioned[1], keysCnt); assert !cachesPartitioned[1].isEmpty(); - cachesPartitioned[1].clearLocally(); + cachesPartitioned[1].clear(); assert cachesPartitioned[1].isEmpty(); fillCache(cachesPartitioned[1], keysCnt); @@ -265,7 +265,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { // Ensure correct clearLocally of NEAR_PARTITIONED cache. assert !cachesPartitioned[0].isEmpty(); - cachesPartitioned[0].clearLocally(); + cachesPartitioned[0].clear(); assert cachesPartitioned[0].isEmpty(); break; @@ -280,7 +280,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { for (GridCache<Integer, Integer> cache : caches) { assert !cache.isEmpty(); - cache.clearLocally(); + cache.clear(); assert cache.isEmpty(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java index 3380851..d6cf6a9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java @@ -61,7 +61,7 @@ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridComm /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - cache().clearLocally(); + cache().clear(); store.reset(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index 3b7a1a4..5b612bd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java @@ -65,7 +65,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb GridCache<?, ?> cache = cache(); if (cache != null) - cache.clearLocally(); + cache.clear(); store.reset(); } @@ -199,7 +199,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb assert val.equals(Integer.toString(i)); } - cache.clearLocally(); + cache.clear(); assert cache.isEmpty(); assert cache.isEmpty(); @@ -221,7 +221,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb assert cache.size() == 10; - cache.clearLocally(); + cache.clear(); assert cache.isEmpty(); assert cache.isEmpty(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index 9b1f12a..70d2e99 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/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).clearLocally(); + g.cache(null).clear(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index 834816b..c938aa8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -106,7 +106,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr lsnrs.clear(); for (int i = 1; i <= 3; i++) { - cache(i).clearLocally(); + cache(i).clear(); assertTrue( "Cache isn't empty [i=" + i + ", entries=" + ((GridKernal)grid(i)).internalCache().entries() + "]", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index 9506d4a..ce54d89 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/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.clearLocally(); + nearCache.clear(); for (String key : keys) assertNull(nearCache.peek(key)); @@ -207,7 +207,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache assertEquals(null, nearCache.peek(lastKey)); - nearCache.clearLocally(); + nearCache.clear(); vals.put(lastKey, 102); @@ -468,7 +468,7 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache assertEquals(cnt, swapEvts.get()); assertEquals(cnt, unswapEvts.get()); - cache().clearLocally(); + cache().clear(); // Check with multiple arguments. cache().put(k1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java index 77079c2..0726440 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java @@ -97,7 +97,7 @@ public class GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest extends GridCacheNe for (String key : keys) assertEquals((Integer)i++, nearCache.peek(key)); - nearCache.clearLocally(); + nearCache.clear(); for (String key : keys) assertNull(nearCache.peek(key)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index 240a672..ec44a14 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@ -233,7 +233,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio for (String key : keys) assertEquals(vals.get(key), nearCache.peek(key)); - nearCache.clearLocally(); + nearCache.clear(); for (String key : keys) assertNull(nearCache.peek(key)); @@ -248,7 +248,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio assertTrue(nearCache.lock(first, 0L)); - nearCache.clearLocally(); + nearCache.clear(); assertEquals(vals.get(first), nearCache.peek(first)); assertEquals(vals.get(first), primary.peek(first)); @@ -328,7 +328,7 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest extends GridCachePartitio assertEquals(vals.get(lastKey), nearCache.peek(lastKey)); - nearCache.clearLocally(); + nearCache.clear(); vals.put(lastKey, 102); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java index 6226063..70b7f5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/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).clearLocally(); + grid(i).cachex(META_CACHE_NAME).clear(); - grid(i).cachex(DATA_CACHE_NAME).clearLocally(); + grid(i).cachex(DATA_CACHE_NAME).clear(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java index 6819d1c..23ff02a 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java @@ -118,7 +118,7 @@ public class GridCacheBenchmark { } }, THREADS, WARM_UP_TIME); - cache.clearLocally(); + cache.clear(); System.gc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java index 55d973c..c848208 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheLoadTest.java @@ -150,7 +150,7 @@ public final class GridCacheLoadTest extends GridCacheAbstractLoadTest { if (LOAD) test.loadTest(test.writeClos, test.readClos); - G.ignite().cache(null).clearLocally(); + G.ignite().cache(null).clear(); System.gc(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index 2962153..906b4b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -83,7 +83,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { GridCache<?, ?> cache = cache(); if (cache != null) - cache.clearLocally(); + cache.clear(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java index d43a056..3c9df06 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java @@ -79,7 +79,7 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { for (GridCache<?, ?> cache : grid(0).caches()) - cache.clearLocally(); + cache.clear(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index c547161..d6e074a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -175,7 +175,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - grid(0).cache(null).clearLocally(); + grid(0).cache(null).clear(); } /** Resets event counters. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a6eb783/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index 1ce43d1..1733d5e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/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.clearLocally(); + cache1.clear(); IgniteTx tx = cache1.txStart();
