ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [03/39] incubator-ignite git commit: Ignite-54-55 Clear* API refactored
Date Thu, 05 Feb 2015 21:40:14 GMT
Ignite-54-55 Clear* API refactored


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f02ce983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f02ce983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f02ce983

Branch: refs/heads/ignite-sql-tests
Commit: f02ce983b80b3ae7a1cc9fe75359f7a40ace796e
Parents: bcff8d8
Author: Anton Vinogradov <avinogradov@gridgain.com>
Authored: Sun Jan 25 18:13:00 2015 +0300
Committer: Anton Vinogradov <avinogradov@gridgain.com>
Committed: Sun Jan 25 18:13:01 2015 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheAffinityExample.java |  2 +-
 .../examples/datagrid/CacheApiExample.java      |  2 +-
 .../datagrid/CacheContinuousQueryExample.java   |  2 +-
 .../datagrid/CacheDataLoaderExample.java        |  2 +-
 .../examples/datagrid/CacheEventsExample.java   |  2 +-
 .../datagrid/CachePopularNumbersExample.java    |  2 +-
 .../examples/datagrid/CachePutGetExample.java   |  2 +-
 .../examples/datagrid/CacheQueryExample.java    |  2 +-
 .../datagrid/CacheTransactionExample.java       |  2 +-
 .../starschema/CacheStarSchemaExample.java      |  4 +-
 .../datagrid/store/CacheStoreExample.java       |  2 +-
 .../store/CacheStoreLoadDataExample.java        |  2 +-
 .../examples/ScalarCacheAffinityExample1.scala  |  2 +-
 .../examples/ScalarCacheAffinityExample2.scala  |  2 +-
 .../ScalarCacheAffinitySimpleExample.scala      |  2 +-
 .../scalar/examples/ScalarCacheExample.scala    |  2 +-
 .../ScalarCachePopularNumbersExample.scala      |  4 +-
 .../examples/ScalarCacheQueryExample.scala      |  2 +-
 .../examples/ScalarSnowflakeSchemaExample.scala |  4 +-
 .../ClientAbstractMultiThreadedSelfTest.java    |  2 +-
 .../integration/ClientAbstractSelfTest.java     |  4 +-
 .../rest/AbstractRestProcessorSelfTest.java     |  2 +-
 .../rest/RestBinaryProtocolSelfTest.java        |  6 +-
 .../rest/RestMemcacheProtocolSelfTest.java      |  6 +-
 .../loadtests/client/ClientTcpSslLoadTest.java  |  2 +-
 .../org/apache/ignite/cache/CacheEntry.java     |  4 +-
 .../apache/ignite/cache/CacheProjection.java    | 25 ++++---
 .../processors/cache/GridCacheAdapter.java      | 52 +++++++-------
 .../cache/GridCacheClearAllRunnable.java        | 12 ++--
 .../cache/GridCacheConcurrentMap.java           |  2 +-
 .../cache/GridCacheDeploymentManager.java       |  4 +-
 .../processors/cache/GridCacheEntryImpl.java    |  2 +-
 .../processors/cache/GridCacheEntrySet.java     |  2 +-
 .../processors/cache/GridCacheKeySet.java       |  2 +-
 .../processors/cache/GridCacheMapAdapter.java   |  2 +-
 .../cache/GridCacheProjectionImpl.java          | 16 ++---
 .../processors/cache/GridCacheProxyImpl.java    | 16 ++---
 .../processors/cache/GridCacheUtils.java        |  2 +-
 .../cache/GridCacheValueCollection.java         |  2 +-
 .../processors/cache/IgniteCacheProxy.java      |  2 +-
 .../distributed/near/GridNearCacheAdapter.java  | 10 +--
 .../near/GridNearCacheClearAllRunnable.java     |  2 +-
 .../visor/cache/VisorCacheClearTask.java        |  2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 76 ++++++++++----------
 .../GridCacheAbstractProjectionSelfTest.java    |  4 +-
 .../cache/GridCacheAbstractTxReadTest.java      |  2 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |  8 +--
 ...acheBasicStoreMultithreadedAbstractTest.java |  2 +-
 .../cache/GridCacheClearAllSelfTest.java        | 32 ++++-----
 ...idCacheGetAndTransformStoreAbstractTest.java |  4 +-
 .../cache/GridCacheGlobalClearAllSelfTest.java  |  6 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |  6 +-
 .../GridCacheBasicOpAbstractTest.java           |  2 +-
 .../GridCacheMultiNodeAbstractTest.java         |  2 +-
 .../GridCacheMultiNodeLockAbstractTest.java     |  2 +-
 ...heAbstractTransformWriteThroughSelfTest.java |  2 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |  2 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 16 ++---
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |  8 +--
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 20 +++---
 .../GridCacheNearPartitionedClearSelfTest.java  |  4 +-
 .../fs/GridGgfsDataManagerSelfTest.java         |  4 +-
 .../loadtests/cache/GridCacheBenchmark.java     |  2 +-
 .../loadtests/cache/GridCacheLoadTest.java      |  2 +-
 .../GridCacheWriteBehindStoreLoadTest.java      |  2 +-
 .../GridHibernateAccessStrategyAdapter.java     |  4 +-
 ...idHibernateL2CacheConfigurationSelfTest.java |  2 +-
 .../hibernate/GridHibernateL2CacheSelfTest.java |  2 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |  2 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |  8 +--
 .../GridCacheReplicatedQuerySelfTest.java       |  2 +-
 .../cache/VisorCacheCompactCommandSpec.scala    |  4 +-
 72 files changed, 228 insertions(+), 229 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
