ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/5] ignite git commit: Rename ActionData -> CacheActionData.
Date Fri, 07 Jul 2017 11:34:35 GMT
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 <sboikov@gridgain.com>
Authored: Fri Jul 7 13:52:38 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
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<K, V> 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<K, V> extends GridCacheSharedManagerAdap
 
         Set<Integer> 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<K, V> 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<K, V> 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<CacheGroupActionData> cacheGrpsToStop;
 
     /** */
-    private Map<String, ActionData> cachesToStart;
+    private Map<String, CacheActionData> cachesToStart;
 
     /** */
-    private Map<String, ActionData> cachesToStop;
+    private Map<String, CacheActionData> cachesToStop;
 
     /** */
-    private Map<String, ActionData> cachesToResetLostParts;
+    private Map<String, CacheActionData> 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<ActionData> cacheStartRequests() {
-        return cachesToStart != null ? cachesToStart.values() : Collections.<ActionData>emptyList();
+    public Collection<CacheActionData> cacheStartRequests() {
+        return cachesToStart != null ? cachesToStart.values() : Collections.<CacheActionData>emptyList();
     }
 
     /**
      * @return Stop cache requests.
      */
-    Collection<ActionData> cacheStopRequests() {
-        return cachesToStop != null ? cachesToStop.values() : Collections.<ActionData>emptyList();
+    Collection<CacheActionData> cacheStopRequests() {
+        return cachesToStop != null ? cachesToStop.values() : Collections.<CacheActionData>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<String, ActionData> map, GridCacheSharedContext
ctx) {
+    private void completeRequestFutures(Map<String, CacheActionData> 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<String, ActionData> add(Map<String, ActionData> map,
+    private Map<String, CacheActionData> add(Map<String, CacheActionData> 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<DynamicCacheDescriptor> startDescs = new ArrayList<>();
 
-                    for (ExchangeActions.ActionData startReq : exchActions.cacheStartRequests())
+                    for (ExchangeActions.CacheActionData startReq : exchActions.cacheStartRequests())
                         startDescs.add(startReq.descriptor());
 
                     cctx.database().readCheckpointAndRestoreMemory(startDescs);


Mime
View raw message