[incubator-iotdb] branch master updated: disable vm (#1643)

[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/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 379a7df  disable vm (#1643)
379a7df is described below

commit 379a7dfdd2bff0392193d5f88f55f2bec3e39342
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Sat Aug 22 16:40:23 2020 +0800

    disable vm (#1643)
---
 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 6302f78..29ba069 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -252,7 +252,7 @@ default_fill_interval=-1
 ### Merge Configurations
 ####################
 # Is vm merge enable.
-enable_vm=true
+enable_vm=false
 
 # The max vm num of each memtable. When vm num exceeds this, the vm files will 
merge to one.
 max_vm_num=10
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 18b083a..659c0b8 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
@@ -254,7 +254,7 @@ public class IoTDBConfig {
   /**
    * Is vm merge enable
    */
-  private boolean enableVm = true;
+  private boolean enableVm = false;
 
   /**
    * The max vm num of each memtable. When vm num exceeds this, the vm files 
will merge to one.