This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 633d6ed Merge branch 'master' into dev_merge
add 0a7bcbb use reader cache in MergeResource to construct MergeReader
No new revisions were added by this update.
Summary of changes:
.../db/engine/merge/manage/MergeResource.java | 26 +++++++++++++++++--
.../engine/merge/selector/MergeFileSelector.java | 5 +++-
.../iotdb/db/engine/merge/task/MergeTask.java | 5 ++--
.../db/engine/merge/task/RecoverMergeTask.java | 2 +-
.../engine/storagegroup/StorageGroupProcessor.java | 9 ++++---
.../resourceRelated/UnseqResourceMergeReader.java | 11 ++++++++
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 25 +++++++++++++++++++
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 5 ++--
.../iotdb/db/engine/merge/MergePerfTest.java | 5 ++--
.../iotdb/db/engine/merge/MergeTaskTest.java | 29 +++++++++++-----------
.../apache/iotdb/db/engine/merge/MergeTest.java | 4 +--
11 files changed, 96 insertions(+), 30 deletions(-)
