You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/09/28 06:51:55 UTC

[08/12] ignite git commit: IGNITE-9612 Fix NPE related not thread safe usage TreeMap onMarkCheckpointBegin

IGNITE-9612 Fix NPE related not thread safe usage TreeMap onMarkCheckpointBegin


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

Branch: refs/heads/ignite-gg-14206
Commit: 4527fe6de8bddea31a8142e78a84eacb534d0384
Parents: 9e0c1e7
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Thu Sep 27 19:40:18 2018 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Thu Sep 27 19:40:18 2018 +0300

----------------------------------------------------------------------
 .../cache/persistence/partstate/PartitionAllocationMap.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4527fe6d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/partstate/PartitionAllocationMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/partstate/PartitionAllocationMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/partstate/PartitionAllocationMap.java
index c2cc171..cab90c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/partstate/PartitionAllocationMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/partstate/PartitionAllocationMap.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.internal.processors.cache.persistence.partstate;
 
-import java.util.HashSet;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Set;
-import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 import org.apache.ignite.internal.pagemem.FullPageId;
 import org.apache.ignite.internal.pagemem.PageIdAllocator;
 import org.apache.ignite.internal.pagemem.PageIdUtils;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.jetbrains.annotations.NotNull;
@@ -37,11 +37,11 @@ import org.jetbrains.annotations.Nullable;
 public class PartitionAllocationMap {
     /** Maps following pairs: (groupId, partId) -> (lastAllocatedCount, allocatedCount) */
     @GridToStringInclude
-    private final NavigableMap<GroupPartitionId, PagesAllocationRange> map = new TreeMap<>();
+    private final NavigableMap<GroupPartitionId, PagesAllocationRange> map = new ConcurrentSkipListMap<>();
 
     /** Partitions forced to be skipped. */
     @GridToStringInclude
-    private final Set<GroupPartitionId> skippedParts = new HashSet<>();
+    private final Set<GroupPartitionId> skippedParts = new GridConcurrentHashSet<>();
 
     /**
      * Returns the value to which the specified key is mapped,