ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [15/30] incubator-ignite git commit: # ignite-158 rename ClusterGroup#forCache() to ClusterGroup#forCacheNodes().
Date Tue, 03 Feb 2015 13:51:44 GMT
# ignite-158 rename ClusterGroup#forCache() to ClusterGroup#forCacheNodes().


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

Branch: refs/heads/ignite-54-55
Commit: f04e0ec46f2b54aedb56f232e1f98da7ddacb2b8
Parents: 06d9b7d
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Mon Feb 2 12:29:38 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Mon Feb 2 12:29:38 2015 +0300

----------------------------------------------------------------------
 .../ignite/examples/datagrid/CacheEventsExample.java  |  2 +-
 .../examples/datagrid/CachePopularNumbersExample.java |  2 +-
 .../datastructures/CacheAtomicLongExample.java        |  2 +-
 .../datagrid/store/CacheStoreLoadDataExample.java     |  2 +-
 .../scalar/examples/ScalarCacheAffinityExample1.scala |  2 +-
 .../scalar/examples/ScalarCacheAffinityExample2.scala |  2 +-
 .../examples/ScalarCachePopularNumbersExample.scala   |  4 ++--
 .../java/org/apache/ignite/cluster/ClusterGroup.java  |  4 ++--
 .../apache/ignite/internal/ClusterGroupAdapter.java   |  2 +-
 .../ignite/internal/IgniteClusterAsyncImpl.java       |  4 ++--
 .../internal/processors/cache/GridCacheAdapter.java   | 14 +++++++-------
 .../continuous/GridCacheContinuousQueryAdapter.java   |  2 +-
 .../processors/dataload/IgniteDataLoaderImpl.java     |  4 ++--
 .../handlers/cache/GridCacheQueryCommandHandler.java  |  2 +-
 .../internal/GridProjectionForCachesSelfTest.java     | 10 +++++-----
 .../GridHadoopDefaultMapReducePlannerSelfTest.java    |  2 +-
 .../visor/commands/cache/VisorCacheClearCommand.scala |  2 +-
 .../commands/cache/VisorCacheCompactCommand.scala     |  2 +-
 .../visor/commands/cache/VisorCacheScanCommand.scala  |  4 ++--
 .../visor/commands/cache/VisorCacheSwapCommand.scala  |  2 +-
 20 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/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 80b4217..0cc05f2 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
