You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/11/27 15:46:30 UTC
[iotdb] 03/05: Merge branch 'master' of github.com:apache/iotdb into iotdb-1971
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-1971
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ed4c2f00cdeda80205ea90c261df6e2678b1c8bd
Merge: dd8f44d 6c0289e
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Sat Nov 27 20:37:31 2021 +0800
Merge branch 'master' of github.com:apache/iotdb into iotdb-1971
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 +-
.../iotdb/db/query/control/FileReaderManager.java | 110 +++------
.../iotdb/db/engine/cache/ChunkCacheTest.java | 1 -
.../engine/compaction/CompactionSchedulerTest.java | 18 +-
.../compaction/CompactionTaskManagerTest.java | 252 +++++++++++++++++++++
.../db/engine/compaction/cross/MergeTest.java | 1 -
.../compaction/inner/InnerCompactionChunkTest.java | 4 +-
.../compaction/inner/InnerCompactionLogTest.java | 4 +-
.../inner/InnerCompactionMoreDataTest.java | 2 +-
.../inner/InnerCompactionSchedulerTest.java | 4 +-
.../compaction/inner/InnerCompactionTest.java | 3 +-
.../inner/InnerSpaceCompactionUtilsTest.java | 4 +-
.../SizeTieredCompactionRecoverTest.java | 1 -
.../inner/sizetiered/SizeTieredCompactionTest.java | 1 -
.../task/FakedInnerSpaceCompactionTask.java | 44 ++--
.../compaction/utils/CompactionClearUtils.java | 1 -
.../engine/storagegroup/FakedTsFileResource.java | 11 +
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../db/integration/IoTDBNewTsFileCompactionIT.java | 2 +-
.../db/query/control/FileReaderManagerTest.java | 19 +-
.../query/reader/series/SeriesReaderTestUtil.java | 1 -
.../iotdb/db/rescon/ResourceManagerTest.java | 1 -
tsfile/pom.xml | 6 +-
30 files changed, 437 insertions(+), 213 deletions(-)