This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a change to branch dev_new_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 4bd325f merge master version2
add b18fe16 revert chunkWriterCache
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/db/engine/merge/manage/MergeResource.java | 12 +++++++-----
.../engine/merge/seqMerge/inplace/task/InplaceMergeTask.java | 8 +++++---
.../engine/merge/seqMerge/squeeze/task/SqueezeMergeTask.java | 6 ++++--
.../sizeMerge/independence/task/IndependenceMergeTask.java | 4 ++--
.../regularization/task/RegularizationMergeTask.java | 6 ++++--
5 files changed, 22 insertions(+), 14 deletions(-)
