From 813568e3708026884c4eb702b68d6d79c1aa61b0 Mon Sep 17 00:00:00 2001 From: shuwenwei <55970239+shuwenwei@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:53:16 +0800 Subject: [PATCH] skip insertion compaction disk space check (#11959) --- .../InsertionCrossSpaceCompactionTask.java | 5 ++++ .../InsertionCrossCompactionTaskResource.java | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java index dcf54dff8063..f4662951705a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java @@ -327,6 +327,11 @@ public boolean equalsOtherTask(AbstractCompactionTask otherTask) { return false; } + @Override + public boolean isDiskSpaceCheckPassed() { + return true; + } + @Override public long getEstimatedMemoryCost() { return 0; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/selector/utils/InsertionCrossCompactionTaskResource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/selector/utils/InsertionCrossCompactionTaskResource.java index 561df5079e34..2a9d51b191e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/selector/utils/InsertionCrossCompactionTaskResource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/selector/utils/InsertionCrossCompactionTaskResource.java @@ -21,6 +21,9 @@ import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; +import java.util.ArrayList; +import java.util.List; + public class InsertionCrossCompactionTaskResource extends CrossCompactionTaskResource { public TsFileResource prevSeqFile = null; public TsFileResource nextSeqFile = null; @@ -37,6 +40,28 @@ public float getTotalSeqFileSize() { return super.getTotalSeqFileSize(); } + @Override + public List getSeqFiles() { + List seqFiles = new ArrayList<>(2); + if (prevSeqFile != null) { + seqFiles.add(prevSeqFile); + } + if (nextSeqFile != null) { + seqFiles.add(nextSeqFile); + } + return seqFiles; + } + + @Override + public List getUnseqFiles() { + List unseqFiles = new ArrayList<>(2); + unseqFiles.add(firstUnSeqFileInParitition); + if (toInsertUnSeqFile != firstUnSeqFileInParitition) { + unseqFiles.add(toInsertUnSeqFile); + } + return unseqFiles; + } + @Override public boolean isValid() { return toInsertUnSeqFile != null;