This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch xianyi in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8317fdec78ba9b3d0b9c86f59328565ec5f209fc Merge: 2dafd32 6c0289e Author: Steve Yurong Su <[email protected]> AuthorDate: Sat Nov 27 16:49:15 2021 +0800 Merge branch 'master' of github.com:apache/iotdb into xianyi pom.xml | 6 +- .../db/engine/compaction/CompactionScheduler.java | 3 +- .../engine/compaction/CompactionTaskManager.java | 36 ++- .../inner/AbstractInnerSpaceCompactionTask.java | 2 + .../sizetiered/SizeTieredCompactionSelector.java | 2 +- .../inner/sizetiered/SizeTieredCompactionTask.java | 105 ++++----- .../compaction/task/AbstractCompactionTask.java | 2 + .../compaction/task/CompactionRecoverTask.java | 2 +- .../engine/compaction/CompactionSchedulerTest.java | 18 +- .../compaction/CompactionTaskManagerTest.java | 252 +++++++++++++++++++++ .../compaction/inner/InnerCompactionChunkTest.java | 4 +- .../compaction/inner/InnerCompactionLogTest.java | 4 +- .../inner/InnerCompactionMoreDataTest.java | 2 +- .../inner/InnerCompactionSchedulerTest.java | 4 +- .../compaction/inner/InnerCompactionTest.java | 2 +- .../inner/InnerSpaceCompactionUtilsTest.java | 4 +- .../task/FakedInnerSpaceCompactionTask.java | 44 ++-- .../engine/storagegroup/FakedTsFileResource.java | 11 + .../storagegroup/StorageGroupProcessorTest.java | 2 +- .../db/integration/IoTDBNewTsFileCompactionIT.java | 2 +- tsfile/pom.xml | 6 +- 21 files changed, 400 insertions(+), 113 deletions(-)
