[iotdb] branch rel/0.11 updated: unify configuration

[qi...@apache.org]

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

qiaojialin pushed a commit to branch rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.11 by this push:
     new db43183  unify configuration
db43183 is described below

commit db431830233a0c46f28bb1e0cd0c954dfe4fc6a2
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Nov 6 14:22:16 2020 +0800

    unify configuration
---
 server/src/assembly/resources/conf/iotdb-engine.properties     | 4 ++--
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index ae71650..69efa26 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -176,8 +176,8 @@ wal_buffer_size=16777216
 # When a TsFile's file size (in byte) exceeds this, the TsFile is forced closed. The default threshold is 0.
 tsfile_size_threshold=0
 
-# When a memTable's size (in byte) exceeds this, the memtable is flushed to disk. The default threshold is 1 GB.
-memtable_size_threshold=1073741824
+# When a memTable's size (in byte) exceeds this, the memtable is flushed to disk. The default threshold is 256 MB.
+memtable_size_threshold=268435456
 
 # When the average point number of timeseries in memtable exceeds this, the memtable is flushed to disk. The default threshold is 10000.
 avg_series_point_number_threshold=10000
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 54b4528..5b0acb82 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
@@ -274,17 +274,17 @@ public class IoTDBConfig {
   /**
    * When a TsFile's file size (in byte) exceed this, the TsFile is forced closed.
    */
-  private long tsFileSizeThreshold = 512 * 1024 * 1024L;
+  private long tsFileSizeThreshold = 0L;
 
   /**
    * When a memTable's size (in byte) exceeds this, the memtable is flushed to disk.
    */
-  private long memtableSizeThreshold = 1024 * 1024 * 1024L;
+  private long memtableSizeThreshold = 256 * 1024 * 1024L;
 
   /**
    * When average series point number reaches this, flush the memtable to disk
    */
-  private int avgSeriesPointNumberThreshold = 100000;
+  private int avgSeriesPointNumberThreshold = 10000;
 
   /**
    * Work when tsfile_manage_strategy is level_strategy. When merge point number reaches this, merge