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 3048785 add Path comparator
add 6a59eca add MaxMergeFileStrategy allow merging multiple series at the
same time
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 +
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 10 +-
.../iotdb/db/engine/merge/recover/MergeLogger.java | 13 +-
.../merge/selector/MaxSeriesMergeFileSelector.java | 117 ++++++++
.../engine/merge/selector/MergeFileSelector.java | 67 ++---
.../engine/merge/selector/MergeFileStrategy.java | 8 +-
.../iotdb/db/engine/merge/task/MergeChunkTask.java | 331 ---------------------
.../db/engine/merge/task/MergeMultiChunkTask.java | 85 +++---
.../iotdb/db/engine/merge/task/MergeTask.java | 2 +-
.../db/engine/merge/task/RecoverMergeTask.java | 61 +++-
.../engine/storagegroup/StorageGroupProcessor.java | 17 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 36 +++
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 4 +-
13 files changed, 327 insertions(+), 436 deletions(-)
create mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxSeriesMergeFileSelector.java
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java =>
iotdb/src/main/java/org/apache/iotdb/db/engine/merge/selector/MergeFileStrategy.java
(84%)
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeChunkTask.java
