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 4baa36e fix an NPE when closing mergeLogger
add 7062470 code refinement remove usage of MetadataQuerier in merge
No new revisions were added by this update.
Summary of changes:
.../db/engine/merge/manage/MergeResource.java | 60 ++++-------
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 73 ++++++++-----
.../iotdb/db/engine/merge/recover/MergeLogger.java | 52 ++++-----
.../merge/selector/FileQueryMemMeasurement.java} | 20 ++--
.../engine/merge/selector/MergeFileSelector.java | 118 ++++++++-------------
.../db/engine/merge/task/RecoverMergeTask.java | 4 +
.../engine/storagegroup/StorageGroupProcessor.java | 2 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 6 ++
.../db/engine/merge/MergeFileSelectorTest.java | 10 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 59 ++++++++++-
.../read/controller/MetadataQuerierByFileImpl.java | 28 +----
11 files changed, 226 insertions(+), 206 deletions(-)
copy
iotdb/src/main/java/org/apache/iotdb/db/{qp/strategy/optimizer/IFilterOptimizer.java
=> engine/merge/selector/FileQueryMemMeasurement.java} (69%)
