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

Posted to commits@iotdb.apache.org by ja...@apache.org on 2020/07/08 12:58:51 UTC

[incubator-iotdb] branch hot_compaction updated (80355cd -> 4dcd1d3)

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

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


    from 80355cd  Fix tests
     add 11f747a  fix bug
     add 732c112  fix conflicts
     add 4dcd1d3  fix conflicts

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   8 --
 .../apache/iotdb/db/engine/flush/VmMergeUtils.java |   3 +
 .../db/engine/storagegroup/TsFileProcessor.java    | 145 +++++++++++----------
 .../writelog/recover/TsFileRecoverPerformer.java   |  12 --
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |  21 ++-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |   1 +
 6 files changed, 90 insertions(+), 100 deletions(-)