You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/08/07 12:48:24 UTC

[2/2] ignite git commit: IGNITE-5872 - Replace counters map with arrays

IGNITE-5872 - Replace counters map with arrays


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

Branch: refs/heads/ignite-5872
Commit: 37e7aca66928f5d45a253edb277a114fed685158
Parents: 5a5a477
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Aug 7 15:48:04 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Aug 7 15:48:04 2017 +0300

----------------------------------------------------------------------
 .../distributed/dht/preloader/CachePartitionFullCountersMap.java  | 3 ++-
 .../dht/preloader/CachePartitionPartialCountersMap.java           | 3 ++-
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java            | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/37e7aca6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
index 0f0d62d..ae1d643 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
+import java.io.Serializable;
 import java.util.Arrays;
 
 /**
  *
  */
-public class CachePartitionFullCountersMap {
+public class CachePartitionFullCountersMap implements Serializable {
     /** */
     public static final CachePartitionFullCountersMap EMPTY = new CachePartitionFullCountersMap();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/37e7aca6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
index c6578d3..12d101e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
@@ -26,7 +27,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 /**
  *
  */
-public class CachePartitionPartialCountersMap {
+public class CachePartitionPartialCountersMap implements Serializable {
     /** */
     public static final CachePartitionPartialCountersMap EMPTY = new CachePartitionPartialCountersMap();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/37e7aca6/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 6789718..168b7ab 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
@@ -1738,6 +1738,9 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
                 }
             }
 
+            for (CacheGroupContext grpCtx : cctx.cache().cacheGroups())
+                grpCtx.topology().applyUpdateCounters();
+
             if (discoEvt.type() == EVT_NODE_JOINED)
                 assignPartitionsStates();
             else if (discoEvt.type() == EVT_DISCOVERY_CUSTOM_EVT) {