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

Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/03/01 09:24:38 UTC

[iotdb] branch NewTsFileV2 updated (90f6fc7 -> c887589)

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

haonan pushed a change to branch NewTsFileV2
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 90f6fc7  merge master and delete chunkMetadataCache
     add d3e20ea  [ISSUE-2709,IOTDB-1178] Fix cache not cleared after unseq compaction bug, Fix windows 70,10 ci bug in unseq compaction ci (#2707)
     add 4c47988  [ISSUE-2746] Fix data overlapped bug after unseq compaction (#2739)
     add c887589  merge master and resolve conflicts

No new revisions were added by this update.

Summary of changes:
 .../level/LevelCompactionTsFileManagement.java     |   4 +
 .../db/engine/merge/manage/MergeResource.java      |   5 +-
 .../merge/selector/MaxFileMergeFileSelector.java   |   4 +-
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |   3 +-
 .../db/engine/storagegroup/TsFileResource.java     |   5 +
 ...nLogTest.java => LevelCompactionCacheTest.java} |  57 +++++++++--
 .../engine/merge/MaxFileMergeFileSelectorTest.java | 111 +++++++++++++++++++++
 7 files changed, 175 insertions(+), 14 deletions(-)
 copy server/src/test/java/org/apache/iotdb/db/engine/compaction/{LevelCompactionLogTest.java => LevelCompactionCacheTest.java} (57%)