You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/06/10 08:06:32 UTC

[incubator-iotdb] branch dev_new_merge updated (48006b6 -> b306363)

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 48006b6  remove independence merge
     add 00cad05  fix seq merge && operation
     add b306363  finish new merge V1

No new revisions were added by this update.

Summary of changes:
 .../resources/conf/iotdb-engine.properties         |  2 +-
 .../iotdb/db/engine/merge/BaseMergeSeriesTask.java | 58 ++++++++---------
 .../seqMerge/inplace/task/InplaceMergeTask.java    | 24 +-------
 .../squeeze/selector/SqueezeMaxFileSelector.java   | 46 +-------------
 .../seqMerge/squeeze/task/MergeSeriesTask.java     | 11 +---
 .../seqMerge/squeeze/task/SqueezeMergeTask.java    | 24 +-------
 .../regularization/recover/LogAnalyzer.java        | 14 +++--
 .../task/RecoverRegularizationMergeTask.java       |  2 +-
 .../task/RegularizationMergeSeriesTask.java        | 72 ++++++++++++++++------
 .../task/RegularizationMergeTask.java              | 31 ++--------
 .../engine/storagegroup/StorageGroupProcessor.java | 31 ++++++----
 .../java/org/apache/iotdb/db/utils/MergeUtils.java | 26 ++++++++
 .../tsfile/common/constant/TsFileConstant.java     |  1 -
 13 files changed, 152 insertions(+), 190 deletions(-)