This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from c09e46f fix typo in error message
add 4455ab0 clean code
add 6117ed5 clean code
add c5c46f6 fix bug and clean code
add b88e268 resolve conflict
No new revisions were added by this update.
Summary of changes:
.gitignore | 4 +-
.../UserGuideV0.7.0/4-Deployment and Management.md | 76 +----------
.../apache/iotdb/kafka/KafkaConsumerThread.java | 8 +-
.../java/org/apache/iotdb/kafka/KafkaProducer.java | 4 +-
.../org/apache/iotdb/example/RocketMQConsumer.java | 6 +-
.../org/apache/iotdb/example/RocketMQProducer.java | 4 +-
.../apache/iotdb/tsfile/hadoop/TSFInputFormat.java | 24 ++--
.../iotdb/tsfile/hadoop/TSFOutputFormat.java | 8 +-
.../iotdb/tsfile/hadoop/TSFRecordReader.java | 16 +--
.../iotdb/tsfile/hadoop/TSFRecordWriter.java | 4 +-
.../iotdb/tsfile/hadoop/example/TsFileHelper.java | 6 +-
iotdb/iotdb/conf/iotdb-engine.properties | 19 +--
iotdb/iotdb/conf/tsfile-format.properties | 2 +-
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 6 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 4 +-
.../IoTDBDefaultThreadExceptionHandler.java | 4 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 66 ++++-----
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 5 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 28 ++--
.../db/conf/directories/DirectoryManager.java | 52 ++++----
.../directories/strategy/DirectoryStrategy.java | 4 +-
.../MinFolderOccupiedSpaceFirstStrategy.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 139 ++++++++-----------
.../engine/cache/RowGroupBlockMetaDataCache.java | 10 +-
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 10 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 5 +-
.../iotdb/db/engine/memtable/ChunkBufferPool.java | 6 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 2 +-
...ableFlushTaskV2.java => MemTableFlushTask.java} | 46 ++++---
.../iotdb/db/engine/memtable/MemTablePool.java | 29 ++--
...EmptyMemTable.java => NotifyFlushMemTable.java} | 8 +-
.../db/engine/memtable/PrimitiveMemTable.java | 6 +-
...itableMemChunkV2.java => WritableMemChunk.java} | 8 +-
.../iotdb/db/engine/pool/FlushPoolManager.java | 38 ------
.../db/engine/pool/FlushSubTaskPoolManager.java | 37 ------
.../iotdb/db/engine/pool/MergePoolManager.java | 126 ------------------
.../engine/querycontext/MergeSeriesDataSource.java | 33 -----
.../db/engine/querycontext/OverflowInsertFile.java | 51 -------
.../querycontext/OverflowSeriesDataSource.java | 78 -----------
.../querycontext/OverflowUpdateDeleteFile.java | 42 ------
...QueryDataSourceV2.java => QueryDataSource.java} | 4 +-
.../db/engine/querycontext/UnsealedTsFile.java | 44 ------
.../iotdb/db/engine/storagegroup/FlushManager.java | 34 ++---
.../engine/storagegroup/StorageGroupProcessor.java | 140 ++++++++++----------
...edTsFileProcessor.java => TsFileProcessor.java} | 125 ++++++++++--------
.../db/engine/storagegroup/TsFileResource.java | 6 +-
.../version/SimpleFileVersionController.java | 6 +-
.../exception/BufferWriteProcessorException.java | 44 ------
.../exception/DiskSpaceInsufficientException.java | 2 +-
.../db/exception/FileNodeNotExistException.java | 33 -----
.../iotdb/db/exception/NotConsistentException.java | 29 ----
.../db/exception/OverflowProcessorException.java | 41 ------
.../exception/OverflowWrongParameterException.java | 42 ------
.../db/exception/ProcessorRuntimException.java | 41 ------
.../iotdb/db/exception/RecoverException.java | 36 -----
...rException.java => StorageEngineException.java} | 10 +-
...on.java => StorageGroupProcessorException.java} | 12 +-
...xception.java => TsFileProcessorException.java} | 12 +-
.../db/exception/builder/ExceptionBuilder.java | 6 +-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 10 +-
.../org/apache/iotdb/db/metadata/MManager.java | 36 ++---
.../java/org/apache/iotdb/db/metadata/MTree.java | 8 +-
.../apache/iotdb/db/monitor/MonitorConstants.java | 6 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 28 ++--
.../iotdb/db/monitor/collector/FileSize.java | 12 +-
.../db/qp/executor/IQueryProcessExecutor.java | 10 +-
.../iotdb/db/qp/executor/OverflowQPExecutor.java | 16 +--
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 8 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 3 +
.../iotdb/db/qp/physical/crud/InsertPlan.java | 7 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 6 +-
.../db/query/aggregation/impl/CountAggrFunc.java | 6 +-
.../iotdb/db/query/control/FileReaderManager.java | 8 +-
.../iotdb/db/query/control/JobFileManager.java | 6 +-
.../db/query/control/QueryResourceManager.java | 31 ++---
.../groupby/GroupByWithValueFilterDataSet.java | 4 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 10 +-
.../db/query/executor/AggregateEngineExecutor.java | 12 +-
.../iotdb/db/query/executor/EngineExecutor.java | 14 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 14 +-
.../db/query/executor/FillEngineExecutor.java | 4 +-
.../db/query/executor/IEngineQueryRouter.java | 10 +-
.../db/query/factory/ISeriesReaderFactory.java | 8 +-
.../db/query/factory/SeriesReaderFactoryImpl.java | 22 +--
.../java/org/apache/iotdb/db/query/fill/IFill.java | 6 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 4 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 4 +-
.../sequence/SequenceSeriesReaderByTimestamp.java | 12 +-
.../timegenerator/AbstractNodeConstructor.java | 10 +-
.../query/timegenerator/EngineNodeConstructor.java | 8 +-
.../query/timegenerator/EngineTimeGenerator.java | 6 +-
.../apache/iotdb/db/rescon/PrimitiveArrayPool.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 18 +--
.../org/apache/iotdb/db/service/IoTDBMBean.java | 4 +-
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 6 +-
.../org/apache/iotdb/db/service/JDBCService.java | 36 ++---
.../iotdb/db/service/JDBCServiceEventHandler.java | 4 +-
.../org/apache/iotdb/db/service/JMXService.java | 16 +--
.../java/org/apache/iotdb/db/service/Monitor.java | 6 +-
.../apache/iotdb/db/service/RegisterManager.java | 8 +-
.../org/apache/iotdb/db/service/StartupChecks.java | 10 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 76 +++++------
.../iotdb/db/sync/conf/SyncSenderDescriptor.java | 22 +--
.../iotdb/db/sync/receiver/SyncServerManager.java | 12 +-
.../iotdb/db/sync/receiver/SyncServiceImpl.java | 12 +-
.../iotdb/db/sync/sender/SyncFileManager.java | 10 +-
.../iotdb/db/sync/sender/SyncSenderImpl.java | 50 +++----
.../java/org/apache/iotdb/db/tools/WalChecker.java | 20 +--
.../java/org/apache/iotdb/db/utils/AuthUtils.java | 4 +-
.../org/apache/iotdb/db/utils/FileSchemaUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 4 +-
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 12 +-
.../iotdb/db/writelog/io/BatchLogReader.java | 4 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 54 +++-----
.../iotdb/db/writelog/recover/LogReplayer.java | 2 +-
.../writelog/recover/TsFileRecoverPerformer.java | 12 +-
...hTaskV2Test.java => MemTableFlushTaskTest.java} | 13 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 3 +-
.../engine/modification/DeletionFileNodeTest.java | 20 +--
.../db/engine/modification/DeletionQueryTest.java | 16 +--
.../storagegroup/FileNodeManagerBenchmark.java | 10 +-
.../storagegroup/StorageGroupProcessorTest.java | 10 +-
...ProcessorTest.java => TsFileProcessorTest.java} | 22 +--
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 10 +-
.../db/integration/IoTDBFlushQueryMergeTest.java | 5 -
.../iotdb/db/integration/IoTDBLargeDataIT.java | 3 -
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 3 -
.../db/integration/IoTDBSequenceDataQueryIT.java | 8 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 17 +--
.../iotdb/db/metadata/MManagerImproveTest.java | 4 +-
.../org/apache/iotdb/db/monitor/MonitorTest.java | 147 ---------------------
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 10 +-
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 8 +-
.../query/reader/sequence/SeqDataReaderTest.java | 28 ++--
.../reader/sequence/UnsealedSeqReaderTest.java | 37 +++---
.../UnseqSeriesReaderByTimestampTest.java | 4 +-
.../unsequence/UnsequenceSeriesReaderTest.java | 12 +-
.../db/sync/sender/MultipleClientSyncTest.java | 18 +--
.../iotdb/db/sync/sender/SingleClientSyncTest.java | 12 +-
.../iotdb/db/sync/sender/SyncFileManagerTest.java | 24 ++--
.../apache/iotdb/db/sync/test/SyncTestClient2.java | 12 +-
.../apache/iotdb/db/sync/test/SyncTestClient3.java | 12 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 25 ++--
.../apache/iotdb/db/utils/OpenFileNumUtilTest.java | 44 +++---
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 16 +--
.../apache/iotdb/db/writelog/PerformanceTest.java | 3 -
.../writelog/recover/UnseqTsFileRecoverTest.java | 6 +-
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 8 +-
.../java/org/apache/iotdb/jdbc/IoTDBDriver.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 4 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 2 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 22 +--
.../iotdb/tsfile/compress/IUnCompressor.java | 6 +-
.../tsfile/encoding/decoder/BitmapDecoder.java | 8 +-
.../encoding/decoder/DoublePrecisionDecoder.java | 6 +-
.../tsfile/encoding/decoder/FloatDecoder.java | 10 +-
.../tsfile/encoding/decoder/GorillaDecoder.java | 4 +-
.../tsfile/encoding/decoder/IntRleDecoder.java | 4 +-
.../tsfile/encoding/decoder/LongRleDecoder.java | 4 +-
.../tsfile/encoding/decoder/PlainDecoder.java | 6 +-
.../encoding/decoder/SinglePrecisionDecoder.java | 6 +-
.../tsfile/encoding/encoder/BitmapEncoder.java | 4 +-
.../encoding/encoder/DeltaBinaryEncoder.java | 4 +-
.../tsfile/encoding/encoder/PlainEncoder.java | 12 +-
.../iotdb/tsfile/encoding/encoder/RleEncoder.java | 10 +-
.../tsfile/encoding/encoder/TSEncodingBuilder.java | 8 +-
.../file/metadata/statistics/Statistics.java | 2 +-
.../iotdb/tsfile/read/TsFileRestorableReader.java | 10 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 6 +-
...IOWriter.java => RestorableTsFileIOWriter.java} | 8 +-
.../tsfile/encoding/decoder/BitmapDecoderTest.java | 4 +-
.../tsfile/encoding/decoder/FloatDecoderTest.java | 16 +--
.../encoding/decoder/GorillaDecoderTest.java | 6 +-
.../tsfile/read/TsFileSequenceReaderTest.java | 10 --
...Test.java => RestorableTsFileIOWriterTest.java} | 31 +++--
175 files changed, 1092 insertions(+), 2143 deletions(-)
rename
iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/{MemTableFlushTaskV2.java
=> MemTableFlushTask.java} (86%)
rename
iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/{EmptyMemTable.java =>
NotifyFlushMemTable.java} (86%)
rename
iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/{WritableMemChunkV2.java
=> WritableMemChunk.java} (95%)
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/pool/MergePoolManager.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/querycontext/{QueryDataSourceV2.java
=> QueryDataSource.java} (90%)
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/UnsealedTsFile.java
rename
iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/{UnsealedTsFileProcessor.java
=> TsFileProcessor.java} (78%)
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/exception/BufferWriteProcessorException.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/exception/FileNodeNotExistException.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/exception/NotConsistentException.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowProcessorException.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/exception/OverflowWrongParameterException.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorRuntimException.java
delete mode 100644
iotdb/src/main/java/org/apache/iotdb/db/exception/RecoverException.java
rename
iotdb/src/main/java/org/apache/iotdb/db/exception/{FileNodeManagerException.java
=> StorageEngineException.java} (79%)
rename
iotdb/src/main/java/org/apache/iotdb/db/exception/{FileNodeProcessorException.java
=> StorageGroupProcessorException.java} (74%)
rename
iotdb/src/main/java/org/apache/iotdb/db/exception/{UnsealedTsFileProcessorException.java
=> TsFileProcessorException.java} (73%)
rename
iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/{MemTableFlushTaskV2Test.java
=> MemTableFlushTaskTest.java} (87%)
rename
iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/{UnsealedTsFileProcessorTest.java
=> TsFileProcessorTest.java} (89%)
delete mode 100644
iotdb/src/test/java/org/apache/iotdb/db/monitor/MonitorTest.java
rename
tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/{NativeRestorableIOWriter.java
=> RestorableTsFileIOWriter.java} (96%)
rename
tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/{NativeRestorableIOWriterTest.java
=> RestorableTsFileIOWriterTest.java} (93%)
