Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D15681777D for ; Mon, 20 Apr 2015 16:18:15 +0000 (UTC) Received: (qmail 6477 invoked by uid 500); 20 Apr 2015 16:18:15 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 6409 invoked by uid 500); 20 Apr 2015 16:18:15 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 6355 invoked by uid 99); 20 Apr 2015 16:18:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 16:18:15 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 16:18:07 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id EDCDD43ECF for ; Mon, 20 Apr 2015 16:17:46 +0000 (UTC) Received: (qmail 3254 invoked by uid 99); 20 Apr 2015 16:17:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 16:17:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7392FE091A; Mon, 20 Apr 2015 16:17:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 20 Apr 2015 16:18:10 -0000 Message-Id: In-Reply-To: <58fffba038854c8993c5c6d5228e0298@git.apache.org> References: <58fffba038854c8993c5c6d5228e0298@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/51] [abbrv] incubator-ignite git commit: #ignite-758: rename method forceRepartition to rebalance in IgniteInternalCache. X-Virus-Checked: Checked by ClamAV on apache.org #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-446 Commit: 15ee31bb089b88adf1c842a0d73480c19fd3da31 Parents: b2b5656 Author: ivasilinets Authored: Fri Apr 17 11:29:30 2015 +0300 Committer: ivasilinets 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 implements IgniteInternalCache 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 implements IgniteInternalCache, 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 extends Iterable> { *

* @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, Void> for (IgniteInternalCache c : ignite.cachesx()) { if (cacheNames.contains(c.name())) - futs.add(c.forceRepartition()); + futs.add(c.rebalance()); } for (IgniteInternalFuture f : futs)