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 f4a16bd disable merge by default
new d4d5e00 Merge remote-tracking branch 'origin/master'
f4a16bd is described below
commit f4a16bd25ab4da788620902121b011f57f0b21f8
Author: qiaojialin <[email protected]>
AuthorDate: Sun May 17 11:06:57 2020 +0800
disable merge by default
---
server/src/assembly/resources/conf/iotdb-engine.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index 9f5676a..2de73b6 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -287,7 +287,7 @@ continue_merge_after_reboot=false
# A global merge will be performed each such interval, that is, each storage
group will be merged
# (if proper merge candidates can be found). Unit: second, default: 1hours.
# When less than or equal to 0, timed merge is disabled.
-merge_interval_sec=3600
+merge_interval_sec=0
# When set to true, all merges becomes full merge (the whole SeqFiles are
re-written despite how
# much they are overflowed). This may increase merge overhead depending on how
much the SeqFiles
