ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [27/50] [abbrv] ignite git commit: Merge with master - WIP
Date Thu, 29 Dec 2016 09:37:31 GMT
Merge with master - WIP


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

Branch: refs/heads/ignite-3477
Commit: 88a7eda47281e538a7c56b33c7882da7413c935e
Parents: 3063357
Author: Ilya Lantukh <ilantukh@gridgain.com>
Authored: Thu Dec 22 17:36:21 2016 +0300
Committer: Ilya Lantukh <ilantukh@gridgain.com>
Committed: Thu Dec 22 17:36:21 2016 +0300

----------------------------------------------------------------------
 .../GridCachePartitionExchangeManager.java      | 26 +++-----------------
 1 file changed, 3 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/88a7eda4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index c63da75..2b62ce9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -863,10 +863,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                     ready = cacheCtx.started();
 
                 if (ready) {
-                    GridAffinityAssignmentCache affCache = cacheCtx.affinity().affinityCache();
-
-                    if (affCache != null) {
-                        GridDhtPartitionFullMap locMap = cacheCtx.topology().partitionMap(true);
+                    GridDhtPartitionFullMap locMap = cacheCtx.topology().partitionMap(true);
 
                     addFullPartitionsMap(m,
                         dupData,
@@ -875,11 +872,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                         locMap,
                         cacheCtx.affinity().affinityCache().similarAffinityKey());
 
-                        if (exchId != null)
-                            m.addPartitionUpdateCounters(cacheCtx.cacheId(), cacheCtx.topology().updateCounters(true));
-                    }
-                    else
-                        assert cctx.cacheContext(cacheCtx.cacheId()) == null : cacheCtx.name();
+                    if (exchId != null)
+                        m.addPartitionUpdateCounters(cacheCtx.cacheId(), cacheCtx.topology().updateCounters(true));
                 }
             }
         }
@@ -950,20 +944,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
             cctx.kernalContext().clientNode(),
             false);
 
-        for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
-            if (!cacheCtx.isLocal()) {
-                GridDhtPartitionMap2 locMap = cacheCtx.topology().localPartitionMap();
-
-                m.addLocalPartitionMap(cacheCtx.cacheId(), locMap, null);
-            }
-        }
-
-        for (GridClientPartitionTopology top : clientTops.values()) {
-            GridDhtPartitionMap2 locMap = top.localPartitionMap();
-
-            m.addLocalPartitionMap(top.cacheId(), locMap, null);
-        }
-
         if (log.isDebugEnabled())
             log.debug("Sending local partitions [nodeId=" + node.id() + ", msg=" + m + ']');
 


Mime
View raw message