[iotdb] branch dynamic_compaction updated: add hitter config

[ej...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ejttianyu pushed a commit to branch dynamic_compaction
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/dynamic_compaction by this push:
     new 8646a04  add hitter config
8646a04 is described below

commit 8646a042f784357e124527770e628b699ab286f8
Author: EJTTianyu <16...@qq.com>
AuthorDate: Sat Mar 13 22:45:11 2021 +0800

    add hitter config
---
 server/src/assembly/resources/conf/iotdb-engine.properties  | 13 +++++++++++++
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java |  2 +-
 .../main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 13 +++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index fa16a25..a08d9bf 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -371,6 +371,19 @@ compaction_thread_num=10
 merge_write_throughput_mb_per_sec=8
 
 ####################
+### Hitter Merge Configurations
+####################
+
+# query hitter strategy
+query_hitter_strategy=DEFAULT_STRATEGY
+
+# max query paths hitter contains
+max_hitter_num=5000
+
+# size ratio of the hitter level merge
+size_ratio=2
+
+####################
 ### Metadata Cache Configuration
 ####################
 
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 477b4ae..e49561c 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -318,7 +318,7 @@ public class IoTDBConfig {
   private QueryHitterStrategy queryHitterStrategy = QueryHitterStrategy.DEFAULT_STRATEGY;
 
   /**
-   * max query path hitter contains
+   * max query paths hitter contains
    */
   private int maxHitterNum = 5000;
 
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 f9f1750..770f648 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
@@ -33,6 +33,7 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.iotdb.db.conf.directories.DirectoryManager;
 import org.apache.iotdb.db.engine.compaction.CompactionStrategy;
+import org.apache.iotdb.db.engine.heavyhitter.QueryHitterStrategy;
 import org.apache.iotdb.db.exception.query.QueryProcessException;
 import org.apache.iotdb.db.utils.FilePathUtils;
 import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
@@ -336,6 +337,18 @@ public class IoTDBDescriptor {
           .getProperty("unseq_file_num_in_each_level",
               Integer.toString(conf.getUnseqFileNumInEachLevel()))));
 
+      conf.setQueryHitterStrategy(QueryHitterStrategy.valueOf(properties
+          .getProperty("query_hitter_strategy",
+              conf.getQueryHitterStrategy().toString())));
+
+      conf.setMaxHitterNum(Integer.parseInt(properties
+          .getProperty("max_hitter_num",
+              Integer.toString(conf.getMaxHitterNum()))));
+
+      conf.setSizeRatio(Integer.parseInt(properties
+          .getProperty("size_ratio",
+              Integer.toString(conf.getSizeRatio()))));
+
       conf.setSyncEnable(Boolean
           .parseBoolean(properties.getProperty("is_sync_enable",
               Boolean.toString(conf.isSyncEnable()))));