This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch hot_compaction_sonar
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 207fdfc Fix conflict
add cff8f1d change vm mergeTimes to flushTimes
add b263bf0 change flush vm times to 11 and add log
add c038c03 fix test
add ef48fac Merge branch 'hot_compaction' into hot_compaction_sonar
No new revisions were added by this update.
Summary of changes:
server/src/assembly/resources/conf/iotdb-engine.properties | 12 ++++++------
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 6 +++---
.../apache/iotdb/db/engine/storagegroup/TsFileProcessor.java | 6 ++++--
.../db/engine/storagegroup/TsFileProcessorEnableVmTest.java | 7 +++----
4 files changed, 16 insertions(+), 15 deletions(-)