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/07/20 03:04:29 UTC

[iotdb] 01/02: Merge branch 'rel/0.11' of https://github.com/apache/iotdb into resource_debug

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

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

commit 0e48cea684271fcedb7d4ca96a6ed72e04ad988a
Merge: 6aad61d 8ff38b7
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Jul 20 11:02:24 2021 +0800

    Merge branch 'rel/0.11' of https://github.com/apache/iotdb into resource_debug

 .../compaction/CompactionMergeTaskPoolManager.java | 54 +++++++++-----
 .../level/LevelCompactionTsFileManagement.java     | 87 ++++++++++++++--------
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    | 23 ++++--
 .../compaction/LevelCompactionRecoverTest.java     |  8 +-
 .../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 42 +++++++++++
 5 files changed, 154 insertions(+), 60 deletions(-)