This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from ffedb93 update merge
new 39e0889 migrate functions of FileNodeManager to StorageGroupManager
new 1ea3bff abstract StorageGroupManager as StorageEngine
new 245cc54 rename StorageEngine to DatabaseEngine
new 02647ac migrate usages of FileNodeProcessor
new 57cb4a8 rename querycontext to datasource remove unused classes
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../org/apache/iotdb/db/engine/DatabaseEngine.java | 167 ++
.../Policy.java => DatabaseEngineFactory.java} | 15 +-
...ileNodeConstants.java => EngingeConstants.java} | 16 +-
.../java/org/apache/iotdb/db/engine/Processor.java | 1 -
.../apache/iotdb/db/engine/bufferwrite/Action.java | 28 -
.../db/engine/bufferwrite/ActionException.java | 30 -
.../engine/bufferwrite/BufferWriteProcessor.java | 560 ------
.../engine/cache/RowGroupBlockMetaDataCache.java | 167 --
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 98 -
.../iotdb/db/engine/cache/TsFileMetadataUtils.java | 84 -
.../QueryDataSource.java | 2 +-
.../ReadOnlyMemChunk.java | 8 +-
.../SeriesDataSource.java | 16 +-
.../UnsealedTsFile.java | 2 +-
.../db/engine/filenode/FileNodeFlushFuture.java | 91 -
.../iotdb/db/engine/filenode/FileNodeManager.java | 1216 ------------
.../db/engine/filenode/FileNodeProcessor.java | 2064 --------------------
.../engine/filenode/FileNodeProcessorStatus.java | 51 -
.../db/engine/filenode/FileNodeProcessorStore.java | 165 --
.../db/engine/filenode/OverflowChangeType.java | 57 -
.../db/engine/memcontrol/FlushPartialPolicy.java | 6 +-
.../db/engine/memcontrol/ForceFLushAllPolicy.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 3 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 3 +-
.../db/engine/memtable/MemSeriesLazyMerger.java | 2 +-
.../iotdb/db/engine/overflow/io/OverflowIO.java | 173 --
.../db/engine/overflow/io/OverflowMemtable.java | 116 --
.../db/engine/overflow/io/OverflowProcessor.java | 736 -------
.../db/engine/overflow/io/OverflowResource.java | 329 ----
.../overflow/io/OverflowedTsFileIOWriter.java | 36 -
.../engine/overflow/metadata/OFFileMetadata.java | 107 -
.../overflow/metadata/OFRowGroupListMetadata.java | 109 --
.../overflow/metadata/OFSeriesListMetadata.java | 107 -
.../db/engine/overflow/utils/MergeStatus.java | 29 -
.../db/engine/overflow/utils/OverflowOpType.java | 29 -
.../apache/iotdb/db/engine/pool/FlushManager.java | 56 +-
.../apache/iotdb/db/engine/pool/MergeManager.java | 52 +-
.../engine/querycontext/MergeSeriesDataSource.java | 33 -
.../db/engine/querycontext/OverflowInsertFile.java | 51 -
.../querycontext/OverflowSeriesDataSource.java | 78 -
.../querycontext/OverflowUpdateDeleteFile.java | 42 -
.../db/engine/sgmanager/StorageGroupManager.java | 534 +++--
.../db/engine/sgmanager/StorageGroupProcessor.java | 23 +-
.../{filenode => sgmanager}/TsFileResource.java | 8 +-
.../RestorableTsFileIOWriter.java | 2 +-
.../db/engine/tsfiledata/TsFileProcessor.java | 24 +-
.../org/apache/iotdb/db/monitor/IStatistic.java | 4 +-
.../apache/iotdb/db/monitor/MonitorConstants.java | 4 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 83 +-
.../iotdb/db/monitor/collector/FileSize.java | 16 +-
.../iotdb/db/qp/executor/OverflowQPExecutor.java | 61 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 21 +-
.../iotdb/db/query/control/JobFileManager.java | 6 +-
.../db/query/control/QueryResourceManager.java | 68 +-
.../db/query/executor/AggregateEngineExecutor.java | 2 +-
.../EngineExecutorWithoutTimeGenerator.java | 64 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 17 -
.../db/query/executor/FillEngineExecutor.java | 2 +-
.../GroupByWithOnlyTimeFilterDataSetDataSet.java | 2 +-
.../db/query/factory/SeriesReaderFactory.java | 21 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 2 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 2 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 2 +-
.../iotdb/db/query/reader/mem/MemChunkReader.java | 2 +-
.../query/reader/sequence/SealedTsFilesReader.java | 2 +-
.../sequence/SealedTsFilesReaderByTimestamp.java | 2 +-
.../query/reader/sequence/SequenceDataReader.java | 2 +-
.../sequence/SequenceDataReaderByTimestamp.java | 2 +-
.../reader/sequence/UnSealedTsFileReader.java | 2 +-
.../sequence/UnSealedTsFilesReaderByTimestamp.java | 2 +-
.../query/timegenerator/EngineNodeConstructor.java | 2 +-
.../apache/iotdb/db/service/CloseMergeService.java | 5 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 7 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 10 +-
.../java/org/apache/iotdb/db/sync/SyncUtils.java | 2 +-
.../iotdb/db/sync/receiver/SyncServiceImpl.java | 30 +-
.../org/apache/iotdb/db/utils/LoadDataUtils.java | 11 +-
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 2 +-
.../recover/ExclusiveLogRecoverPerformer.java | 3 +-
.../writelog/recover/FileNodeRecoverPerformer.java | 4 +-
.../db/writelog/replay/ConcreteLogReplayer.java | 30 +-
.../engine/bufferwrite/BufferWriteBenchmark.java | 13 +-
.../bufferwrite/BufferWriteProcessorNewTest.java | 9 +-
.../bufferwrite/BufferWriteProcessorTest.java | 9 +-
.../bufferwrite/RestorableTsFileIOWriterTest.java | 1 +
.../filenodev2/FileNodeManagerBenchmark.java | 6 +-
.../memcontrol/BufferwriteFileSizeControlTest.java | 8 +-
.../memcontrol/BufferwriteMetaSizeControlTest.java | 8 +-
.../memcontrol/OverflowFileSizeControlTest.java | 10 +-
.../memcontrol/OverflowMetaSizeControlTest.java | 10 +-
.../engine/modification/DeletionFileNodeTest.java | 54 +-
.../db/engine/modification/DeletionQueryTest.java | 88 +-
.../overflow/io/OverflowProcessorBenchmark.java | 10 +-
.../engine/overflow/io/OverflowProcessorTest.java | 10 +-
.../integration/QueryDataFromUnclosedTsFileIT.java | 6 +-
.../org/apache/iotdb/db/monitor/MonitorTest.java | 20 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 10 +-
98 files changed, 758 insertions(+), 7543 deletions(-)
create mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngine.java
copy iotdb/src/main/java/org/apache/iotdb/db/engine/{memcontrol/Policy.java =>
DatabaseEngineFactory.java} (77%)
rename
iotdb/src/main/java/org/apache/iotdb/db/engine/{bufferwrite/FileNodeConstants.java
=> EngingeConstants.java} (68%)
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/Action.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/ActionException.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/cache/RowGroupBlockMetaDataCache.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java
rename iotdb/src/main/java/org/apache/iotdb/db/engine/{querycontext =>
datasource}/QueryDataSource.java (96%)
rename iotdb/src/main/java/org/apache/iotdb/db/engine/{querycontext =>
datasource}/ReadOnlyMemChunk.java (96%)
rename iotdb/src/main/java/org/apache/iotdb/db/engine/{querycontext =>
datasource}/SeriesDataSource.java (82%)
rename iotdb/src/main/java/org/apache/iotdb/db/engine/{querycontext =>
datasource}/UnsealedTsFile.java (96%)
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeFlushFuture.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeManager.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStatus.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessorStore.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/OverflowChangeType.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowIO.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowMemtable.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessor.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowedTsFileIOWriter.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFFileMetadata.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFRowGroupListMetadata.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/metadata/OFSeriesListMetadata.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/MergeStatus.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/utils/OverflowOpType.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/MergeSeriesDataSource.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowInsertFile.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowSeriesDataSource.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/OverflowUpdateDeleteFile.java
rename iotdb/src/main/java/org/apache/iotdb/db/engine/{filenode =>
sgmanager}/TsFileResource.java (97%)
rename iotdb/src/main/java/org/apache/iotdb/db/engine/{bufferwrite =>
tsfiledata}/RestorableTsFileIOWriter.java (99%)
