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/07/19 13:56:31 UTC
[incubator-iotdb] 01/01: Merge pull request #1411 from
apache/hot_compaction
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f1adbb41664bf08b74c6e1f5352a9fab28f8db47
Merge: 99e2596 4d2cc32
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Sun Jul 19 21:56:13 2020 +0800
Merge pull request #1411 from apache/hot_compaction
[IOTDB-706] Introduce virtual memtable for larger Chunk
.../resources/conf/iotdb-engine.properties | 11 +
.../org/apache/iotdb/db/concurrent/ThreadName.java | 1 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 57 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 16 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 2 +-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 2 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 14 +-
.../iotdb/db/engine/flush/FlushManagerMBean.java | 1 -
.../iotdb/db/engine/flush/MemTableFlushTask.java | 56 +-
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 4 +-
.../iotdb/db/engine/flush/VmLogAnalyzer.java | 95 +++
.../org/apache/iotdb/db/engine/flush/VmLogger.java | 76 +++
.../apache/iotdb/db/engine/flush/VmMergeUtils.java | 225 +++++++
.../db/engine/flush/pool/AbstractPoolManager.java | 7 +-
.../engine/flush/pool/FlushSubTaskPoolManager.java | 5 +-
.../db/engine/flush/pool/FlushTaskPoolManager.java | 5 +-
...oolManager.java => VmMergeTaskPoolManager.java} | 27 +-
.../db/engine/merge/manage/MergeResource.java | 4 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 8 +-
.../iotdb/db/engine/merge/recover/MergeLogger.java | 4 +-
.../merge/selector/MaxFileMergeFileSelector.java | 6 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 30 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 2 +-
.../db/engine/merge/task/RecoverMergeTask.java | 8 +-
.../engine/storagegroup/StorageGroupProcessor.java | 509 ++++++++-------
.../iotdb/db/engine/storagegroup/TsFileLock.java | 4 +-
.../db/engine/storagegroup/TsFileProcessor.java | 683 +++++++++++++++++----
.../db/engine/storagegroup/TsFileResource.java | 102 +--
.../iotdb/db/engine/upgrade/UpgradeTask.java | 14 +-
.../iotdb/db/query/control/FileReaderManager.java | 16 +-
.../iotdb/db/query/control/QueryFileManager.java | 3 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 2 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 2 +-
.../db/sync/receiver/load/FileLoaderManager.java | 2 +-
.../db/sync/sender/manage/SyncFileManager.java | 2 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 6 +-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 37 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 8 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 10 +-
.../writelog/recover/TsFileRecoverPerformer.java | 248 ++++++--
.../db/engine/cache/ChunkMetadataCacheTest.java | 12 +-
.../db/engine/memtable/MemTableFlushTaskTest.java | 10 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 2 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 2 +-
.../iotdb/db/engine/merge/MergeUpgradeTest.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 37 +-
.../storagegroup/TsFileProcessorEnableVmTest.java | 194 ++++++
.../engine/storagegroup/TsFileProcessorTest.java | 152 +++--
.../iotdb/db/integration/IoTDBLargeDataIT.java | 2 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 40 +-
.../iotdb/db/integration/IoTDBRecoverIT.java | 72 ++-
.../db/query/control/FileReaderManagerTest.java | 4 +-
.../query/reader/series/SeriesReaderTestUtil.java | 2 +-
.../db/sync/receiver/load/FileLoaderTest.java | 6 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 19 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 32 +-
.../recover/RecoverResourceFromReaderTest.java | 6 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 8 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 4 +-
.../tsfile/common/constant/TsFileConstant.java | 5 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 32 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 16 +-
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 9 +
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 1 +
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 6 +
.../write/writer/RestorableTsFileIOWriter.java | 12 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 5 +
68 files changed, 2270 insertions(+), 742 deletions(-)