This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new a60d00ef8de [to dev/1.3] reduce error log when compaction service is
stopped & fix bugs (#16755)
a60d00ef8de is described below
commit a60d00ef8de7597d5c16fcfdb438fa0f367eb317
Author: shuwenwei <[email protected]>
AuthorDate: Mon Nov 17 11:42:28 2025 +0800
[to dev/1.3] reduce error log when compaction service is stopped & fix bugs
(#16755)
* reduce error log when compaction service is stopped
* fix writer for compaction tests
* fix npe
---
.../compaction/execute/task/AbstractCompactionTask.java | 3 ++-
.../compaction/execute/task/InnerSpaceCompactionTask.java | 14 +++++++-------
.../compaction/utils/CompactionTestFileWriter.java | 6 +++++-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/AbstractCompactionTask.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/AbstractCompactionTask.java
index 8d7bbd2d14d..fba00fae125 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/AbstractCompactionTask.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/AbstractCompactionTask.java
@@ -165,7 +165,8 @@ public abstract class AbstractCompactionTask {
} else if (e instanceof InterruptedException
|| Thread.interrupted()
|| e instanceof StopReadTsFileByInterruptException
- || !tsFileManager.isAllowCompaction()) {
+ || !tsFileManager.isAllowCompaction()
+ || CompactionTaskManager.getInstance().isStopAllCompactionWorker()) {
logger.warn(
"{}-{} [Compaction] {} task interrupted",
storageGroupName,
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 a9dfce2bad3..ca55e79bee1 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
@@ -117,14 +117,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;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionTestFileWriter.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionTestFileWriter.java
index 8c994837b90..28ba8e214b7 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionTestFileWriter.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionTestFileWriter.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.db.storageengine.dataregion.compaction.utils;
+import
org.apache.iotdb.db.storageengine.dataregion.compaction.io.CompactionTsFileWriter;
+import
org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.constant.CompactionType;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import org.apache.tsfile.enums.TSDataType;
@@ -50,7 +52,9 @@ public class CompactionTestFileWriter implements Closeable {
public CompactionTestFileWriter(TsFileResource emptyFile) throws IOException
{
this.resource = emptyFile;
- fileWriter = new TsFileIOWriter(emptyFile.getTsFile());
+ fileWriter =
+ new CompactionTsFileWriter(
+ emptyFile.getTsFile(), 1024 * 1024 * 1024,
CompactionType.INNER_SEQ_COMPACTION);
}
public IDeviceID startChunkGroup(String deviceNameWithoutParentPath) throws
IOException {
