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 2022/01/20 04:17:03 UTC
[iotdb] branch master updated (93ee9e0 -> 6acd4ff)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 93ee9e0 disable e2e and cluster workflow (#4917)
add 6acd4ff [IOTDB-2326] Clean compaction code (#4904)
No new revisions were added by this update.
Summary of changes:
docs/UserGuide/Reference/Config-Manual.md | 320 +++++++++++----------
docs/zh/UserGuide/Reference/Config-Manual.md | 150 ++++------
.../db/integration/IoTDBNewTsFileCompactionIT.java | 7 -
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 7 -
.../integration/IoTDBSizeTieredCompactionIT.java | 71 +++--
.../resources/conf/iotdb-engine.properties | 41 +--
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 92 ++----
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 39 +--
.../compaction/CompactionTaskComparator.java | 12 +-
.../engine/compaction/CompactionTaskManager.java | 3 +-
.../db/engine/compaction/CompactionUtils.java | 15 +-
.../compaction/cross/CrossCompactionStrategy.java | 12 +-
.../RewriteCrossSpaceCompactionSelector.java | 2 +-
.../selector/MaxSeriesMergeFileSelector.java | 115 --------
...tor.java => RewriteCompactionFileSelector.java} | 9 +-
.../task/RewriteCrossSpaceCompactionTask.java | 28 +-
.../inner/sizetiered/SizeTieredCompactionTask.java | 23 +-
.../inner/utils/InnerSpaceCompactionUtils.java | 43 +--
.../utils/SingleSeriesCompactionExecutor.java | 40 +--
.../storagegroup/VirtualStorageGroupProcessor.java | 4 +-
.../virtualSg/StorageGroupManager.java | 2 +-
.../engine/compaction/AbstractCompactionTest.java | 2 +
.../engine/compaction/CompactionSchedulerTest.java | 3 +
.../db/engine/compaction/CompactionUtilsTest.java | 125 ++++----
.../cross/CrossSpaceCompactionExceptionTest.java | 12 +-
.../compaction/cross/CrossSpaceCompactionTest.java | 10 +-
.../cross/MaxSeriesMergeFileSelectorTest.java | 108 -------
.../db/engine/compaction/cross/MergeTest.java | 11 +-
.../engine/compaction/cross/MergeUpgradeTest.java | 8 +-
...java => RewriteCompactionFileSelectorTest.java} | 23 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 10 +-
.../inner/AbstractInnerSpaceCompactionTest.java | 11 +-
.../compaction/inner/InnerCompactionTest.java | 9 +-
.../compaction/inner/InnerSeqCompactionTest.java | 27 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 14 +-
.../InnerSpaceCompactionUtilsAlignedTest.java | 16 +-
.../InnerSpaceCompactionUtilsNoAlignedTest.java | 18 +-
.../inner/InnerSpaceCompactionUtilsOldTest.java | 4 +-
.../compaction/inner/InnerUnseqCompactionTest.java | 8 +-
.../SizeTieredCompactionHandleExceptionTest.java | 2 +
.../SizeTieredCompactionRecoverTest.java | 18 +-
.../inner/sizetiered/SizeTieredCompactionTest.java | 11 +-
.../recover/SizeTieredCompactionRecoverTest.java | 18 +-
.../compaction/utils/CompactionConfigRestorer.java | 69 +++++
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
45 files changed, 672 insertions(+), 902 deletions(-)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/selector/MaxSeriesMergeFileSelector.java
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/selector/{MaxFileMergeFileSelector.java => RewriteCompactionFileSelector.java} (97%)
delete mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MaxSeriesMergeFileSelectorTest.java
rename server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/{MaxFileMergeFileSelectorTest.java => RewriteCompactionFileSelectorTest.java} (93%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionConfigRestorer.java