[iotdb] branch master updated: update force full merge config (#3194)

[qiaojialin]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ebf1a73  update force full merge config (#3194)
ebf1a73 is described below

commit ebf1a73b88d4438bff6a2b7ab28398d8a917f876
Author: zhanglingzhe0820 <445073...@qq.com>
AuthorDate: Fri May 14 16:14:21 2021 +0800

    update force full merge config (#3194)
---
 server/src/assembly/resources/conf/iotdb-engine.properties     | 2 +-
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties 
b/server/src/assembly/resources/conf/iotdb-engine.properties
index 8633588..fb87a99 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -451,7 +451,7 @@ timestamp_precision=ms
 # much they are overflowed). This may increase merge overhead depending on how 
much the SeqFiles
 # are overflowed.
 # Datatype: boolean
-# force_full_merge=false
+# force_full_merge=true
 
 # How many threads will be set up to perform compaction, 10 by default.
 # Set to 1 when less than or equal to 0.
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 2a5369a..ee1b9d9 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
@@ -519,7 +519,7 @@ public class IoTDBConfig {
    * despite how much they are overflowed). This may increase merge overhead 
depending on how much
    * the SeqFiles are overflowed.
    */
-  private boolean forceFullMerge = false;
+  private boolean forceFullMerge = true;
 
   /** The limit of compaction merge can reach per second */
   private int mergeWriteThroughputMbPerSec = 8;