You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2023/02/07 13:04:01 UTC
[iotdb] 01/01: add level control for cross compaction selecting
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch cross_selector_level_control
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 812d5250061b8d296ad747c8669f0a2952dad2dd
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Tue Feb 7 21:03:46 2023 +0800
add level control for cross compaction selecting
---
.../selector/impl/RewriteCrossSpaceCompactionSelector.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
index 1a3bb4480d..d02bbcadd7 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
@@ -30,6 +30,7 @@ import org.apache.iotdb.db.engine.compaction.selector.utils.CrossSpaceCompaction
import org.apache.iotdb.db.engine.compaction.selector.utils.CrossSpaceCompactionCandidate.CrossCompactionTaskResourceSplit;
import org.apache.iotdb.db.engine.compaction.selector.utils.CrossSpaceCompactionCandidate.TsFileResourceCandidate;
import org.apache.iotdb.db.engine.storagegroup.TsFileManager;
+import org.apache.iotdb.db.engine.storagegroup.TsFileNameGenerator;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.MergeException;
import org.apache.iotdb.db.rescon.SystemInfo;
@@ -186,7 +187,15 @@ public class RewriteCrossSpaceCompactionSelector implements ICrossSpaceSelector
CrossCompactionTaskResource taskResource,
TsFileResource unseqFile,
List<TsFileResource> seqFiles,
- long memoryCost) {
+ long memoryCost)
+ throws IOException {
+ TsFileNameGenerator.TsFileName unseqFileName =
+ TsFileNameGenerator.getTsFileName(unseqFile.getTsFile().getName());
+ // for the level-0 unseqFile, it is not allowed to be selected as the candidate of cross
+ // compaction task
+ if (unseqFileName.getInnerCompactionCnt() < 1) {
+ return false;
+ }
// currently, we must allow at least one unseqFile be selected to handle the situation that
// an unseqFile has huge time range but few data points.
if (taskResource.getUnseqFiles().isEmpty()) {