index a0be78e..9d98c17 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
@@ -56,7 +56,7 @@ public final class CacheAffinityExample {
             GridCache<Integer, String> cache = g.cache(CACHE_NAME);
 
             // Clean up caches on all nodes before run.
-            cache.globalClearAll(0);
+            cache.clear(0);
 
             for (int i = 0; i < KEY_CNT; i++)
                 cache.putx(i, Integer.toString(i));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
index 218d734..0250fa1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
@@ -49,7 +49,7 @@ public class CacheApiExample {
             System.out.println(">>> Cache API example started.");
 
             // Clean up caches on all nodes before run.
-            g.cache(CACHE_NAME).globalClearAll(0);
+            g.cache(CACHE_NAME).clear(0);
 
             // Demonstrate atomic map operations.
             atomicMapOperations();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
index 2084921..26baca0 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
@@ -51,7 +51,7 @@ public class CacheContinuousQueryExample {
             GridCache<Integer, String> cache = g.cache(CACHE_NAME);
 
             // Clean up caches on all nodes before run.
-            cache.globalClearAll(0);
+            cache.clear(0);
 
             int keyCnt = 20;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
index a7da7a6..d6816d0 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
@@ -56,7 +56,7 @@ public class CacheDataLoaderExample {
             System.out.println(">>> Cache data loader example started.");
 
             // Clean up caches on all nodes before run.
-            g.cache(CACHE_NAME).globalClearAll(0);
+            g.cache(CACHE_NAME).clear(0);
 
             try (IgniteDataLoader<Integer, String> ldr = g.dataLoader(CACHE_NAME)) {
                 // Configure loader.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
index bc2c01e..81d4ee4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
@@ -54,7 +54,7 @@ public class CacheEventsExample {
             final GridCache<Integer, String> cache = g.cache(CACHE_NAME);
 
             // Clean up caches on all nodes before run.
-            cache.globalClearAll(0);
+            cache.clear(0);
 
             // This optional local callback is called for each event notification
             // that passed remote predicate listener.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
index ac73134..02fc743 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
@@ -65,7 +65,7 @@ public class CachePopularNumbersExample {
             System.out.println(">>> Cache popular numbers example started.");
 
             // Clean up caches on all nodes before run.
-            g.cache(CACHE_NAME).globalClearAll(0);
+            g.cache(CACHE_NAME).clear(0);
 
             ClusterGroup prj = g.cluster().forCache(CACHE_NAME);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
index a6b8f6c..d2998b3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
@@ -44,7 +44,7 @@ public class CachePutGetExample {
     public static void main(String[] args) throws Exception {
         try (Ignite g = Ignition.start("examples/config/example-cache.xml")) {
             // Clean up caches on all nodes before run.
-            g.cache(CACHE_NAME).globalClearAll(0);
+            g.cache(CACHE_NAME).clear(0);
 
             // Individual puts and gets.
             putGet();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index f7ade22..fd42b9c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -80,7 +80,7 @@ public class CacheQueryExample {
             System.out.println(">>> Cache query example started.");
 
             // Clean up caches on all nodes before run.
-            g.cache(CACHE_NAME).globalClearAll(0);
+            g.cache(CACHE_NAME).clear(0);
 
             // Populate cache.
             initialize();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
index db61b22..d384c02 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
@@ -52,7 +52,7 @@ public class CacheTransactionExample {
             System.out.println(">>> Cache transaction example started.");
 
             // Clean up caches on all nodes before run.
-            g.cache(CACHE_NAME).globalClearAll(0);
+            g.cache(CACHE_NAME).clear(0);
 
             GridCache<Integer, Account> cache = g.cache(CACHE_NAME);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
index 65bd6c3..0424924 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
@@ -70,8 +70,8 @@ public class CacheStarSchemaExample {
         System.out.println(">>> Cache star schema example started.");
 
         // Clean up caches on all nodes before run.
-        g.cache(PARTITIONED_CACHE_NAME).globalClearAll(0);
-        g.cache(REPLICATED_CACHE_NAME).globalClearAll(0);
+        g.cache(PARTITIONED_CACHE_NAME).clear(0);
+        g.cache(REPLICATED_CACHE_NAME).clear(0);
 
         try {
             populateDimensions();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
index 9eb6d43..a1a2429 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
@@ -52,7 +52,7 @@ public class CacheStoreExample {
             GridCache<Long, Person> cache = g.cache(null);
 
             // Clean up caches on all nodes before run.
-            cache.globalClearAll(0);
+            cache.clear(0);
 
             try (IgniteTx tx = cache.txStart()) {
                 Person val = cache.get(id);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
index 7fded3c..63bae95 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
@@ -54,7 +54,7 @@ public class CacheStoreLoadDataExample {
             final GridCache<String, Integer> cache = g.cache(null);
 
             // Clean up caches on all nodes before run.
-            cache.globalClearAll(0);
+            cache.clear(0);
 
             long start = System.currentTimeMillis();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
index e984a38..221a3e2 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
@@ -52,7 +52,7 @@ object ScalarCacheAffinityExample1 {
     def main(args: Array[String]) {
         scalar(CONFIG) {
             // Clean up caches on all nodes before run.
-            cache$(NAME).get.globalClearAll(0)
+            cache$(NAME).get.clear(0)
 
             var keys = Seq.empty[String]
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
index ab422d2..63652bc 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
@@ -46,7 +46,7 @@ object ScalarCacheAffinityExample2 {
     def main(args: Array[String]) {
         scalar(CONFIG) {
             // Clean up caches on all nodes before run.
-            cache$(NAME).get.globalClearAll(0)
+            cache$(NAME).get.clear(0)
 
             var keys = Seq.empty[String]
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
index e3959a0..ad193bd 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
@@ -51,7 +51,7 @@ object ScalarCacheAffinitySimpleExample extends App {
      */
     scalar("examples/config/example-cache.xml") {
         // Clean up caches on all nodes before run.
-        cache$(NAME).get.globalClearAll(0)
+        cache$(NAME).get.clear(0)
 
         val c = grid$.cache[Int, String](NAME)
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
index 5d8e72a..48e7c65 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
@@ -38,7 +38,7 @@ object ScalarCacheExample extends App {
 
     scalar("examples/config/example-cache.xml") {
         // Clean up caches on all nodes before run.
-        cache$(NAME).get.globalClearAll(0)
+        cache$(NAME).get.clear(0)
 
         registerListener()
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/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 e67972a..0106eac 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
@@ -59,7 +59,7 @@ object ScalarCachePopularNumbersExample extends App {
 
     scalar("examples/config/example-cache.xml") {
         // Clean up caches on all nodes before run.
-        cache$(CACHE_NAME).get.globalClearAll(0)
+        cache$(CACHE_NAME).get.clear(0)
 
         println()
         println(">>> Cache popular numbers example started.")
@@ -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).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/f02ce983/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
index 7a53588..4a30c0b 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
@@ -113,7 +113,7 @@ object ScalarCacheQueryExample {
      */
     private def initialize() {
         // Clean up caches on all nodes before run.
-        cache$(CACHE_NAME).get.globalClearAll(0)
+        cache$(CACHE_NAME).get.clear(0)
 
         // Organization cache projection.
         val orgCache = mkCache[UUID, Organization]

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
index d3375f5..52f17ce 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
@@ -61,8 +61,8 @@ object ScalarSnowflakeSchemaExample {
     def main(args: Array[String]) {
         scalar("examples/config/example-cache.xml") {
             // Clean up caches on all nodes before run.
-            cache$(REPL_CACHE_NAME).get.globalClearAll(0)
-            cache$(PART_CACHE_NAME).get.globalClearAll(0)
+            cache$(REPL_CACHE_NAME).get.clear(0)
+            cache$(PART_CACHE_NAME).get.clear(0)
 
             populateDimensions()
             populateFacts()

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/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 6d7d046..08b4d78 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).clearAll();
+            g.cache(PARTITIONED_CACHE_NAME).clearLocally();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/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 1a19139..b27bba8 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).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/f02ce983/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 f7decdf..d497f47 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().clearAll();
+        cache().clearLocally();
 
         assertTrue(cache().isEmpty());
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/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 b82b2eb..33aca11 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).clearAll();
-        grid().cache(CACHE_NAME).clearAll();
+        grid().cache(null).clearLocally();
+        grid().cache(CACHE_NAME).clearLocally();
     }
 
     /** {@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).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/f02ce983/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 a97e5f9..61709d8 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).clearAll();
-        grid().cache(CACHE_NAME).clearAll();
+        grid().cache(null).clearLocally();
+        grid().cache(CACHE_NAME).clearLocally();
     }
 
     /** {@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).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/f02ce983/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 46145ff..ae23a6f 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
@@ -78,6 +78,6 @@ public class ClientTcpSslLoadTest extends ClientTcpSslMultiThreadedSelfTest {
     @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/f02ce983/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
index 12ff0f4..f69a54f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
@@ -447,9 +447,9 @@ public interface CacheEntry<K, V> extends Map.Entry<K, V>, javax.cache.Cache.Ent
 
     /**
      * This method has the same semantic as
-     * {@link CacheProjection#clear(Object)} method.
+     * {@link CacheProjection#clearLocally(Object)} method.
      *
-     * @return See {@link CacheProjection#clear(Object)}.
+     * @return See {@link CacheProjection#clearLocally(Object)}.
      */
     public boolean clear();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
index 7dd1f3e..20b1538 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
@@ -1346,7 +1346,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> {
      * This method is not available if any of the following flags are set on projection:
      * {@link CacheFlag#READ}.
      */
-    public void clearAll();
+    public void clearLocally();
 
     /**
      * Clears an entry from this cache and swap storage only if the entry
@@ -1363,42 +1363,41 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> {
      * This method is not available if any of the following flags are set on projection:
      * {@link CacheFlag#READ}.
      *
-     * @param key Key to clear.
+     * @param key Key to clearLocally.
      * @return {@code True} if entry was successfully cleared from cache, {@code false}
      *      if entry was in use at the time of this method invocation and could not be
      *      cleared.
      */
-    public boolean clear(K key);
+    public boolean clearLocally(K key);
 
     /**
      * 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 CacheProjection#clearAll()} method which only
+     * nodes and local node, as opposed to {@link CacheProjection#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
+     * GridGain will make the best attempt to clearLocally 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 #clear(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 Deprecated in favor of {@link #clear(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
-     * nodes and local node, as opposed to {@link CacheProjection#clearAll()} method which only
+     * nodes and local node, as opposed to {@link CacheProjection#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
+     * GridGain will make the best attempt to clearLocally caches on all nodes. If some caches
      * could not be cleared, then exception will be thrown.
      *
-     * @param timeout Timeout for clear all task in milliseconds (0 for never).
+     * @param timeout Timeout for clearLocally all task in milliseconds (0 for never).
      *      Set it to larger value for large caches.
      * @throws IgniteCheckedException In case of cache could not be cleared on any of the nodes.
      */
-    public void globalClearAll(long timeout) throws IgniteCheckedException;
+    public void clear(long timeout) throws IgniteCheckedException;
 
     /**
      * Clears serialized value bytes from entry (if any) leaving only object representation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 3cf786f..aac06cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -81,7 +81,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     /** removeAll() batch size. */
     private static final long REMOVE_ALL_BATCH_SIZE = 100L;
 
-    /** clearAll() split threshold. */
+    /** clearLocally() split threshold. */
     public static final int CLEAR_ALL_SPLIT_THRESHOLD = 10000;
 
     /** Deserialization stash. */
@@ -1146,7 +1146,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     }
 
     /**
-     * Split clear all task into multiple runnables.
+     * Split clearLocally all task into multiple runnables.
      *
      * @return Split runnables.
      */
@@ -1172,12 +1172,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     }
 
     /** {@inheritDoc} */
-    @Override public boolean clear(K key) {
-        return clear0(key);
+    @Override public boolean clearLocally(K key) {
+        return clearLocally0(key);
     }
 
     /** {@inheritDoc} */
-    @Override public void clearAll() {
+    @Override public void clearLocally() {
         ctx.denyOnFlag(READ);
         ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
 
@@ -1205,7 +1205,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
                             execSvc.awaitTermination(1000, TimeUnit.MILLISECONDS);
                     }
                     catch (InterruptedException ignore) {
-                        U.warn(log, "Got interrupted while waiting for Cache.clearAll() executor service to " +
+                        U.warn(log, "Got interrupted while waiting for Cache.clearLocally() executor service to " +
                             "finish.");
 
                         Thread.currentThread().interrupt();
@@ -1219,7 +1219,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
      * @param keys Keys.
      * @param readers Readers flag.
      */
-    public void clearAll(Collection<? extends K> keys, boolean readers) {
+    public void clearLocally(Collection<? extends K> keys, boolean readers) {
         if (F.isEmpty(keys))
             return;
 
@@ -1236,7 +1236,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
                     e.clear(obsoleteVer, readers, null);
             }
             catch (IgniteCheckedException ex) {
-                U.error(log, "Failed to clear entry (will continue to clear other entries): " + e,
+                U.error(log, "Failed to clearLocally entry (will continue to clearLocally other entries): " + e,
                     ex);
             }
         }
@@ -1246,12 +1246,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
      * Clears entry from cache.
      *
      * @param obsoleteVer Obsolete version to set.
-     * @param key Key to clear.
+     * @param key Key to clearLocally.
      * @param filter Optional filter.
      * @return {@code True} if cleared.
      */
-    private boolean clear(GridCacheVersion obsoleteVer, K key,
-        @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
+    private boolean clearLocally(GridCacheVersion obsoleteVer, K key,
+                                 @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
         try {
             if (ctx.portableEnabled())
                 key = (K)ctx.marshalToPortable(key);
@@ -1261,19 +1261,19 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
             return e != null && e.clear(obsoleteVer, false, filter);
         }
         catch (IgniteCheckedException ex) {
-            U.error(log, "Failed to clear entry for key: " + key, ex);
+            U.error(log, "Failed to clearLocally entry for key: " + key, ex);
         }
 
         return false;
     }
 
     /** {@inheritDoc} */
-    @Override public void globalClearAll() throws IgniteCheckedException {
-        globalClearAll(0);
+    @Override public void clear() throws IgniteCheckedException {
+        clear(0);
     }
 
     /** {@inheritDoc} */
-    @Override public void globalClearAll(long timeout) throws IgniteCheckedException {
+    @Override public void clear(long timeout) throws IgniteCheckedException {
         try {
             // Send job to remote nodes only.
             Collection<ClusterNode> nodes = ctx.grid().forCache(name()).forRemotes().nodes();
@@ -1287,17 +1287,17 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
             }
 
             // Clear local cache synchronously.
-            clearAll();
+            clearLocally();
 
             if (fut != null)
                 fut.get();
         }
         catch (ClusterGroupEmptyException ignore) {
             if (log.isDebugEnabled())
-                log.debug("All remote nodes left while cache clear [cacheName=" + name() + "]");
+                log.debug("All remote nodes left while cache clearLocally [cacheName=" + name() + "]");
         }
         catch (ComputeTaskTimeoutException e) {
-            U.warn(log, "Timed out waiting for remote nodes to finish cache clear (consider increasing " +
+            U.warn(log, "Timed out waiting for remote nodes to finish cache clearLocally (consider increasing " +
                 "'networkTimeout' configuration property) [cacheName=" + name() + "]");
 
             throw e;
@@ -3915,12 +3915,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         }
         catch (ClusterGroupEmptyException ignore) {
             if (log.isDebugEnabled())
-                log.debug("All remote nodes left while cache clear [cacheName=" + name() + "]");
+                log.debug("All remote nodes left while cache clearLocally [cacheName=" + name() + "]");
 
             return primaryOnly ? primarySize() : size();
         }
         catch (ComputeTaskTimeoutException e) {
-            U.warn(log, "Timed out waiting for remote nodes to finish cache clear (consider increasing " +
+            U.warn(log, "Timed out waiting for remote nodes to finish cache clearLocally (consider increasing " +
                 "'networkTimeout' configuration property) [cacheName=" + name() + "]");
 
             throw e;
@@ -4244,7 +4244,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
      * @param keys Keys.
      * @param filter Filters to evaluate.
      */
-    public void clearAll0(Collection<? extends K> keys,
+    public void clearLocally0(Collection<? extends K> keys,
         @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
         ctx.denyOnFlag(READ);
         ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
@@ -4258,7 +4258,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         GridCacheVersion obsoleteVer = ctx.versions().next();
 
         for (K k : keys)
-            clear(obsoleteVer, k, filter);
+            clearLocally(obsoleteVer, k, filter);
     }
 
     /**
@@ -4266,7 +4266,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
      * @param filter Filters to evaluate.
      * @return {@code True} if cleared.
      */
-    public boolean clear0(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
+    public boolean clearLocally0(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) {
         A.notNull(key, "key");
 
         if (keyCheck)
@@ -4275,7 +4275,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
         ctx.denyOnFlag(READ);
         ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
 
-        return clear(ctx.versions().next(), key, filter);
+        return clearLocally(ctx.versions().next(), key, filter);
     }
 
     /**
@@ -5062,7 +5062,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
     }
 
     /**
-     * Internal callable which performs {@link org.apache.ignite.cache.CacheProjection#clearAll()}
+     * Internal callable which performs {@link org.apache.ignite.cache.CacheProjection#clearLocally()}
      * operation on a cache with the given name.
      */
     @GridInternal
@@ -5093,7 +5093,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
 
         /** {@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/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
index 558049f..2c19b2a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java
@@ -23,7 +23,7 @@ import org.apache.ignite.internal.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. */
@@ -35,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. */
@@ -50,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;
@@ -117,7 +117,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable {
                             ctx.swap().clearSwap();
                         }
                         catch (IgniteCheckedException e) {
-                            U.error(log, "Failed to clear entries from swap storage.", e);
+                            U.error(log, "Failed to clearLocally entries from swap storage.", e);
                         }
                     }
                 }
@@ -135,7 +135,7 @@ public class GridCacheClearAllRunnable<K, V> implements Runnable {
             e.clear(obsoleteVer, false, CU.<K, V>empty());
         }
         catch (IgniteCheckedException ex) {
-            U.error(log, "Failed to clear entry from cache (will continue to clear other entries): " + e, ex);
+            U.error(log, "Failed to clearLocally entry from cache (will continue to clearLocally other entries): " + e, ex);
         }
     }
 
@@ -160,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/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index 7c4b044..dcb2df2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1952,7 +1952,7 @@ public class GridCacheConcurrentMap<K, V> {
 
         /** {@inheritDoc} */
         @Override public void clear() {
-            ctx.cache().clearAll0(new KeySet<>(map, filter), CU.<K, V>empty());
+            ctx.cache().clearLocally0(new KeySet<>(map, filter), CU.<K, V>empty());
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
index d5ffb0d..6a3d446 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
@@ -283,10 +283,10 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
             if (log.isDebugEnabled())
                 log.debug("Finished searching keys for undeploy [keysCnt=" + keys.size() + ']');
 
-            cache.clearAll(keys, true);
+            cache.clearLocally(keys, true);
 
             if (cacheCtx.isNear())
-                cacheCtx.near().dht().clearAll(keys, true);
+                cacheCtx.near().dht().clearLocally(keys, true);
 
             GridCacheQueryManager<K, V> qryMgr = cacheCtx.queries();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
index 6d59e26..3da7975 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
@@ -395,7 +395,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
 
     /** {@inheritDoc} */
     @Override public boolean clear() {
-        return proxy.clear(key);
+        return proxy.clearLocally(key);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java
index 1dc399d..275ddd3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java
@@ -66,7 +66,7 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<CacheEntry<K, V>> {
 
     /** {@inheritDoc} */
     @Override public void clear() {
-        ctx.cache().clearAll0(F.viewReadOnly(set, F.<K>mapEntry2Key(), filter), CU.<K, V>empty());
+        ctx.cache().clearLocally0(F.viewReadOnly(set, F.<K>mapEntry2Key(), filter), CU.<K, V>empty());
 
         set.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java
index 14b8f65..79b6b62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java
@@ -70,7 +70,7 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> {
 
     /** {@inheritDoc} */
     @Override public void clear() {
-        ctx.cache().clearAll0(F.viewReadOnly(map.values(), F.<K>mapEntry2Key(), filter), CU.<K, V>empty());
+        ctx.cache().clearLocally0(F.viewReadOnly(map.values(), F.<K>mapEntry2Key(), filter), CU.<K, V>empty());
 
         map.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
index 47bc14b..c1585d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapAdapter.java
@@ -152,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/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index e969da6..56ac998 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -1029,23 +1029,23 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
     }
 
     /** {@inheritDoc} */
-    @Override public void clearAll() {
-        cache.clearAll();
+    @Override public void clearLocally() {
+        cache.clearLocally();
     }
 
     /** {@inheritDoc} */
-    @Override public void globalClearAll() throws IgniteCheckedException {
-        cache.globalClearAll();
+    @Override public void clear() throws IgniteCheckedException {
+        cache.clear();
     }
 
     /** {@inheritDoc} */
-    @Override public void globalClearAll(long timeout) throws IgniteCheckedException {
-        cache.globalClearAll(timeout);
+    @Override public void clear(long timeout) throws IgniteCheckedException {
+        cache.clear(timeout);
     }
 
     /** {@inheritDoc} */
-    @Override public boolean clear(K key) {
-        return cache.clear0(key, entryFilter(true));
+    @Override public boolean clearLocally(K key) {
+        return cache.clearLocally0(key, entryFilter(true));
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 1248f98..fb66b8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -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);
@@ -1261,11 +1261,11 @@ 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 {
-            delegate.globalClearAll(0);
+            delegate.clear(0);
         }
         finally {
             gate.leave(prev);
@@ -1273,11 +1273,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public void globalClearAll(long timeout) throws IgniteCheckedException {
+    @Override public void clear(long timeout) throws IgniteCheckedException {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            delegate.globalClearAll(timeout);
+            delegate.clear(timeout);
         }
         finally {
             gate.leave(prev);
@@ -1285,11 +1285,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public boolean clear(K key) {
+    @Override public boolean clearLocally(K key) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.clear(key);
+            return delegate.clearLocally(key);
         }
         finally {
             gate.leave(prev);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 129dc54..4797ccf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1655,7 +1655,7 @@ public class GridCacheUtils {
      * @return {@code True} if entry was invalidated.
      */
     public static <K, V> boolean invalidate(CacheProjection<K, V> cache, K key) {
-        return cache.clear(key);
+        return cache.clearLocally(key);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java
index fb43dbd..c1b4021 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java
@@ -118,7 +118,7 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V
 
     /** {@inheritDoc} */
     @Override public void clear() {
-        ctx.cache().clearAll0(F.viewReadOnly(map.values(), F.<K>mapEntry2Key(), filter), CU.<K, V>empty());
+        ctx.cache().clearLocally0(F.viewReadOnly(map.values(), F.<K>mapEntry2Key(), filter), CU.<K, V>empty());
 
         map.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/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 7d4499c..12270b4 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
@@ -642,7 +642,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/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 689f965..b01209d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -558,16 +558,16 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
     }
 
     /** {@inheritDoc} */
-    @Override public boolean clear0(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
-        return super.clear0(key, filter) | dht().clear0(key, filter);
+    public boolean clearLocally0(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
+        return super.clearLocally0(key, filter) | dht().clearLocally0(key, filter);
     }
 
     /** {@inheritDoc} */
-    @Override public void clearAll0(Collection<? extends K> keys,
+    @Override public void clearLocally0(Collection<? extends K> keys,
         @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) {
-        super.clearAll0(keys, filter);
+        super.clearLocally0(keys, filter);
 
-        dht().clearAll0(keys, filter);
+        dht().clearLocally0(keys, filter);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java
index 928a670..e4ce1f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java
@@ -21,7 +21,7 @@ import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.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/f02ce983/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
index b59a3ff..7dce348 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
@@ -69,7 +69,7 @@ public class VisorCacheClearTask extends VisorOneNodeTask<Set<String>, Map<Strin
                     int before = keys.size(), after = before;
 
                     for (Object key : keys) {
-                        if (cache.clear(key))
+                        if (cache.clearLocally(key))
                             after--;
                     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/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 1fefec4..aa363d2 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
@@ -1851,7 +1851,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertEquals((Integer)3, cache().get("key3"));
 
         cache().evict("key2");
-        cache().clear("key3");
+        cache().clearLocally("key3");
 
         // Same checks inside tx.
         tx = txEnabled() ? cache().txStart() : null;
@@ -1910,7 +1910,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertEquals((Integer)3, cache().putIfAbsentAsync("key3", 4).get());
 
         cache().evict("key2");
-        cache().clear("key3");
+        cache().clearLocally("key3");
 
         // Same checks inside tx.
         tx = txEnabled() ? cache().txStart() : null;
@@ -1954,7 +1954,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertFalse(cache().putxIfAbsent("key3", 4));
 
         cache().evict("key2");
-        cache().clear("key3");
+        cache().clearLocally("key3");
 
         // Same checks inside tx.
         IgniteTx tx = txEnabled() ? cache().txStart() : null;
@@ -2018,7 +2018,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertFalse(cache().putxIfAbsentAsync("key3", 4).get());
 
         cache().evict("key2");
-        cache().clear("key3");
+        cache().clearLocally("key3");
 
         // Same checks inside tx.
         IgniteTx tx = inTx ? cache().txStart() : null;
@@ -2113,7 +2113,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertEquals((Integer)6, cache().get("key2"));
 
         cache().evict("key");
-        cache().clear("key2");
+        cache().clearLocally("key2");
 
         IgniteTx tx = txEnabled() ? cache().txStart() : null;
 
@@ -2160,7 +2160,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertEquals((Integer)6, cache().get("key2"));
 
         cache().evict("key");
-        cache().clear("key2");
+        cache().clearLocally("key2");
 
         IgniteTx tx = txEnabled() ? cache().txStart() : null;
 
@@ -2221,7 +2221,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assertEquals((Integer)6, cache().get("key2"));
 
         cache().evict("key");
-        cache().clear("key2");
+        cache().clearLocally("key2");
 
         IgniteTx tx = txEnabled() ? cache().txStart() : null;
 
@@ -2270,7 +2270,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         assert cache().get("key2") == 6;
 
         cache().evict("key");
-        cache().clear("key2");
+        cache().clearLocally("key2");
 
         IgniteTx tx = txEnabled() ? cache().txStart() : null;
 
@@ -2735,7 +2735,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
         assertEquals((Integer)1, cache.peek(key));
 
-        cache.clear(key);
+        cache.clearLocally(key);
 
         assertNull(cache.peek(key));
 
@@ -2758,7 +2758,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
         assertEquals((Integer)1, cache.get(key));
 
-        cache.clearAll();
+        cache.clearLocally();
 
         assertNull(cache.peek(key));
 
@@ -2779,7 +2779,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"));
@@ -2799,7 +2799,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());
@@ -2833,7 +2833,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));
@@ -2843,7 +2843,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));
@@ -2856,7 +2856,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         for (String key : keys) {
             assertEquals(vals.get(key), cache.peek(key));
 
-            cache.clear(key);
+            cache.clearLocally(key);
         }
 
         cache.reloadAll(keys);
@@ -2891,7 +2891,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));
@@ -2901,7 +2901,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));
@@ -2917,7 +2917,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         for (String key : keys) {
             assertEquals(vals.get(key), cache.peek(key));
 
-            cache.clear(key);
+            cache.clearLocally(key);
         }
 
         cache.reloadAllAsync(keys).get();
@@ -2952,7 +2952,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));
@@ -2999,7 +2999,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));
@@ -3056,8 +3056,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         for (Integer k : keys)
             cache.put(k, k);
 
-        cache.clear(keys.get(0));
-        cache.clear(keys.get(1));
+        cache.clearLocally(keys.get(0));
+        cache.clearLocally(keys.get(1));
 
         for (int g = 0; g < gridCount(); g++) {
             Ignite grid0 = grid(g);
@@ -3103,8 +3103,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         for (Integer k : keys)
             cache.put(k, k + 1);
 
-        cache.clear(keys.get(0));
-        cache.clear(keys.get(1));
+        cache.clearLocally(keys.get(0));
+        cache.clearLocally(keys.get(1));
 
         for (int g = 0; g < gridCount(); g++) {
             Ignite grid0 = grid(g);
@@ -3147,13 +3147,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();
@@ -3169,27 +3169,27 @@ 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));
         }
 
-        cache.projection(gte100).clear(first);
+        cache.projection(gte100).clearLocally(first);
 
         assertNotNull(peek(cache, first));
 
         cache.put(first, 101);
 
-        cache.projection(gte100).clear(first);
+        cache.projection(gte100).clearLocally(first);
 
-        assert cache.isEmpty() : "Values after clear: " + cache.values();
+        assert cache.isEmpty() : "Values after clearLocally: " + cache.values();
 
         i = 0;
 
@@ -3213,7 +3213,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
 
         assert cache().isEmpty();
 
-        cache().clearAll();
+        cache().clearLocally();
 
         assert cache().promote("key1") == null;
         assert cache().promote("key2") == null;
@@ -3246,21 +3246,21 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         cache.putAll(vals);
 
         for (String subKey : subKeys)
-            cache.clear(subKey);
+            cache.clearLocally(subKey);
 
         for (String key : subKeys)
             assertNull(cache.peek(key));
 
         assertEquals(vals.get(lastKey), cache.peek(lastKey));
 
-        cache.clearAll();
+        cache.clearLocally();
 
         vals.put(lastKey, 102);
 
         cache.putAll(vals);
 
         for (String key : keys)
-            cache.projection(gte100).clear(key);
+            cache.projection(gte100).clearLocally(key);
 
         assertNull(cache.peek(lastKey));
 
@@ -3272,14 +3272,14 @@ 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))
                 cache(i).put(key, 1);
         }
 
-        cache().globalClearAll();
+        cache().clear();
 
         for (int i = 0; i < gridCount(); i++)
             assert cache(i).isEmpty();
@@ -4521,7 +4521,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/f02ce983/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
index 6337339..7dbd6a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
@@ -348,7 +348,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
 
         assert locPrj.containsKey("key");
 
-        locPrj.clear("key");
+        locPrj.clearLocally("key");
 
         assert !locPrj.containsKey("key");
     }
@@ -488,7 +488,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
 
         assertFlagException(new CA() {
             @Override public void apply() {
-                readPrj.clear("key");
+                readPrj.clearLocally("key");
             }
         });
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/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 235f2ce..9c0061e 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.clearAll();
+        cache.clearLocally();
 
         IgniteTx tx = cache.txStart(concurrency, isolation);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f02ce983/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 912f424..f4e39d0 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().clearAll();
+        cache().clearLocally();
 
         store.reset();
     }
@@ -247,7 +247,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
             assert val.equals(Integer.toString(i));
         }
 
-        cache.clearAll();
+        cache.clearLocally();
 
         assert cache.isEmpty();
         assert cache.isEmpty();
@@ -266,7 +266,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
 
         assert cache.size() == 10;
 
-        cache.clearAll();
+        cache.clearLocally();
 
         assert cache.isEmpty();
         assert cache.isEmpty();
@@ -407,7 +407,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/f02ce983/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 e832d59..398b307 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.clearAll();
+            cache.clearLocally();
 
         stopAllGrids();
     }


Mime
View raw message