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

Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/03/14 05:32:39 UTC

[incubator-iotdb] branch new_TsFile updated (e1d4660 -> e0bb259)

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

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


    from e1d4660  fix UnseqTsFileRecoverTest
     add e0bb259  fix:pass merge test (#907)

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/merge/task/MergeFileTask.java  | 44 ++++++++-----
 .../db/engine/merge/task/MergeMultiChunkTask.java  | 72 +++++++++++-----------
 .../engine/merge/MaxFileMergeFileSelectorTest.java |  6 +-
 .../merge/MaxSeriesMergeFileSelectorTest.java      | 21 ++++---
 .../write/writer/ForceAppendTsFileWriter.java      | 17 +++--
 5 files changed, 91 insertions(+), 69 deletions(-)