You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by sh...@apache.org on 2025/11/14 07:30:51 UTC
(iotdb) branch reduceErrorLogWhenStoppingCompactionService updated: fix npe
This is an automated email from the ASF dual-hosted git repository.
shuwenwei pushed a commit to branch reduceErrorLogWhenStoppingCompactionService
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/reduceErrorLogWhenStoppingCompactionService by this push:
new f1f047ee07c fix npe
f1f047ee07c is described below
commit f1f047ee07cb09f6bac1bb554db06e1d39354b41
Author: shuwenwei <s1...@gmail.com>
AuthorDate: Fri Nov 14 15:30:38 2025 +0800
fix npe
---
.../execute/task/InnerSpaceCompactionTask.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
index 3cd5ff532af..ff7cf934979 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
@@ -116,14 +116,14 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
}
protected static class InnerCompactionTaskFilesView {
- protected List<TsFileResource> sortedAllSourceFilesInTask;
- protected List<TsFileResource> sourceFilesInCompactionPerformer;
- protected List<TsFileResource> skippedSourceFiles;
+ protected List<TsFileResource> sortedAllSourceFilesInTask = Collections.emptyList();
+ protected List<TsFileResource> sourceFilesInCompactionPerformer = Collections.emptyList();
+ protected List<TsFileResource> skippedSourceFiles = Collections.emptyList();
protected boolean sequence;
- protected List<TsFileResource> sourceFilesInLog;
- protected List<TsFileResource> targetFilesInLog;
- protected List<TsFileResource> targetFilesInPerformer;
- protected List<TsFileResource> renamedTargetFiles;
+ protected List<TsFileResource> sourceFilesInLog = Collections.emptyList();
+ protected List<TsFileResource> targetFilesInLog = Collections.emptyList();
+ protected List<TsFileResource> targetFilesInPerformer = Collections.emptyList();
+ protected List<TsFileResource> renamedTargetFiles = Collections.emptyList();
protected long selectedFileSize;
protected int sumOfCompactionCount;
@@ -656,6 +656,9 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
* selected files to false.
*/
protected void releaseAllLocks() {
+ if (filesView.sourceFilesInLog == null) {
+ return;
+ }
for (int i = 0; i < filesView.sourceFilesInLog.size(); ++i) {
TsFileResource resource = filesView.sourceFilesInLog.get(i);
if (isHoldingWriteLock[i]) {