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 2019/08/27 14:43:48 UTC
[incubator-iotdb] 01/01: Merge pull request #258 from
apache/dev_merge
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 f8d0902af27332892c156793a34718ca2d386f94
Merge: bfbccbe 349cdfe
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Tue Aug 27 22:43:40 2019 +0800
Merge pull request #258 from apache/dev_merge
[IOTDB-143]Development of merge
.../org/apache/iotdb/client/AbstractClient.java | 13 +-
.../main/java/org/apache/iotdb/JDBCExample.java | 1 -
.../org/apache/iotdb/PrepareStatementDemo.java | 38 +-
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 25 +-
.../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 85 ++--
.../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 11 +-
.../resources/conf/iotdb-engine.properties | 47 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 139 +++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 27 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 36 +-
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 20 +-
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 27 +-
.../iotdb/db/engine/cache/TsFileMetadataUtils.java | 17 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 2 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 3 +-
.../iotdb/db/engine/merge/manage/MergeContext.java | 90 ++++
.../iotdb/db/engine/merge/manage/MergeManager.java | 127 +++++
.../db/engine/merge/manage/MergeResource.java | 262 ++++++++++
.../apache/iotdb/db/engine/merge/package-info.java | 11 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 300 +++++++++++
.../iotdb/db/engine/merge/recover/MergeLogger.java | 132 +++++
.../merge/selector/IFileQueryMemMeasurement.java} | 22 +-
.../engine/merge/selector/IMergeFileSelector.java | 18 +-
.../engine/merge/selector/IMergePathSelector.java | 16 +-
.../merge/selector/MaxFileMergeFileSelector.java | 303 ++++++++++++
.../merge/selector/MaxSeriesMergeFileSelector.java | 108 ++++
.../engine/merge/selector/MergeFileStrategy.java | 15 +-
.../engine/merge/selector/NaivePathSelector.java | 47 +-
.../iotdb/db/engine/merge/task/MergeCallback.java | 27 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 238 +++++++++
.../db/engine/merge/task/MergeMultiChunkTask.java | 440 +++++++++++++++++
.../iotdb/db/engine/merge/task/MergeTask.java | 172 +++++++
.../db/engine/merge/task/RecoverMergeTask.java | 268 ++++++++++
.../db/engine/modification/ModificationFile.java | 7 +
.../engine/storagegroup/StorageGroupProcessor.java | 252 +++++++++-
.../db/engine/storagegroup/TsFileResource.java | 61 ++-
.../MergeException.java} | 21 +-
.../iotdb/db/query/control/FileReaderManager.java | 77 +--
.../iotdb/db/query/control/JobFileManager.java | 35 +-
.../db/query/control/QueryResourceManager.java | 122 +----
.../groupby/GroupByWithValueFilterDataSet.java | 3 -
.../groupby/GroupByWithoutValueFilterDataSet.java | 1 -
.../db/query/executor/AggregateEngineExecutor.java | 21 +-
.../iotdb/db/query/executor/EngineExecutor.java | 7 -
.../db/query/executor/FillEngineExecutor.java | 1 -
.../apache/iotdb/db/query/reader/IPointReader.java | 1 +
...ChunkReader.java => CachedDiskChunkReader.java} | 42 +-
.../query/reader/chunkRelated/DiskChunkReader.java | 1 +
.../fileRelated/UnSealedTsFileIterateReader.java | 6 +-
.../UnSealedTsFileReaderByTimestamp.java | 6 +-
.../CachedUnseqResourceMergeReader.java | 37 +-
.../resourceRelated/SeqResourceIterateReader.java | 9 +-
.../SeqResourceReaderByTimestamp.java | 8 +-
.../resourceRelated/UnseqResourceMergeReader.java | 5 +-
.../UnseqResourceReaderByTimestamp.java | 4 +-
.../universal/CachedPriorityMergeReader.java | 95 ++++
.../reader/universal/PriorityMergeReader.java | 109 ++--
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +
.../org/apache/iotdb/db/service/ServiceType.java | 3 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 10 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 306 ++++++++++++
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 100 +++-
.../org/apache/iotdb/db/utils/TsPrimitiveType.java | 54 ++
.../writelog/manager/MultiFileLogNodeManager.java | 2 +-
.../writelog/recover/TsFileRecoverPerformer.java | 82 ++-
.../engine/merge/MaxFileMergeFileSelectorTest.java | 85 ++++
.../merge/MaxSeriesMergeFileSelectorTest.java | 103 ++++
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 82 +++
.../iotdb/db/engine/merge/MergePerfTest.java | 105 ++++
.../iotdb/db/engine/merge/MergeTaskTest.java | 233 +++++++++
.../apache/iotdb/db/engine/merge/MergeTest.java | 169 +++++++
.../engine/modification/DeletionFileNodeTest.java | 2 -
.../db/engine/modification/DeletionQueryTest.java | 4 +-
.../storagegroup/StorageGroupProcessorTest.java | 79 ++-
.../apache/iotdb/db/integration/IOTDBFillIT.java | 202 ++++----
.../iotdb/db/integration/IOTDBGroupByIT.java | 309 +++++-------
.../iotdb/db/integration/IoTDBAggregationIT.java | 470 ++++++++----------
.../integration/IoTDBAggregationLargeDataIT.java | 435 ++++++----------
.../integration/IoTDBAggregationSmallDataIT.java | 549 +++++++++------------
.../iotdb/db/integration/IoTDBCompleteIT.java | 15 +-
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 216 ++++----
.../iotdb/db/integration/IoTDBDeletionIT.java | 198 ++++----
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 14 +-
.../db/integration/IoTDBFloatPrecisionIT.java | 110 ++---
.../db/integration/IoTDBFlushQueryMergeTest.java | 44 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 167 +++----
.../iotdb/db/integration/IoTDBLimitSlimitIT.java | 73 ++-
.../iotdb/db/integration/IoTDBMergeTest.java | 97 ++++
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 208 ++++----
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 167 +++----
.../iotdb/db/integration/IoTDBPreparedStmtIT.java | 58 +--
.../db/integration/IoTDBSequenceDataQueryIT.java | 13 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 19 +-
.../iotdb/db/integration/IoTDBTimeZoneIT.java | 30 +-
.../iotdb/db/integration/IoTDBVersionIT.java | 13 +-
.../db/query/control/FileReaderManagerTest.java | 33 +-
.../fileRelated/UnSealedTsFileReaderTest.java | 6 +-
.../resourceRelated/SeqResourceReaderTest.java | 6 +-
.../resourceRelated/UnseqResourceReaderTest.java | 8 +-
.../iotdb/db/sync/sender/SingleClientSyncTest.java | 96 ++--
.../apache/iotdb/db/sync/test/SyncTestClient1.java | 11 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 2 +-
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 59 +--
.../writelog/recover/UnseqTsFileRecoverTest.java | 8 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 4 +-
.../iotdb/tsfile/encoding/common/EndianType.java | 2 +-
.../iotdb/tsfile/encoding/decoder/Decoder.java | 6 +-
.../encoding/decoder/DeltaBinaryDecoder.java | 1 +
.../tsfile/encoding/decoder/FloatDecoder.java | 4 +-
.../tsfile/encoding/decoder/PlainDecoder.java | 41 +-
.../encoding/encoder/DeltaBinaryEncoder.java | 9 +-
.../tsfile/encoding/encoder/FloatEncoder.java | 4 +-
.../tsfile/encoding/encoder/PlainEncoder.java | 39 +-
.../tsfile/encoding/encoder/TSEncodingBuilder.java | 6 +-
.../write/TsFileNotCompleteException.java | 21 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 2 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 2 +-
.../iotdb/tsfile/file/metadata/TsFileMetaData.java | 31 ++
.../apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 8 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 79 ++-
.../apache/iotdb/tsfile/read/common/BatchData.java | 1 +
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 8 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 2 +-
.../tsfile/read/controller/ChunkLoaderImpl.java | 10 +-
.../{ChunkLoader.java => IChunkLoader.java} | 6 +-
...{MetadataQuerier.java => IMetadataQuerier.java} | 7 +-
.../read/controller/MetadataQuerierByFileImpl.java | 34 +-
.../query/executor/ExecutorWithTimeGenerator.java | 10 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 10 +-
.../query/timegenerator/TimeGeneratorImpl.java | 12 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 3 +
.../iotdb/tsfile/read/reader/page/PageReader.java | 3 +-
.../read/reader/series/FileSeriesReader.java | 6 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 6 +-
.../reader/series/FileSeriesReaderWithFilter.java | 4 +-
.../series/FileSeriesReaderWithoutFilter.java | 4 +-
.../iotdb/tsfile/write/chunk/ChunkBuffer.java | 15 +-
.../tsfile/write/chunk/ChunkGroupWriterImpl.java | 2 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 11 +-
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 3 +
.../tsfile/write/schema/MeasurementSchema.java | 5 +-
.../tsfile/write/writer/DefaultTsFileOutput.java | 21 +-
.../write/writer/ForceAppendTsFileWriter.java | 86 ++++
.../write/writer/RestorableTsFileIOWriter.java | 13 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 83 +++-
.../tsfile/encoding/decoder/IntRleDecoderTest.java | 10 +-
.../encoding/decoder/LongRleDecoderTest.java | 6 +-
.../iotdb/tsfile/read/ReadInPartitionTest.java | 2 +-
...st.java => IMetadataQuerierByFileImplTest.java} | 2 +-
.../read/query/executor/QueryExecutorTest.java | 4 +-
.../query/timegenerator/TimeGeneratorTest.java | 4 +-
.../iotdb/tsfile/read/reader/PageReaderTest.java | 4 +-
.../iotdb/tsfile/write/series/PageWriterTest.java | 6 +-
153 files changed, 6839 insertions(+), 2898 deletions(-)