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/19 03:08:32 UTC
[iotdb] branch master updated (91428ba -> 002a4dd)
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 91428ba [IOTDB-2428] Monitor: remove monitorStat (#4878)
add 002a4dd [IOTDB-2113] Compaction Refactor and Support aligned timeseries (#4852)
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 6 +-
docs/zh/SystemDesign/StorageEngine/MergeManager.md | 7 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 9 +-
.../db/integration/IoTDBNewTsFileCompactionIT.java | 1 +
.../integration/IoTDBSizeTieredCompactionIT.java | 7 +-
.../aligned/IOTDBInsertAlignedValuesIT.java | 3 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 34 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 7 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 -
.../org/apache/iotdb/db/engine/StorageEngine.java | 4 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 18 +-
.../db/engine/compaction/CompactionScheduler.java | 23 +-
.../engine/compaction/CompactionTaskManager.java | 30 +
.../db/engine/compaction/CompactionUtils.java | 388 +++
.../AbstractCrossSpaceCompactionSelector.java | 10 +-
.../cross/AbstractCrossSpaceCompactionTask.java | 1 -
.../compaction/cross/CrossCompactionStrategy.java | 45 +-
.../CrossSpaceCompactionExceptionHandler.java | 256 ++
.../cross/CrossSpaceCompactionTaskFactory.java | 16 +-
.../inplace/InplaceCompactionRecoverTask.java | 110 -
.../cross/inplace/InplaceCompactionTask.java | 244 --
.../inplace/manage/CrossSpaceMergeContext.java | 88 -
.../cross/inplace/manage/MergeFuture.java | 151 -
.../cross/inplace/manage/MergeManager.java | 365 ---
.../cross/inplace/manage/MergeManagerMBean.java | 26 -
.../cross/inplace/manage/MergeThreadPool.java | 54 -
.../recover/InplaceCompactionLogAnalyzer.java | 353 ---
.../inplace/recover/InplaceCompactionLogger.java | 150 -
.../task/CleanLastCrossSpaceCompactionTask.java | 67 -
.../cross/inplace/task/CrossSpaceMergeTask.java | 259 --
.../cross/inplace/task/MergeCallback.java | 40 -
.../cross/inplace/task/MergeFileTask.java | 405 ---
.../cross/inplace/task/MergeMultiChunkTask.java | 709 -----
.../RewriteCrossSpaceCompactionSelector.java} | 25 +-
.../manage/CrossSpaceMergeResource.java | 103 +-
.../RewriteCrossSpaceCompactionLogAnalyzer.java} | 73 +-
.../recover/RewriteCrossSpaceCompactionLogger.java | 86 +
.../selector/ICrossSpaceMergeFileSelector.java | 2 +-
.../selector/IFileQueryMemMeasurement.java | 2 +-
.../selector/IMergePathSelector.java | 2 +-
.../selector/MaxFileMergeFileSelector.java | 4 +-
.../selector/MaxSeriesMergeFileSelector.java | 4 +-
.../selector/MergeFileStrategy.java | 2 +-
.../selector/NaivePathSelector.java | 2 +-
.../task/RewriteCrossCompactionRecoverTask.java} | 180 +-
.../task/RewriteCrossSpaceCompactionTask.java | 296 ++
.../AbstractInnerSpaceCompactionSelector.java | 7 +-
.../compaction/inner/InnerCompactionStrategy.java | 11 +-
.../InnerSpaceCompactionExceptionHandler.java | 14 +-
.../inner/InnerSpaceCompactionTaskFactory.java | 1 -
.../SizeTieredCompactionRecoverTask.java | 16 +-
.../sizetiered/SizeTieredCompactionSelector.java | 3 -
.../inner/sizetiered/SizeTieredCompactionTask.java | 31 +-
.../utils/AlignedSeriesCompactionExecutor.java | 3 +
.../inner/utils/InnerSpaceCompactionUtils.java | 22 +-
.../inner/utils/MultiTsFileDeviceIterator.java | 58 +-
.../utils/SingleSeriesCompactionExecutor.java | 11 +-
.../compaction/task/AbstractCompactionTask.java | 4 +-
.../compaction/task/CompactionRecoverTask.java | 30 +-
.../writer/AbstractCompactionWriter.java | 157 +
.../writer/CrossSpaceCompactionWriter.java | 182 ++
.../writer/InnerSpaceCompactionWriter.java | 86 +
.../engine/storagegroup/TsFileNameGenerator.java | 84 +-
.../db/engine/storagegroup/TsFileResource.java | 5 +
.../storagegroup/VirtualStorageGroupProcessor.java | 55 +-
.../virtualSg/StorageGroupManager.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 60 +-
.../db/qp/logical/sys/ShowMergeStatusOperator.java | 40 -
.../db/qp/physical/sys/ShowMergeStatusPlan.java | 27 -
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 1 -
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 8 -
.../db/query/control/QueryResourceManager.java | 17 +
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 -
.../db/sync/sender/manage/SyncFileManager.java | 4 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 127 +-
.../engine/compaction/AbstractCompactionTest.java | 292 ++
.../engine/compaction/CompactionSchedulerTest.java | 70 +-
.../compaction/CompactionTaskManagerTest.java | 63 +-
.../db/engine/compaction/CompactionUtilsTest.java | 3344 ++++++++++++++++++++
.../cross/CrossSpaceCompactionExceptionTest.java | 498 +++
.../compaction/cross/CrossSpaceCompactionTest.java | 411 ++-
.../cross/MaxFileMergeFileSelectorTest.java | 6 +-
.../cross/MaxSeriesMergeFileSelectorTest.java | 4 +-
.../db/engine/compaction/cross/MergeLogTest.java | 92 -
.../engine/compaction/cross/MergeManagerTest.java | 146 -
.../engine/compaction/cross/MergeOverLapTest.java | 205 --
.../db/engine/compaction/cross/MergePerfTest.java | 108 -
.../db/engine/compaction/cross/MergeTaskTest.java | 575 ----
.../db/engine/compaction/cross/MergeTest.java | 3 -
.../engine/compaction/cross/MergeUpgradeTest.java | 4 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 506 +++
.../cross/RewriteCrossSpaceCompactionTest.java | 334 ++
.../inner/AbstractInnerSpaceCompactionTest.java | 26 +-
.../inner/InnerCompactionSchedulerTest.java | 87 +-
.../compaction/inner/InnerCompactionTest.java | 2 +-
.../compaction/inner/InnerSeqCompactionTest.java | 2 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 46 +-
.../inner/InnerSpaceCompactionUtilsOldTest.java | 2 +-
.../compaction/inner/InnerUnseqCompactionTest.java | 45 +-
.../SizeTieredCompactionHandleExceptionTest.java | 43 +-
.../SizeTieredCompactionRecoverTest.java | 58 +-
.../recover/SizeTieredCompactionRecoverTest.java | 128 +-
.../task/FakedCrossSpaceCompactionTask.java | 21 +-
.../task/FakedCrossSpaceCompactionTaskFactory.java | 16 +-
.../task/FakedInnerSpaceCompactionTask.java | 3 -
.../task/FakedInnerSpaceCompactionTaskFactory.java | 1 -
.../compaction/utils/CompactionClearUtils.java | 72 +-
.../utils/CompactionFileGeneratorUtils.java | 65 +-
.../engine/storagegroup/FakedTsFileResource.java | 1 +
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../query/reader/series/SeriesReaderTestUtil.java | 2 -
.../iotdb/tsfile/file/header/ChunkHeader.java | 4 +-
.../file/metadata/AlignedTimeSeriesMetadata.java | 6 +-
.../read/TsFileAlignedSeriesReaderIterator.java | 3 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 2 +-
.../iotdb/tsfile/utils/TsFileGeneratorUtils.java | 285 ++
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 17 +
.../iotdb/tsfile/write/chunk/ValueChunkWriter.java | 17 +
.../apache/iotdb/tsfile/read/TsFileReaderTest.java | 6 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 83 +-
.../iotdb/tsfile/write/TsFileWriteApiTest.java | 46 +-
121 files changed, 8088 insertions(+), 5410 deletions(-)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionHandler.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/InplaceCompactionRecoverTask.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/InplaceCompactionTask.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/manage/CrossSpaceMergeContext.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/manage/MergeFuture.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/manage/MergeManager.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/manage/MergeManagerMBean.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/manage/MergeThreadPool.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/recover/InplaceCompactionLogAnalyzer.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/recover/InplaceCompactionLogger.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/task/CleanLastCrossSpaceCompactionTask.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/task/CrossSpaceMergeTask.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/task/MergeCallback.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/task/MergeFileTask.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/inplace/task/MergeMultiChunkTask.java
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace/InplaceCompactionSelector.java => rewrite/RewriteCrossSpaceCompactionSelector.java} (89%)
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace => rewrite}/manage/CrossSpaceMergeResource.java (66%)
copy server/src/main/java/org/apache/iotdb/db/engine/compaction/{inner/utils/SizeTieredCompactionLogAnalyzer.java => cross/rewrite/recover/RewriteCrossSpaceCompactionLogAnalyzer.java} (50%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/recover/RewriteCrossSpaceCompactionLogger.java
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace => rewrite}/selector/ICrossSpaceMergeFileSelector.java (94%)
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace => rewrite}/selector/IFileQueryMemMeasurement.java (94%)
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace => rewrite}/selector/IMergePathSelector.java (94%)
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace => rewrite}/selector/MaxFileMergeFileSelector.java (99%)
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace => rewrite}/selector/MaxSeriesMergeFileSelector.java (96%)
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace => rewrite}/selector/MergeFileStrategy.java (93%)
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/{inplace => rewrite}/selector/NaivePathSelector.java (96%)
copy server/src/main/java/org/apache/iotdb/db/engine/compaction/{inner/sizetiered/SizeTieredCompactionRecoverTask.java => cross/rewrite/task/RewriteCrossCompactionRecoverTask.java} (60%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/task/RewriteCrossSpaceCompactionTask.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCompactionWriter.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/CrossSpaceCompactionWriter.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/InnerSpaceCompactionWriter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/ShowMergeStatusOperator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowMergeStatusPlan.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionUtilsTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeLogTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeManagerTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeOverLapTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergePerfTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTaskTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionTest.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorUtils.java