You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ju...@apache.org on 2026/04/01 01:54:26 UTC
(iotdb) branch load_scan updated: fix
This is an automated email from the ASF dual-hosted git repository.
justinchen pushed a commit to branch load_scan
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/load_scan by this push:
new 34f9363be75 fix
34f9363be75 is described below
commit 34f9363be75eb9b4410e3be870090e34c65d473d
Author: Caideyipi <87...@users.noreply.github.com>
AuthorDate: Wed Apr 1 09:54:14 2026 +0800
fix
---
.../db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java | 5 ++++-
.../org/apache/iotdb/db/storageengine/load/LoadTsFileManager.java | 4 ++--
.../iotdb/db/storageengine/load/active/ActiveLoadPendingQueue.java | 4 ++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
index 1730fa2d921..bc8446fd3da 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
@@ -286,7 +286,10 @@ public class LoadTsFileScheduler implements IScheduler {
final StringBuilder failedTsFiles =
new StringBuilder(
!tsFileNodeList.isEmpty()
- ? tsFileNodeList.get(0).getTsFileResource().getTsFilePath()
+ ? tsFileNodeList
+ .get(failedTsFileNodeIndexes.get(0))
+ .getTsFileResource()
+ .getTsFilePath()
: "");
final ListIterator<Integer> iterator = failedTsFileNodeIndexes.listIterator(1);
while (iterator.hasNext()) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/LoadTsFileManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/LoadTsFileManager.java
index 582fcb8c49c..16c78811d08 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/LoadTsFileManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/LoadTsFileManager.java
@@ -224,7 +224,7 @@ public class LoadTsFileManager {
}
}
- final Optional<CleanupTask> cleanupTask = Optional.of(uuid2CleanupTask.get(uuid));
+ final Optional<CleanupTask> cleanupTask = Optional.ofNullable(uuid2CleanupTask.get(uuid));
cleanupTask.ifPresent(CleanupTask::markLoadTaskRunning);
try {
final AtomicReference<Exception> exception = new AtomicReference<>();
@@ -304,7 +304,7 @@ public class LoadTsFileManager {
return false;
}
- final Optional<CleanupTask> cleanupTask = Optional.of(uuid2CleanupTask.get(uuid));
+ final Optional<CleanupTask> cleanupTask = Optional.ofNullable(uuid2CleanupTask.get(uuid));
cleanupTask.ifPresent(CleanupTask::markLoadTaskRunning);
try {
uuid2WriterManager.get(uuid).loadAll(isGeneratedByPipe, timePartitionProgressIndexMap);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPendingQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPendingQueue.java
index 7b5f7166197..88c18b19cb6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPendingQueue.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPendingQueue.java
@@ -70,11 +70,11 @@ public class ActiveLoadPendingQueue {
return loadingFileSet.contains(file) || pendingFileSet.contains(file);
}
- public int size() {
+ public synchronized int size() {
return pendingFileQueue.size() + loadingFileSet.size();
}
- public boolean isEmpty() {
+ public synchronized boolean isEmpty() {
return pendingFileQueue.isEmpty() && loadingFileSet.isEmpty();
}