ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [30/50] [abbrv] incubator-ignite git commit: #ignite-758: rename method forceRepartition to rebalance in IgniteInternalCache.
Date Mon, 20 Apr 2015 11:48:41 GMT
#ignite-758: rename method forceRepartition to rebalance in IgniteInternalCache.


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

Branch: refs/heads/ignite-sprint-4
Commit: 15ee31bb089b88adf1c842a0d73480c19fd3da31
Parents: b2b5656
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Apr 17 11:29:30 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Apr 17 11:29:30 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java       | 2 +-
 .../ignite/internal/processors/cache/GridCacheProxyImpl.java     | 4 ++--
 .../ignite/internal/processors/cache/IgniteInternalCache.java    | 3 +--
 .../ignite/internal/visor/cache/VisorCacheRebalanceTask.java     | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15ee31bb/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 24da97b..3d32bf5 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
@@ -4191,7 +4191,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<?> forceRepartition() {
+    @Override public IgniteInternalFuture<?> rebalance() {
         ctx.preloader().forcePreload();
 
         return ctx.preloader().syncFuture();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15ee31bb/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 4c756cd..63e5329 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
@@ -1527,11 +1527,11 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K,
V>, Exte
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<?> forceRepartition() {
+    @Override public IgniteInternalFuture<?> rebalance() {
         CacheOperationContext prev = gate.enter(opCtx);
 
         try {
-            return delegate.forceRepartition();
+            return delegate.rebalance();
         }
         finally {
             gate.leave(prev);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15ee31bb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
index 89da6af..20c1c20 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
@@ -24,7 +24,6 @@ import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.dr.*;
-import org.apache.ignite.internal.processors.cache.query.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.cache.version.*;
 import org.apache.ignite.lang.*;
@@ -1529,7 +1528,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K,
V>> {
      * <p>
      * @return Future that will be completed when rebalancing is finished.
      */
-    public IgniteInternalFuture<?> forceRepartition();
+    public IgniteInternalFuture<?> rebalance();
 
     /**
      * Creates projection for specified subject ID.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15ee31bb/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
index 61b37fc..a9cf56d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceTask.java
@@ -61,7 +61,7 @@ public class VisorCacheRebalanceTask extends VisorOneNodeTask<Set<String>,
Void>
 
                 for (IgniteInternalCache c : ignite.cachesx()) {
                     if (cacheNames.contains(c.name()))
-                        futs.add(c.forceRepartition());
+                        futs.add(c.rebalance());
                 }
 
                 for (IgniteInternalFuture f : futs)


Mime
View raw message