Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BC8A8200CE5 for ; Fri, 7 Jul 2017 13:34:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BAFBF168E4A; Fri, 7 Jul 2017 11:34:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AE392168E45 for ; Fri, 7 Jul 2017 13:34:37 +0200 (CEST) Received: (qmail 10246 invoked by uid 500); 7 Jul 2017 11:34:36 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 10233 invoked by uid 99); 7 Jul 2017 11:34:36 -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; Fri, 07 Jul 2017 11:34:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F591E96B4; Fri, 7 Jul 2017 11:34:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 07 Jul 2017 11:34:35 -0000 Message-Id: <1fef31b9c1f544e991f433450bf08b23@git.apache.org> In-Reply-To: <58c07aa8ef5f422e8d1b84575c8d6c64@git.apache.org> References: <58c07aa8ef5f422e8d1b84575c8d6c64@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] ignite git commit: Rename ActionData -> CacheActionData. archived-at: Fri, 07 Jul 2017 11:34:38 -0000 Rename ActionData -> CacheActionData. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f589628f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f589628f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f589628f Branch: refs/heads/ignite-2.1.2-grpId Commit: f589628f4846f14efc8e702b61856cc90a3d0dc7 Parents: 85d8c65 Author: sboikov Authored: Fri Jul 7 13:52:38 2017 +0300 Committer: sboikov Committed: Fri Jul 7 13:52:38 2017 +0300 ---------------------------------------------------------------------- .../cache/CacheAffinitySharedManager.java | 10 +++--- .../processors/cache/ClusterCachesInfo.java | 2 +- .../processors/cache/ExchangeActions.java | 34 ++++++++++---------- .../processors/cache/GridCacheProcessor.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java index 8d08c3f..548d795 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java @@ -701,7 +701,7 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap } }); - for (ExchangeActions.ActionData action : exchActions.cacheStartRequests()) { + for (ExchangeActions.CacheActionData action : exchActions.cacheStartRequests()) { DynamicCacheDescriptor cacheDesc = action.descriptor(); DynamicCacheChangeRequest req = action.request(); @@ -768,7 +768,7 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap Set gprs = new HashSet<>(); - for (ExchangeActions.ActionData action : exchActions.cacheStartRequests()) { + for (ExchangeActions.CacheActionData action : exchActions.cacheStartRequests()) { Integer grpId = action.descriptor().groupId(); if (gprs.add(grpId)) { @@ -786,7 +786,7 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap } } - for (ExchangeActions.ActionData action : exchActions.cacheStopRequests()) + for (ExchangeActions.CacheActionData action : exchActions.cacheStopRequests()) cctx.cache().blockGateway(action.request().cacheName(), true, action.request().restart()); for (ExchangeActions.CacheGroupActionData action : exchActions.cacheGroupsToStop()) { @@ -2308,10 +2308,10 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap assert old == null : old; } - for (ExchangeActions.ActionData req : exchActions.cacheStopRequests()) + for (ExchangeActions.CacheActionData req : exchActions.cacheStopRequests()) registeredCaches.remove(req.descriptor().cacheId()); - for (ExchangeActions.ActionData req : exchActions.cacheStartRequests()) + for (ExchangeActions.CacheActionData req : exchActions.cacheStartRequests()) registeredCaches.put(req.descriptor().cacheId(), req.descriptor()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java index 5aca8c9..738e4ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java @@ -624,7 +624,7 @@ class ClusterCachesInfo { // If all caches in group will be destroyed it is not necessary to destroy single cache // because group will be stopped anyway. if (req.destroy()) { - for (ExchangeActions.ActionData action : exchangeActions.cacheStopRequests()) { + for (ExchangeActions.CacheActionData action : exchangeActions.cacheStopRequests()) { if (action.descriptor().groupId() == grpDesc.groupId()) action.request().destroy(false); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java index e9ece5a..1cc6438 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java @@ -41,13 +41,13 @@ public class ExchangeActions { private List cacheGrpsToStop; /** */ - private Map cachesToStart; + private Map cachesToStart; /** */ - private Map cachesToStop; + private Map cachesToStop; /** */ - private Map cachesToResetLostParts; + private Map cachesToResetLostParts; /** */ private StateChangeRequest stateChangeReq; @@ -60,7 +60,7 @@ public class ExchangeActions { Boolean destroy = null; // Check that caches associated with that group will be all stopped only or all destroyed. - for (ExchangeActions.ActionData action : cacheStopRequests()) { + for (CacheActionData action : cacheStopRequests()) { if (action.descriptor().groupId() == grpId) { if (destroy == null) destroy = action.request().destroy(); @@ -89,15 +89,15 @@ public class ExchangeActions { /** * @return New caches start requests. */ - public Collection cacheStartRequests() { - return cachesToStart != null ? cachesToStart.values() : Collections.emptyList(); + public Collection cacheStartRequests() { + return cachesToStart != null ? cachesToStart.values() : Collections.emptyList(); } /** * @return Stop cache requests. */ - Collection cacheStopRequests() { - return cachesToStop != null ? cachesToStop.values() : Collections.emptyList(); + Collection cacheStopRequests() { + return cachesToStop != null ? cachesToStop.values() : Collections.emptyList(); } /** @@ -114,7 +114,7 @@ public class ExchangeActions { */ public boolean systemCachesStarting() { if (cachesToStart != null) { - for (ActionData data : cachesToStart.values()) { + for (CacheActionData data : cachesToStart.values()) { if (CU.isSystemCache(data.request().cacheName())) return true; } @@ -127,9 +127,9 @@ public class ExchangeActions { * @param map Actions map. * @param ctx Context. */ - private void completeRequestFutures(Map map, GridCacheSharedContext ctx) { + private void completeRequestFutures(Map map, GridCacheSharedContext ctx) { if (map != null) { - for (ActionData req : map.values()) + for (CacheActionData req : map.values()) ctx.cache().completeCacheStartFuture(req.req, true, null); } } @@ -159,7 +159,7 @@ public class ExchangeActions { */ public boolean cacheStopped(int cacheId) { if (cachesToStop != null) { - for (ActionData cache : cachesToStop.values()) { + for (CacheActionData cache : cachesToStop.values()) { if (cache.desc.cacheId() == cacheId) return true; } @@ -174,7 +174,7 @@ public class ExchangeActions { */ public boolean cacheStarted(int cacheId) { if (cachesToStart != null) { - for (ActionData cache : cachesToStart.values()) { + for (CacheActionData cache : cachesToStart.values()) { if (cache.desc.cacheId() == cacheId) return true; } @@ -217,7 +217,7 @@ public class ExchangeActions { * @param desc Cache descriptor. * @return Actions map. */ - private Map add(Map map, + private Map add(Map map, DynamicCacheChangeRequest req, DynamicCacheDescriptor desc) { assert req != null; @@ -226,7 +226,7 @@ public class ExchangeActions { if (map == null) map = new HashMap<>(); - ActionData old = map.put(req.cacheName(), new ActionData(req, desc)); + CacheActionData old = map.put(req.cacheName(), new CacheActionData(req, desc)); assert old == null : old; @@ -347,7 +347,7 @@ public class ExchangeActions { /** * */ - public static class ActionData { + public static class CacheActionData { /** */ private final DynamicCacheChangeRequest req; @@ -358,7 +358,7 @@ public class ExchangeActions { * @param req Request. * @param desc Cache descriptor. */ - ActionData(DynamicCacheChangeRequest req, DynamicCacheDescriptor desc) { + CacheActionData(DynamicCacheChangeRequest req, DynamicCacheDescriptor desc) { assert req != null; assert desc != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 321e6dd..0a69d72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2126,7 +2126,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { } } - for (ExchangeActions.ActionData action : exchActions.cacheStopRequests()) { + for (ExchangeActions.CacheActionData action : exchActions.cacheStopRequests()) { stopGateway(action.request()); sharedCtx.database().checkpointReadLock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f589628f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 2151101..97fcb12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -767,7 +767,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte if (cctx.database().persistenceEnabled() && !cctx.kernalContext().clientNode()) { List startDescs = new ArrayList<>(); - for (ExchangeActions.ActionData startReq : exchActions.cacheStartRequests()) + for (ExchangeActions.CacheActionData startReq : exchActions.cacheStartRequests()) startDescs.add(startReq.descriptor()); cctx.database().readCheckpointAndRestoreMemory(startDescs);