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 a604b33 change the order of reading seq chunks
add d1795ef add MergePathSelector
No new revisions were added by this update.
Summary of changes:
.../db/engine/merge/manage/MergeResource.java | 24 +-
...Selector.java => MaxFileMergeFileSelector.java} | 76 ++---
.../merge/selector/MaxSeriesMergeFileSelector.java | 16 +-
.../engine/merge/selector/MergeFileSelector.java | 306 +--------------------
...rgeFileStrategy.java => MergePathSelector.java} | 15 +-
.../merge/selector/NaivePathSelector.java} | 39 ++-
.../db/engine/merge/task/MergeMultiChunkTask.java | 31 +--
.../engine/storagegroup/StorageGroupProcessor.java | 13 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 26 ++
...Test.java => MaxFileMergeFileSelectorTest.java} | 36 ++-
.../merge/MaxSeriesMergeFileSelectorTest.java | 40 +--
11 files changed, 169 insertions(+), 453 deletions(-)
copy
server/src/main/java/org/apache/iotdb/db/engine/merge/selector/{MergeFileSelector.java
=> MaxFileMergeFileSelector.java} (83%)
copy
server/src/main/java/org/apache/iotdb/db/engine/merge/selector/{MergeFileStrategy.java
=> MergePathSelector.java} (74%)
copy server/src/main/java/org/apache/iotdb/db/{query/dataset/AuthDataSet.java
=> engine/merge/selector/NaivePathSelector.java} (55%)
rename
server/src/test/java/org/apache/iotdb/db/engine/merge/{MergeFileSelectorTest.java
=> MaxFileMergeFileSelectorTest.java} (61%)
