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/16 14:01:02 UTC

[incubator-iotdb] branch dev_merge_stra updated (6653cec -> 25d486c)

This is an automated email from the ASF dual-hosted git repository.

ejttianyu pushed a change to branch dev_merge_stra
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 6653cec  fix windows travis problem
     add 25d486c  fix squeeze recover

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/merge/BaseMergeSeriesTask.java |  7 +----
 .../seqMerge/squeeze/recover/LogAnalyzer.java      | 34 ++++++++++++++--------
 .../squeeze/recover/SqueezeMergeLogger.java        |  7 +++++
 .../squeeze/task/RecoverSqueezeMergeTask.java      | 16 ++++------
 .../seqMerge/squeeze/task/SqueezeMergeTask.java    |  2 ++
 .../task/RegularizationMergeSeriesTask.java        |  8 ++---
 .../engine/storagegroup/StorageGroupProcessor.java | 23 +++++++++++++--
 .../seqMerge/squeeze/SqueezeMergeLogTest.java      |  2 +-
 8 files changed, 63 insertions(+), 36 deletions(-)