This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new de50fb5a46 [enhancement](Tablet) rename pathHashToDishInfoRef to
pathHashToDiskInfoRef (#24311)
de50fb5a46 is described below
commit de50fb5a462e1cd98a4fedcfa5705ba3e00418c7
Author: xy720 <[email protected]>
AuthorDate: Sat Sep 16 18:39:11 2023 +0800
[enhancement](Tablet) rename pathHashToDishInfoRef to pathHashToDiskInfoRef
(#24311)
---
fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java | 2 +-
.../src/main/java/org/apache/doris/system/SystemInfoService.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
index 8b3bbe9ae7..3be373f21e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
@@ -563,7 +563,7 @@ public class Tablet extends MetaObject implements Writable {
// 3. replica is under relocating
if (stable < replicationNum) {
- List<Long> replicaBeIds =
replicas.stream().map(Replica::getBackendId).collect(Collectors.toList());
+ Set<Long> replicaBeIds =
replicas.stream().map(Replica::getBackendId).collect(Collectors.toSet());
List<Long> availableBeIds =
aliveBeIds.stream().filter(systemInfoService::checkBackendScheduleAvailable)
.collect(Collectors.toList());
if (replicaBeIds.containsAll(availableBeIds)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
index 5cc6b36f87..9cf9f5ad27 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
@@ -77,7 +77,7 @@ public class SystemInfoService {
private volatile ImmutableMap<Long, Backend> idToBackendRef =
ImmutableMap.of();
private volatile ImmutableMap<Long, AtomicLong> idToReportVersionRef =
ImmutableMap.of();
- private volatile ImmutableMap<Long, DiskInfo> pathHashToDishInfoRef =
ImmutableMap.of();
+ private volatile ImmutableMap<Long, DiskInfo> pathHashToDiskInfoRef =
ImmutableMap.of();
public static class HostInfo implements Comparable<HostInfo> {
public String host;
@@ -848,7 +848,7 @@ public class SystemInfoService {
*/
public Status checkExceedDiskCapacityLimit(Multimap<Long, Long>
bePathsMap, boolean floodStage) {
LOG.debug("pathBeMap: {}", bePathsMap);
- ImmutableMap<Long, DiskInfo> pathHashToDiskInfo =
pathHashToDishInfoRef;
+ ImmutableMap<Long, DiskInfo> pathHashToDiskInfo =
pathHashToDiskInfoRef;
for (Long beId : bePathsMap.keySet()) {
for (Long pathHash : bePathsMap.get(beId)) {
DiskInfo diskInfo = pathHashToDiskInfo.get(pathHash);
@@ -865,7 +865,7 @@ public class SystemInfoService {
// update the path info when disk report
// there is only one thread can update path info, so no need to worry
about concurrency control
public void updatePathInfo(List<DiskInfo> addedDisks, List<DiskInfo>
removedDisks) {
- Map<Long, DiskInfo> copiedPathInfos =
Maps.newHashMap(pathHashToDishInfoRef);
+ Map<Long, DiskInfo> copiedPathInfos =
Maps.newHashMap(pathHashToDiskInfoRef);
for (DiskInfo diskInfo : addedDisks) {
copiedPathInfos.put(diskInfo.getPathHash(), diskInfo);
}
@@ -873,7 +873,7 @@ public class SystemInfoService {
copiedPathInfos.remove(diskInfo.getPathHash());
}
ImmutableMap<Long, DiskInfo> newPathInfos =
ImmutableMap.copyOf(copiedPathInfos);
- pathHashToDishInfoRef = newPathInfos;
+ pathHashToDiskInfoRef = newPathInfos;
LOG.debug("update path infos: {}", newPathInfos);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
