[iotdb] 01/02: finish v2

[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

commit 1e39adf43900b5b6534751e571870d328b8a5058
Author: EJTTianyu <16...@qq.com>
AuthorDate: Sat Jan 30 11:33:57 2021 +0800

    finish v2
---
 server/src/assembly/resources/conf/iotdb-engine.properties | 14 +++++++-------
 server/src/assembly/resources/conf/iotdb-env.sh            |  4 ++--
 .../apache/iotdb/db/engine/flush/TsFileFlushPolicy.java    |  8 +++-----
 .../iotdb/db/engine/storagegroup/TsFileProcessor.java      |  6 ------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 931ee25..8e490a3 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -50,7 +50,7 @@ thrift_init_buffer_size=1024
 ####################
 
 # Is insert ahead log enable
-enable_wal=true
+enable_wal=false
 
 # Add a switch to drop ouf-of-order data
 # Out-of-order data will impact the aggregation query a lot. Users may not care about discarding some out-of-order data.
@@ -91,7 +91,7 @@ force_wal_period_in_ms=100
 # data_dirs=data\\data
 # For Linux platform
 # If its prefix is "/", then the path is absolute. Otherwise, it is relative.
-# data_dirs=data/data
+ data_dirs=/data/vldb
 
 
 # mult_dir_strategy
@@ -227,12 +227,12 @@ mtree_snapshot_threshold_time=3600
 ####################
 
 # Whether to enable memory control
-enable_mem_control=true
+enable_mem_control=false
 
 # Memory Allocation Ratio: Write, Read, Schema and Free Memory.
 # The parameter form is a:b:c:d, where a, b, c and d are integers. for example: 1:1:1:1 , 6:2:1:1
 # If you have high level of writing pressure and low level of reading pressure, please adjust it to for example 6:1:1:2 
-write_read_schema_free_memory_proportion=4:3:1:2
+write_read_schema_free_memory_proportion=6:2:1:1
 
 # primitive array size (length of each array) in array pool
 primitive_array_size=128
@@ -293,11 +293,11 @@ default_fill_interval=-1
 ### Merge Configurations
 ####################
 # LEVEL_COMPACTION, NO_COMPACTION
-compaction_strategy=LEVEL_COMPACTION
+compaction_strategy=NO_COMPACTION
 
 # Works when the compaction_strategy is LEVEL_COMPACTION.
 # Whether to merge unseq files into seq files or not.
-enable_unseq_compaction = true
+enable_unseq_compaction=true
 
 # Works when the compaction_strategy is LEVEL_COMPACTION.
 # The max seq file num of each level.
@@ -310,7 +310,7 @@ seq_file_num_in_each_level=6
 seq_level_num=3
 
 # Works when compaction_strategy is LEVEL_COMPACTION.
-# The max ujseq file num of each level.
+# The max unseq file num of each level.
 # When the num of files in one level exceeds this,
 # the files in this level will merge to one and put to upper level.
 unseq_file_num_in_each_level=10
diff --git a/server/src/assembly/resources/conf/iotdb-env.sh b/server/src/assembly/resources/conf/iotdb-env.sh
index 10e8baa..7ec6270 100755
--- a/server/src/assembly/resources/conf/iotdb-env.sh
+++ b/server/src/assembly/resources/conf/iotdb-env.sh
@@ -166,9 +166,9 @@ calculate_heap_sizes
 #HEAP_NEWSIZE="`expr $system_memory_in_mb \* $min_percentage / 100`M"
 
 # Maximum heap size
-#MAX_HEAP_SIZE="2G"
+MAX_HEAP_SIZE="20G"
 # Minimum heap size
-#HEAP_NEWSIZE="2G"
+HEAP_NEWSIZE="10G"
 
 #true or false
 #DO NOT FORGET TO MODIFY THE PASSWORD FOR SECURITY (${IOTDB_CONF}/jmx.password and ${IOTDB_CONF}/jmx.access)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/TsFileFlushPolicy.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/TsFileFlushPolicy.java
index d760819..201d077 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/TsFileFlushPolicy.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/TsFileFlushPolicy.java
@@ -36,11 +36,9 @@ public interface TsFileFlushPolicy {
     @Override
     public void apply(StorageGroupProcessor storageGroupProcessor, TsFileProcessor tsFileProcessor,
         boolean isSeq) {
-      if (tsFileProcessor.shouldClose()) {
-        storageGroupProcessor.asyncCloseOneTsFileProcessor(isSeq, tsFileProcessor);
-      } else {
-        tsFileProcessor.asyncFlush();
-      }
+      // 投稿使用，一个 Tsfile 由一个 memtable flush 形成
+      storageGroupProcessor.asyncCloseOneTsFileProcessor(isSeq, tsFileProcessor);
     }
+
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index d14f257..c3ba768 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -426,12 +426,6 @@ public class TsFileProcessor {
           workMemTable.memSize(), tsFileResource.getTsFile().getAbsolutePath());
       return true;
     }
-    if (workMemTable.reachTotalPointNumThreshold()) {
-      logger.info("The avg series points num {} of tsfile {} reaches the threshold",
-          workMemTable.getTotalPointsNum() / workMemTable.getSeriesNumber(),
-          tsFileResource.getTsFile().getAbsolutePath());
-      return true;
-    }
     return false;
   }