You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2023/05/05 12:28:07 UTC
[iotdb] branch rel/1.1 updated: [To rel/1.1] Add config min_cross_compaction_unseq_file_level for cross compaction (#9765)
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch rel/1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.1 by this push:
new acefedb1e7e [To rel/1.1] Add config min_cross_compaction_unseq_file_level for cross compaction (#9765)
acefedb1e7e is described below
commit acefedb1e7e9e14a36c05dd8abbf0135748ede22
Author: Zhang.Jinrui <xi...@gmail.com>
AuthorDate: Fri May 5 20:27:58 2023 +0800
[To rel/1.1] Add config min_cross_compaction_unseq_file_level for cross compaction (#9765)
---
node-commons/src/assembly/resources/conf/iotdb-common.properties | 4 ++++
server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index df384af89c4..2b1499973ca 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -631,6 +631,10 @@ cluster_name=defaultCluster
# Datatype: long, Unit: byte
# max_cross_compaction_candidate_file_size=5368709120
+# The min inner compaction level of unsequence file which can be selected as candidate
+# Datatype: int
+# min_cross_compaction_unseq_file_level=1
+
# If one merge file selection runs for more than this time, it will be ended and its current
# selection will be used as final selection.
# When < 0, it means time is unbounded.
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 505dce929f0..3fa875187bd 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -665,6 +665,11 @@ public class IoTDBDescriptor {
properties.getProperty(
"max_cross_compaction_candidate_file_size",
Long.toString(conf.getMaxCrossCompactionCandidateFileSize()))));
+ conf.setMinCrossCompactionUnseqFileLevel(
+ Integer.parseInt(
+ properties.getProperty(
+ "min_cross_compaction_unseq_file_level",
+ Integer.toString(conf.getMinCrossCompactionUnseqFileLevel()))));
conf.setCompactionWriteThroughputMbPerSec(
Integer.parseInt(