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 0178040 fix some problems
add 48006b6 remove independence merge
No new revisions were added by this update.
Summary of changes:
.../seqMerge/squeeze/task/MergeSeriesTask.java | 18 +-
.../merge/sizeMerge/SizeMergeFileStrategy.java | 14 +-
.../recover/IndependenceMergeLogger.java | 68 -------
.../independence/recover/LogAnalyzer.java | 109 ------------
.../selector/IndependenceMaxFileSelector.java | 57 ------
.../task/IndependenceMergeSeriesTask.java | 116 ------------
.../independence/task/IndependenceMergeTask.java | 197 ---------------------
.../task/RecoverIndependenceMergeTask.java | 107 -----------
.../engine/storagegroup/StorageGroupProcessor.java | 2 +-
.../squeeze/MaxFileMergeFileSelectorTest.java | 20 ---
.../independence/MaxFileMergeFileSelectorTest.java | 51 ------
.../merge/sizeMerge/independence/MergeLogTest.java | 93 ----------
.../sizeMerge/independence/MergeTaskTest.java | 135 --------------
13 files changed, 9 insertions(+), 978 deletions(-)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/recover/IndependenceMergeLogger.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/recover/LogAnalyzer.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/selector/IndependenceMaxFileSelector.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/task/IndependenceMergeSeriesTask.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/task/IndependenceMergeTask.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/task/RecoverIndependenceMergeTask.java
delete mode 100644
server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/MaxFileMergeFileSelectorTest.java
delete mode 100644
server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/MergeLogTest.java
delete mode 100644
server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/independence/MergeTaskTest.java
