You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/12/07 15:34:48 UTC
(iotdb) branch master updated: Optimize the efficiency of map-related code in IRegionGroupAllocator (#11673)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 6c92fbc8c77 Optimize the efficiency of map-related code in IRegionGroupAllocator (#11673)
6c92fbc8c77 is described below
commit 6c92fbc8c77759b81000acc0da14da70bb921e65
Author: Potato <ta...@apache.org>
AuthorDate: Thu Dec 7 23:34:42 2023 +0800
Optimize the efficiency of map-related code in IRegionGroupAllocator (#11673)
Signed-off-by: OneSizeFitQuorum <ta...@apache.org>
---
.../manager/load/balancer/RegionBalancer.java | 7 ++---
.../region/CopySetRegionGroupAllocator.java | 4 +--
.../region/GreedyRegionGroupAllocator.java | 31 +++++++++-------------
3 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
index dc2c70fc003..a851f4a41a5 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
@@ -36,9 +36,9 @@ import org.apache.iotdb.confignode.manager.node.NodeManager;
import org.apache.iotdb.confignode.manager.partition.PartitionManager;
import org.apache.iotdb.confignode.manager.schema.ClusterSchemaManager;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
* The RegionBalancer provides interfaces to generate optimal Region allocation and migration plans
@@ -101,8 +101,9 @@ public class RegionBalancer {
for (int i = 0; i < allotment; i++) {
// Prepare input data
- Map<Integer, TDataNodeConfiguration> availableDataNodeMap = new ConcurrentHashMap<>();
- Map<Integer, Double> freeDiskSpaceMap = new ConcurrentHashMap<>();
+ Map<Integer, TDataNodeConfiguration> availableDataNodeMap =
+ new HashMap<>(availableDataNodes.size());
+ Map<Integer, Double> freeDiskSpaceMap = new HashMap<>(availableDataNodes.size());
availableDataNodes.forEach(
dataNodeConfiguration -> {
int dataNodeId = dataNodeConfiguration.getLocation().getDataNodeId();
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/CopySetRegionGroupAllocator.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/CopySetRegionGroupAllocator.java
index cf9255469eb..87ab7ddf9f0 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/CopySetRegionGroupAllocator.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/CopySetRegionGroupAllocator.java
@@ -88,12 +88,12 @@ public class CopySetRegionGroupAllocator implements IRegionGroupAllocator {
Map<TDataNodeLocation, Integer> countMap = new HashMap<>();
for (TDataNodeConfiguration dataNodeConfiguration : onlineDataNodes) {
maxId = Math.max(maxId, dataNodeConfiguration.getLocation().getDataNodeId());
- countMap.put(dataNodeConfiguration.getLocation(), 0);
+ countMap.putIfAbsent(dataNodeConfiguration.getLocation(), 0);
}
for (TRegionReplicaSet regionReplicaSet : allocatedRegions) {
for (TDataNodeLocation dataNodeLocation : regionReplicaSet.getDataNodeLocations()) {
countMap.computeIfPresent(dataNodeLocation, (dataNode, count) -> (count + 1));
- maximumRegionNum = Math.max(maximumRegionNum, countMap.get(dataNodeLocation));
+ maximumRegionNum = Math.max(maximumRegionNum, countMap.getOrDefault(dataNodeLocation, 0));
}
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyRegionGroupAllocator.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyRegionGroupAllocator.java
index 21b8b80bcbc..c01c94a4e60 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyRegionGroupAllocator.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyRegionGroupAllocator.java
@@ -28,11 +28,10 @@ import org.apache.iotdb.tsfile.utils.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static java.util.Map.Entry.comparingByValue;
@@ -42,8 +41,6 @@ public class GreedyRegionGroupAllocator implements IRegionGroupAllocator {
private static final Logger LOGGER = LoggerFactory.getLogger(GreedyRegionGroupAllocator.class);
- private static final AtomicInteger ZERO = new AtomicInteger(0);
-
public GreedyRegionGroupAllocator() {
// Empty constructor
}
@@ -69,29 +66,25 @@ public class GreedyRegionGroupAllocator implements IRegionGroupAllocator {
List<TRegionReplicaSet> allocatedRegionGroups) {
// Map<DataNodeId, Region count>
- Map<Integer, AtomicInteger> regionCounter = new ConcurrentHashMap<>();
+ Map<Integer, Integer> regionCounter = new HashMap<>(availableDataNodeMap.size());
allocatedRegionGroups.forEach(
regionReplicaSet ->
regionReplicaSet
.getDataNodeLocations()
.forEach(
dataNodeLocation ->
- regionCounter
- .computeIfAbsent(
- dataNodeLocation.getDataNodeId(), empty -> new AtomicInteger(0))
- .getAndIncrement()));
+ regionCounter.merge(dataNodeLocation.getDataNodeId(), 1, Integer::sum)));
/* Construct priority map */
- Map<TDataNodeLocation, Pair<Integer, Double>> priorityMap = new ConcurrentHashMap<>();
- availableDataNodeMap
- .keySet()
- .forEach(
- dataNodeId ->
- priorityMap.put(
- availableDataNodeMap.get(dataNodeId).getLocation(),
- new Pair<>(
- regionCounter.getOrDefault(dataNodeId, ZERO).get(),
- freeDiskSpaceMap.getOrDefault(dataNodeId, 0d))));
+ Map<TDataNodeLocation, Pair<Integer, Double>> priorityMap =
+ new HashMap<>(availableDataNodeMap.size());
+ availableDataNodeMap.forEach(
+ (datanodeId, dataNodeConfiguration) ->
+ priorityMap.put(
+ dataNodeConfiguration.getLocation(),
+ new Pair<>(
+ regionCounter.getOrDefault(datanodeId, 0),
+ freeDiskSpaceMap.getOrDefault(datanodeId, 0d))));
// Sort weightList
List<TDataNodeLocation> result =