@@ -81,7 +81,7 @@ public class CacheEventsExample {
 
             // Subscribe to specified cache events on all nodes that have cache running.
             // Cache events are explicitly enabled in examples/config/example-cache.xml file.
-            g.events(g.cluster().forCache(CACHE_NAME)).remoteListen(locLsnr, rmtLsnr,
+            g.events(g.cluster().forCacheNodes(CACHE_NAME)).remoteListen(locLsnr, rmtLsnr,
                 EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_READ, EVT_CACHE_OBJECT_REMOVED);
 
             // Generate cache events.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/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 1617662..ab97cc8 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
@@ -67,7 +67,7 @@ public class CachePopularNumbersExample {
             // Clean up caches on all nodes before run.
             g.cache(CACHE_NAME).globalClearAll(0);
 
-            ClusterGroup prj = g.cluster().forCache(CACHE_NAME);
+            ClusterGroup prj = g.cluster().forCacheNodes(CACHE_NAME);
 
             if (prj.nodes().isEmpty()) {
                 System.out.println("Grid does not have cache configured: " + CACHE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
index 51359fd..cdac189 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
@@ -62,7 +62,7 @@ public final class CacheAtomicLongExample {
 
             // Try increment atomic long from all grid nodes.
             // Note that this node is also part of the grid.
-            g.compute(g.cluster().forCache(CACHE_NAME)).call(new IgniteCallable<Object>()
{
+            g.compute(g.cluster().forCacheNodes(CACHE_NAME)).call(new IgniteCallable<Object>()
{
                 @Override public Object call() throws  Exception {
                     for (int i = 0; i < RETRIES; i++)
                         System.out.println("AtomicLong value has been incremented: " + atomicLong.incrementAndGet());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/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..6355945 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
@@ -59,7 +59,7 @@ public class CacheStoreLoadDataExample {
             long start = System.currentTimeMillis();
 
             // Start loading cache on all caching nodes.
-            g.compute(g.cluster().forCache(null)).broadcast(new IgniteCallable<Object>()
{
+            g.compute(g.cluster().forCacheNodes(null)).broadcast(new IgniteCallable<Object>()
{
                 @Override public Object call() throws Exception {
                     // Load cache from persistent store.
                     cache.loadCache(null, 0, ENTRY_COUNT);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/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 b0ca960..55714fe 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
@@ -106,7 +106,7 @@ object ScalarCacheAffinityExample1 {
      * @param keys Keys to populate.
      */
     private def populateCache(g: Ignite, keys: Seq[String]) {
-        var prj = g.cluster().forCache(NAME)
+        var prj = g.cluster().forCacheNodes(NAME)
 
         // Give preference to local node.
         if (prj.nodes().contains(g.cluster().localNode))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/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 e12f3bf..74fefe2 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
@@ -94,7 +94,7 @@ object ScalarCacheAffinityExample2 {
      * @param keys Keys to populate.
      */
     private def populateCache(g: Ignite, keys: Seq[String]) {
-        var prj = g.cluster().forCache(NAME)
+        var prj = g.cluster().forCacheNodes(NAME)
 
         // Give preference to local node.
         if (prj.nodes().contains(g.cluster().localNode))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/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 e52f431..3629b26 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
@@ -58,7 +58,7 @@ object ScalarCachePopularNumbersExample extends App {
         println()
         println(">>> Cache popular numbers example started.")
 
-        val prj = grid$.cluster().forCache(CACHE_NAME)
+        val prj = grid$.cluster().forCacheNodes(CACHE_NAME)
 
         if (prj.nodes().isEmpty)
             println("Grid does not have cache configured: " + CACHE_NAME);
@@ -75,7 +75,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().forCacheNodes(CACHE_NAME).bcastRun(() => grid$.cache(CACHE_NAME).clearAll(),
null)
             }
             finally {
                 popularNumbersQryTimer.cancel()

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
index 2237d9d..9f2f435 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
@@ -43,7 +43,7 @@ import java.util.*;
  * GridProjection randomNode = remoteNodes.forRandom();
  *
  * // Projection over all nodes with cache named "myCache" enabled.
- * GridProjection cacheNodes = g.forCache("myCache");
+ * GridProjection cacheNodes = g.forCacheNodes("myCache");
  *
  * // Projection over all nodes that have user attribute "group" set to value "worker".
  * GridProjection workerNodes = g.forAttribute("group", "worker");
@@ -145,7 +145,7 @@ public interface ClusterGroup {
      * @param cacheNames Optional additional cache names to include into projection.
      * @return Projection over nodes that have specified cache running.
      */
-    public ClusterGroup forCache(String cacheName, @Nullable String... cacheNames);
+    public ClusterGroup forCacheNodes(String cacheName, @Nullable String... cacheNames);
 
     /**
      * Creates projection for all nodes that have streamer with specified name running.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
index 820735e..7dff797 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
@@ -524,7 +524,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable
{
     }
 
     /** {@inheritDoc} */
-    @Override public final ClusterGroup forCache(@Nullable String cacheName, @Nullable String...
cacheNames) {
+    @Override public final ClusterGroup forCacheNodes(@Nullable String cacheName, @Nullable
String... cacheNames) {
         return forPredicate(new CachesFilter(cacheName, cacheNames));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
index ae4b541..ea148ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
@@ -167,8 +167,8 @@ public class IgniteClusterAsyncImpl extends IgniteAsyncSupportAdapter<IgniteClus
     }
 
     /** {@inheritDoc} */
-    @Override public ClusterGroup forCache(String cacheName, @Nullable String... cacheNames)
{
-        return grid.forCache(cacheName, cacheNames);
+    @Override public ClusterGroup forCacheNodes(String cacheName, @Nullable String... cacheNames)
{
+        return grid.forCacheNodes(cacheName, cacheNames);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/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 3ed56c5..c68fa6d 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
@@ -192,7 +192,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
     /** {@inheritDoc} */
     @Override public ClusterGroup gridProjection() {
-        return ctx.grid().forCache(name());
+        return ctx.grid().forCacheNodes(name());
     }
 
     /**
@@ -1293,7 +1293,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     @Override public void globalClearAll(long timeout) throws IgniteCheckedException {
         try {
             // Send job to remote nodes only.
-            Collection<ClusterNode> nodes = ctx.grid().forCache(name()).forRemotes().nodes();
+            Collection<ClusterNode> nodes = ctx.grid().forCacheNodes(name()).forRemotes().nodes();
 
             IgniteInternalFuture<Object> fut = null;
 
@@ -3717,7 +3717,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         if (replaceExisting) {
             if (ctx.store().isLocalStore()) {
-                Collection<ClusterNode> nodes = ctx.grid().forCache(name()).nodes();
+                Collection<ClusterNode> nodes = ctx.grid().forCacheNodes(name()).nodes();
 
                 if (nodes.isEmpty())
                     return new GridFinishedFuture<>(ctx.kernalContext());
@@ -3738,7 +3738,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
             }
         }
         else {
-            Collection<ClusterNode> nodes = ctx.grid().forCache(name()).nodes();
+            Collection<ClusterNode> nodes = ctx.grid().forCacheNodes(name()).nodes();
 
             if (nodes.isEmpty())
                 return new GridFinishedFuture<>(ctx.kernalContext());
@@ -3819,7 +3819,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      * @throws IgniteCheckedException If failed.
      */
     void globalLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object... args)
throws IgniteCheckedException {
-        ClusterGroup nodes = ctx.kernalContext().grid().cluster().forCache(ctx.name());
+        ClusterGroup nodes = ctx.kernalContext().grid().cluster().forCacheNodes(ctx.name());
 
         IgniteCompute comp = ctx.kernalContext().grid().compute(nodes).withNoFailover();
 
@@ -3833,7 +3833,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      */
     IgniteInternalFuture<?> globalLoadCacheAsync(@Nullable IgniteBiPredicate<K,
V> p, @Nullable Object... args)
         throws IgniteCheckedException {
-        ClusterGroup nodes = ctx.kernalContext().grid().cluster().forCache(ctx.name());
+        ClusterGroup nodes = ctx.kernalContext().grid().cluster().forCacheNodes(ctx.name());
 
         IgniteCompute comp = ctx.kernalContext().grid().compute(nodes).withNoFailover();
 
@@ -4133,7 +4133,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     private int globalSize(boolean primaryOnly) throws IgniteCheckedException {
         try {
             // Send job to remote nodes only.
-            Collection<ClusterNode> nodes = ctx.grid().forCache(name()).forRemotes().nodes();
+            Collection<ClusterNode> nodes = ctx.grid().forCacheNodes(name()).forRemotes().nodes();
 
             IgniteInternalFuture<Collection<Integer>> fut = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
index 13ab56f..e3636d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
@@ -256,7 +256,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements CacheContinuousQue
         if (prj == null)
             prj = ctx.grid();
 
-        prj = prj.forCache(ctx.name());
+        prj = prj.forCacheNodes(ctx.name());
 
         if (prj.nodes().isEmpty())
             throw new ClusterTopologyException("Failed to execute query (projection is empty):
" + this);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
index 3e8abd8..4e9222e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@ -172,7 +172,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K,
V>, Delay
 
         log = U.logger(ctx, logRef, IgniteDataLoaderImpl.class);
 
-        ClusterNode node = F.first(ctx.grid().forCache(cacheName).nodes());
+        ClusterNode node = F.first(ctx.grid().forCacheNodes(cacheName).nodes());
 
         if (node == null)
             throw new IllegalStateException("Cache doesn't exist: " + cacheName);
@@ -283,7 +283,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K,
V>, Delay
         if (isolated())
             return;
 
-        ClusterNode node = F.first(ctx.grid().forCache(cacheName).nodes());
+        ClusterNode node = F.first(ctx.grid().forCacheNodes(cacheName).nodes());
 
         if (node == null)
             throw new IgniteCheckedException("Failed to get node for cache: " + cacheName);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
index 2ebea11..aca05b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
@@ -144,7 +144,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
      * @return Execution future.
      */
     private IgniteInternalFuture<GridRestResponse> broadcast(String cacheName, Callable<Object>
c) {
-        IgniteCompute comp = ctx.grid().compute(ctx.grid().forCache(cacheName)).withNoFailover().withAsync();
+        IgniteCompute comp = ctx.grid().compute(ctx.grid().forCacheNodes(cacheName)).withNoFailover().withAsync();
 
         try {
             comp.broadcast(c);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
index 6e903d7..35c8afb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
@@ -34,7 +34,7 @@ import java.util.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
- * Tests for {@link org.apache.ignite.cluster.ClusterGroup#forCache(String, String...)} method.
+ * Tests for {@link org.apache.ignite.cluster.ClusterGroup#forCacheNodes(String, String...)}
method.
  */
 public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
     /** */
@@ -109,7 +109,7 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest
{
      * @throws Exception If failed.
      */
     public void testProjectionForDefaultCache() throws Exception {
-        ClusterGroup prj = ignite.cluster().forCache(null);
+        ClusterGroup prj = ignite.cluster().forCacheNodes(null);
 
         assert prj != null;
         assert prj.nodes().size() == 3;
@@ -124,7 +124,7 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest
{
      * @throws Exception If failed.
      */
     public void testProjectionForNamedCache() throws Exception {
-        ClusterGroup prj = ignite.cluster().forCache(CACHE_NAME);
+        ClusterGroup prj = ignite.cluster().forCacheNodes(CACHE_NAME);
 
         assert prj != null;
         assert prj.nodes().size() == 3;
@@ -139,7 +139,7 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest
{
      * @throws Exception If failed.
      */
     public void testProjectionForBothCaches() throws Exception {
-        ClusterGroup prj = ignite.cluster().forCache(null, CACHE_NAME);
+        ClusterGroup prj = ignite.cluster().forCacheNodes(null, CACHE_NAME);
 
         assert prj != null;
         assert prj.nodes().size() == 2;
@@ -154,7 +154,7 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest
{
      * @throws Exception If failed.
      */
     public void testProjectionForWrongCacheName() throws Exception {
-        ClusterGroup prj = ignite.cluster().forCache("wrong");
+        ClusterGroup prj = ignite.cluster().forCacheNodes("wrong");
 
         assert prj != null;
         assert prj.nodes().isEmpty();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 65b8ba2..014f7c5 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -1140,7 +1140,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
         }
 
         /** {@inheritDoc} */
-        @Override public ClusterGroup forCache(String cacheName, @Nullable String... cacheNames)
{
+        @Override public ClusterGroup forCacheNodes(String cacheName, @Nullable String...
cacheNames) {
             return null;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
index d78ee0e..5566336 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
@@ -103,7 +103,7 @@ class VisorCacheClearCommand {
             case Some(name) => name
         }
 
-        val prj = if (node.isDefined) grid.forNode(node.get) else grid.forCache(cacheName)
+        val prj = if (node.isDefined) grid.forNode(node.get) else grid.forCacheNodes(cacheName)
 
         if (prj.nodes().isEmpty) {
             val msg =

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
index f93c998..0afef57 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
@@ -103,7 +103,7 @@ class VisorCacheCompactCommand {
             case Some(name) => name
         }
 
-        val prj = if (node.isDefined) grid.forNode(node.get) else grid.forCache(cacheName)
+        val prj = if (node.isDefined) grid.forNode(node.get) else grid.forCacheNodes(cacheName)
 
         if (prj.nodes().isEmpty) {
             val msg =

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
index 4008cb6..c36e37c 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
@@ -139,8 +139,8 @@ class VisorCacheScanCommand {
         }
 
         val cachePrj = node match {
-            case Some(n) => grid.forNode(n).forCache(cacheName)
-            case _ => grid.forCache(cacheName)
+            case Some(n) => grid.forNode(n).forCacheNodes(cacheName)
+            case _ => grid.forCacheNodes(cacheName)
         }
 
         if (cachePrj.nodes().isEmpty) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f04e0ec4/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
index dc2c878..79088d0 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
@@ -103,7 +103,7 @@ class VisorCacheSwapCommand {
             case Some(name) => name
         }
 
-        val prj = if (node.isDefined) grid.forNode(node.get) else grid.forCache(cacheName)
+        val prj = if (node.isDefined) grid.forNode(node.get) else grid.forCacheNodes(cacheName)
 
         if (prj.nodes().isEmpty) {
             val msg =


Mime
View raw message