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/11/22 10:15:20 UTC

[iotdb] 09/21: Merge remote-tracking branch 'origin/master'

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

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

commit ffe320a14a04f45349aae6a901d87e48542b5e86
Merge: c330eaf 5bbbdbd
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 11 09:57:02 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../compaction/CompactionMergeTaskPoolManager.java | 12 ++++-
 .../db/engine/compaction/TsFileManagement.java     |  7 +--
 .../level/LevelCompactionTsFileManagement.java     | 54 ++++++++++++++--------
 .../iotdb/db/engine/merge/manage/MergeManager.java | 25 ++++++++--
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |  5 --
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |  1 +
 .../engine/storagegroup/TsFileProcessorTest.java   | 14 +++---
 .../iotdb/db/integration/IoTDBAggregationIT.java   | 36 +++++++++++++--
 8 files changed, 109 insertions(+), 45 deletions(-)