This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch now_In_GroupBy in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 2fdd0653f303ebbffd0721104d50d9fef5f6ed0b Merge: ee2414a 6f80172 Author: HTHou <[email protected]> AuthorDate: Mon Mar 2 21:33:03 2020 +0800 Merge branch 'master' of https://github.com/apache/incubator-iotdb .../print-tsfile-sketch.sh => .asf.yaml | 40 +- .gitignore | 3 + .travis.yml | 6 +- NOTICE | 2 +- NOTICE-binary | 2 +- README.md | 5 +- RELEASE_NOTES.md | 28 + client-py/compile.bat | 5 +- client-py/readme.md | 2 +- client-py/src/client_example.py | 35 +- .../org/apache/iotdb/client/AbstractClient.java | 444 +++--- .../main/java/org/apache/iotdb/client/Client.java | 32 +- .../java/org/apache/iotdb/client/WinClient.java | 31 +- docker/ReadMe.md | 59 + docker/src/main/Dockerfile | 1 + docker/src/main/Dockerfile-0.8.1 | 40 + docker/src/main/Dockerfile-0.9.0 | 41 + docker/src/main/Dockerfile-0.9.1 | 41 + docs/{ => Community}/Community-History&Vision.md | 0 docs/{ => Community}/Community-Powered By.md | 0 .../Community-Project Committers.md | 0 docs/{ => Development}/Development-Chinese.md | 21 + docs/{ => Development}/Development-Contributing.md | 3 + docs/{ => Development}/Development-Document.md | 3 + docs/{ => Development}/Development-IDE.md | 0 docs/{ => Development}/Development-VoteRelease.md | 0 .../SystemDesign/0-Architecture/1-Architecture.md | 55 + .../SystemDesign/1-TsFile/1-TsFile.md} | 11 +- .../1-TsFile/2-Format.md} | 7 +- .../SystemDesign/1-TsFile/3-Write.md | 65 + .../SystemDesign/1-TsFile/4-Read.md | 566 ++++++++ .../SystemDesign/2-QueryEngine/1-QueryEngine.md | 64 + .../SystemDesign/2-QueryEngine/2-Planner.md | 63 + .../SystemDesign/2-QueryEngine/3-PlanExecutor.md} | 6 +- .../3-SchemaManager/1-SchemaManager.md} | 6 +- .../4-StorageEngine/1-StorageEngine.md | 68 + .../SystemDesign/4-StorageEngine/2-WAL.md} | 6 +- .../SystemDesign/4-StorageEngine/3-FlushManager.md | 84 ++ .../4-StorageEngine/4-MergeManager.md} | 6 +- .../4-StorageEngine/5-DataPartition.md | 86 ++ .../4-StorageEngine/6-DataManipulation.md | 96 ++ .../5-DataQuery/1-DataQuery.md} | 19 +- .../SystemDesign/5-DataQuery/2-SeriesReader.md | 414 ++++++ .../SystemDesign/5-DataQuery/3-RawDataQuery.md | 301 ++++ .../SystemDesign/5-DataQuery/4-AggregationQuery.md | 118 ++ .../SystemDesign/5-DataQuery/5-GroupByQuery.md | 192 +++ .../SystemDesign/6-Tools/1-Sync.md | 299 ++++ .../SystemDesign/7-Connector/2-Hive-TsFile.md | 114 ++ .../SystemDesign/7-Connector/3-Spark-TsFile.md | 101 ++ .../SystemDesign/7-Connector/4-Spark-IOTDB.md | 89 ++ .../UserGuide/0-Get Started/1-QuickStart.md | 2 +- .../UserGuide/3-Server/4-Config Manual.md | 37 +- .../UserGuide/4-Client/6-Status Codes.md | 65 + .../1-DDL (Data Definition Language).md | 8 +- .../2-DML (Data Manipulation Language).md | 36 + .../5-Operation Manual/4-SQL Reference.md | 158 ++- .../2-Files.md => 8-Architecture/1-Files.md} | 0 .../2-Writing Data on HDFS.md} | 0 .../3-Shared Nothing Cluster.md} | 0 .../SystemDesign/0-Content.md} | 34 +- .../1-TsFile/1-TsFile.md} | 10 +- .../1-TsFile/2-Format.md} | 12 +- .../SystemDesign/1-TsFile/3-Write.md} | 4 +- docs/Documentation/SystemDesign/1-TsFile/4-Read.md | 559 ++++++++ .../{Developers => SystemDesign}/release.adoc | 0 docs/Documentation/UserGuide/0-Content.md | 10 +- .../UserGuide/0-Get Started/1-QuickStart.md | 9 +- .../UserGuide/3-Server/4-Config Manual.md | 39 +- .../4-Client/4-Programming - Other Languages.md | 53 +- .../UserGuide/4-Client/6-Status Codes.md | 66 + .../1-DDL (Data Definition Language).md | 11 +- .../2-DML (Data Manipulation Language).md | 57 +- .../5-Operation Manual/4-SQL Reference.md | 168 ++- .../2-Files.md => 8-Architecture/1-Files.md} | 0 .../2-Writing Data on HDFS.md} | 0 .../3-Shared Nothing Cluster.md} | 0 .../iotdb/hadoop/tsfile/TSFMRReadExample.java | 3 - .../iotdb/hadoop/tsfile/TSMRWriteExample.java | 1 - .../main/java/org/apache/iotdb/JDBCExample.java | 2 +- example/rocketmq/readme.md | 26 +- .../main/java/org/apache/iotdb/SessionExample.java | 12 +- .../apache/iotdb/hadoop/tsfile/TSFInputFormat.java | 3 - .../iotdb/hadoop/tsfile/TSFOutputFormat.java | 3 - .../iotdb/hadoop/tsfile/TSFRecordReader.java | 3 - .../iotdb/hadoop/tsfile/record/HDFSTSRecord.java | 3 - .../iotdb/hadoop/tsfile/TSFInputSplitTest.java | 2 - hadoop/src/test/resources/logback.xml | 2 +- .../apache/iotdb/hive/TsFileDeserializerTest.java | 3 - .../org/apache/iotdb/hive/TsFileTestHelper.java | 11 +- .../src/test/resources/logback.xml | 4 +- ...yResultSet.java => AbstractIoTDBResultSet.java} | 254 +--- .../org/apache/iotdb/jdbc/IoTDBConnection.java | 102 +- .../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java | 209 +++ .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 1303 ++--------------- .../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 7 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 72 +- .../src/main/java/org/apache/iotdb/jdbc/Utils.java | 7 +- .../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 30 +- pom.xml | 6 +- .../resources/conf/iotdb-engine.properties | 52 +- server/src/assembly/resources/conf/iotdb-env.bat | 31 +- server/src/assembly/resources/conf/iotdb-env.sh | 31 +- server/src/assembly/resources/conf/logback.xml | 12 +- .../src/assembly/resources/sbin/start-server.bat | 6 +- server/src/assembly/resources/sbin/start-server.sh | 6 +- .../tsfileToolSet/print-tsfile-resource-files.sh | 0 .../tools/tsfileToolSet/print-tsfile-sketch.sh | 0 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 204 ++- .../org/apache/iotdb/db/auth/AuthorityChecker.java | 1 - .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 144 +- .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 65 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 8 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 92 +- .../db/conf/adapter/ActiveTimeSeriesCounter.java | 19 +- .../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 9 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 79 +- .../db/engine/cache/CacheHitRatioMonitor.java | 5 + .../engine/cache/CacheHitRatioMonitorMXBean.java | 2 + .../apache/iotdb/db/engine/cache/ChunkCache.java | 161 +++ .../iotdb/db/engine/cache/DeviceMetaDataCache.java | 13 +- .../iotdb/db/engine/cache/RamUsageEstimator.java | 34 +- .../apache/iotdb/db/engine/flush/FlushManager.java | 33 +- .../iotdb/db/engine/flush/MemTableFlushTask.java | 12 +- .../iotdb/db/engine/flush/TsFileFlushPolicy.java | 2 +- .../iotdb/db/engine/memtable/AbstractMemTable.java | 48 +- .../apache/iotdb/db/engine/memtable/IMemTable.java | 11 +- .../db/engine/memtable/IWritableMemChunk.java | 32 +- .../db/engine/memtable/MemSeriesLazyMerger.java | 50 - .../engine/memtable/TimeValuePairInMemTable.java | 45 - .../db/engine/memtable/TimeValuePairSorter.java | 55 - .../iotdb/db/engine/memtable/WritableMemChunk.java | 155 +- .../iotdb/db/engine/merge/manage/MergeManager.java | 40 + .../db/engine/merge/manage/MergeResource.java | 12 +- .../iotdb/db/engine/merge/recover/LogAnalyzer.java | 2 +- .../merge/selector/MaxFileMergeFileSelector.java | 73 +- .../iotdb/db/engine/merge/task/MergeFileTask.java | 6 +- .../db/engine/merge/task/MergeMultiChunkTask.java | 17 +- .../iotdb/db/engine/merge/task/MergeTask.java | 4 +- .../db/engine/querycontext/QueryDataSource.java | 13 +- .../db/engine/querycontext/ReadOnlyMemChunk.java | 131 +- .../engine/storagegroup/StorageGroupProcessor.java | 835 +++++++---- .../db/engine/storagegroup/TsFileProcessor.java | 348 +++-- .../db/engine/storagegroup/TsFileResource.java | 24 +- .../version/SimpleFileVersionController.java | 51 +- .../db/exception/ConfigAdjusterException.java | 5 +- .../exception/DiskSpaceInsufficientException.java | 4 +- .../{ProcessException.java => IoTDBException.java} | 10 +- .../apache/iotdb/db/exception/MergeException.java | 5 +- .../exception/QueryInBatchStatementException.java | 6 +- .../iotdb/db/exception/StartupException.java | 12 +- .../iotdb/db/exception/StorageEngineException.java | 14 +- .../db/exception/SyncConnectionException.java | 11 +- .../SyncDeviceOwnerConflictException.java | 8 +- .../iotdb/db/exception/SystemCheckException.java | 6 +- .../db/exception/TsFileProcessorException.java | 8 +- .../IllegalPathException.java} | 10 +- .../db/exception/metadata/MetadataException.java | 24 +- ...ception.java => PathAlreadyExistException.java} | 9 +- .../PathNotExistException.java} | 13 +- .../StorageGroupAlreadySetException.java} | 17 +- .../StorageGroupNotSetException.java | 4 +- .../db/exception/path/MTreePathException.java | 38 - .../exception/query/LogicalOperatorException.java | 16 +- .../exception/query/LogicalOptimizeException.java | 6 +- .../db/exception/query/OutOfTTLException.java | 4 +- .../exception/{path => query}/PathException.java | 13 +- .../db/exception/query/QueryProcessException.java | 16 +- .../query/UnSupportedFillTypeException.java | 4 +- .../JDBCServiceException.java} | 16 +- .../storageGroup/StorageGroupException.java | 7 +- .../storageGroup/StorageGroupPathException.java | 30 - .../StorageGroupProcessorException.java | 10 +- .../java/org/apache/iotdb/db/metadata/MGraph.java | 419 ------ .../org/apache/iotdb/db/metadata/MManager.java | 1334 +++++------------- .../java/org/apache/iotdb/db/metadata/MNode.java | 241 ---- .../java/org/apache/iotdb/db/metadata/MTree.java | 1135 +++++---------- .../org/apache/iotdb/db/metadata/MetaUtils.java | 60 +- .../iotdb/db/metadata/MetadataOperationType.java | 15 +- .../java/org/apache/iotdb/db/metadata/PNode.java | 127 -- .../java/org/apache/iotdb/db/metadata/PTree.java | 244 ---- .../iotdb/db/metadata/mnode/InternalMNode.java | 74 + .../apache/iotdb/db/metadata/mnode/LeafMNode.java | 77 + .../org/apache/iotdb/db/metadata/mnode/MNode.java | 116 ++ .../iotdb/db/metadata/mnode/StorageGroupMNode.java | 59 + .../org/apache/iotdb/db/monitor/StatMonitor.java | 21 +- .../iotdb/db/monitor/collector/FileSize.java | 9 +- .../db/qp/{QueryProcessor.java => Planner.java} | 31 +- .../apache/iotdb/db/qp/constant/DatetimeUtils.java | 2 +- .../apache/iotdb/db/qp/constant/SQLConstant.java | 5 +- .../qp/executor/AbstractQueryProcessExecutor.java | 390 ----- ...ueryProcessExecutor.java => IPlanExecutor.java} | 50 +- ...QueryProcessExecutor.java => PlanExecutor.java} | 763 ++++++---- .../org/apache/iotdb/db/qp/logical/Operator.java | 4 +- .../db/qp/logical/crud/BasicFunctionOperator.java | 72 +- .../iotdb/db/qp/logical/crud/FilterOperator.java | 50 +- .../iotdb/db/qp/logical/crud/FunctionOperator.java | 7 + .../iotdb/db/qp/logical/crud/InOperator.java | 200 +++ .../iotdb/db/qp/logical/crud/QueryOperator.java | 20 +- .../iotdb/db/qp/logical/sys/PropertyOperator.java | 106 -- .../iotdb/db/qp/physical/crud/AggregationPlan.java | 2 +- .../db/qp/physical/crud/AlignByDevicePlan.java | 176 +++ .../iotdb/db/qp/physical/crud/BatchInsertPlan.java | 56 +- .../iotdb/db/qp/physical/crud/FillQueryPlan.java | 2 +- .../iotdb/db/qp/physical/crud/GroupByPlan.java | 13 +- .../iotdb/db/qp/physical/crud/QueryPlan.java | 109 +- .../db/qp/physical/crud/RawDataQueryPlan.java | 76 + .../iotdb/db/qp/physical/sys/PropertyPlan.java | 95 -- .../iotdb/db/qp/strategy/LogicalGenerator.java | 200 ++- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 259 ++-- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 34 +- .../qp/strategy/optimizer/DnfFilterOptimizer.java | 2 +- .../db/qp/strategy/optimizer/IFilterOptimizer.java | 4 +- .../qp/strategy/optimizer/RemoveNotOptimizer.java | 21 +- .../db/query/aggregation/AggreResultData.java | 192 --- .../db/query/aggregation/AggregateFunction.java | 122 -- .../db/query/aggregation/AggregateResult.java | 287 ++++ .../db/query/aggregation/AggregationType.java | 100 ++ .../db/query/aggregation/impl/AvgAggrFunc.java | 173 --- .../db/query/aggregation/impl/AvgAggrResult.java | 146 ++ .../db/query/aggregation/impl/CountAggrFunc.java | 156 -- .../db/query/aggregation/impl/CountAggrResult.java | 106 ++ .../query/aggregation/impl/FirstValueAggrFunc.java | 154 -- .../aggregation/impl/FirstValueAggrResult.java | 123 ++ .../query/aggregation/impl/LastValueAggrFunc.java | 151 -- .../aggregation/impl/LastValueAggrResult.java | 118 ++ .../db/query/aggregation/impl/MaxTimeAggrFunc.java | 135 -- .../query/aggregation/impl/MaxTimeAggrResult.java | 113 ++ .../query/aggregation/impl/MaxValueAggrFunc.java | 170 --- .../query/aggregation/impl/MaxValueAggrResult.java | 112 ++ .../db/query/aggregation/impl/MinTimeAggrFunc.java | 156 -- .../query/aggregation/impl/MinTimeAggrResult.java | 108 ++ .../query/aggregation/impl/MinValueAggrFunc.java | 166 --- .../query/aggregation/impl/MinValueAggrResult.java | 109 ++ .../db/query/aggregation/impl/SumAggrResult.java | 127 ++ .../iotdb/db/query/control/FileReaderManager.java | 47 +- .../iotdb/db/query/control/QueryFileManager.java | 17 +- .../db/query/control/QueryResourceManager.java | 29 +- .../query/dataset/AggreResultDataPointReader.java | 56 - ...erateDataSet.java => AlignByDeviceDataSet.java} | 159 ++- .../db/query/dataset/NonAlignEngineDataSet.java | 350 +++++ .../OldEngineDataSetWithoutValueFilter.java | 153 -- ...er.java => RawQueryDataSetWithValueFilter.java} | 28 +- ...java => RawQueryDataSetWithoutValueFilter.java} | 120 +- .../iotdb/db/query/dataset/SingleDataSet.java | 3 +- .../dataset/groupby/GroupByEngineDataSet.java | 86 +- .../groupby/GroupByWithValueFilterDataSet.java | 72 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 384 +++-- .../db/query/executor/AggregateEngineExecutor.java | 336 ----- .../db/query/executor/AggregationExecutor.java | 289 ++++ ...lEngineExecutor.java => FillQueryExecutor.java} | 57 +- .../{IEngineQueryRouter.java => IQueryRouter.java} | 6 +- .../{EngineQueryRouter.java => QueryRouter.java} | 114 +- ...gineExecutor.java => RawDataQueryExecutor.java} | 91 +- .../db/query/externalsort/ExternalSortJob.java | 2 +- .../query/externalsort/ExternalSortJobEngine.java | 7 +- .../db/query/externalsort/ExternalSortJobPart.java | 2 +- .../iotdb/db/query/externalsort/LineMerger.java | 6 +- .../MultiSourceExternalSortJobPart.java | 2 +- .../externalsort/SimpleExternalSortEngine.java | 15 +- .../SingleSourceExternalSortJobPart.java | 28 +- .../adapter/ByTimestampReaderAdapter.java | 67 +- .../serialize/IExternalSortFileDeserializer.java | 6 +- .../serialize/IExternalSortFileSerializer.java | 2 +- .../FixLengthIExternalSortFileDeserializer.java | 6 +- .../impl/FixLengthTimeValuePairSerializer.java | 2 +- .../iotdb/db/query/factory/AggreFuncFactory.java | 80 -- .../db/query/factory/AggregateResultFactory.java | 104 ++ .../java/org/apache/iotdb/db/query/fill/IFill.java | 70 +- .../org/apache/iotdb/db/query/fill/LinearFill.java | 51 +- .../apache/iotdb/db/query/fill/PreviousFill.java | 39 +- .../filter/TsFileFilter.java} | 22 +- .../ChunkDataIterator.java} | 44 +- .../{chunkRelated => chunk}/ChunkReaderWrap.java | 14 +- .../db/query/reader/chunk/DiskChunkLoader.java | 36 +- .../DiskChunkReaderByTimestamp.java | 64 +- .../db/query/reader/chunk/MemChunkLoader.java | 41 +- .../{chunkRelated => chunk}/MemChunkReader.java | 58 +- .../chunk/MemPageReader.java} | 31 +- .../reader/chunkRelated/CachedDiskChunkReader.java | 88 -- .../chunkRelated/MemChunkReaderByTimestamp.java | 78 - .../FileSeriesReaderByTimestampAdapter.java | 49 - .../fileRelated/UnSealedTsFileIterateReader.java | 130 -- .../UnSealedTsFileReaderByTimestamp.java | 96 -- .../CachedUnseqResourceMergeReader.java | 11 +- .../NewUnseqResourceMergeReader.java | 199 --- .../OldUnseqResourceMergeReader.java | 140 -- .../resourceRelated/ResourceRelatedUtil.java | 48 - .../resourceRelated/SeqResourceIterateReader.java | 157 --- .../SeqResourceReaderByTimestamp.java | 190 --- .../UnseqResourceReaderByTimestamp.java | 101 -- .../db/query/reader/series}/IAggregateReader.java | 36 +- .../reader/{ => series}/IReaderByTimestamp.java | 9 +- .../reader/{ => series}/ManagedSeriesReader.java | 8 +- .../query/reader/series/SeriesAggregateReader.java | 102 ++ .../reader/series/SeriesRawDataBatchReader.java | 132 ++ .../reader/series/SeriesRawDataPointReader.java | 100 ++ .../iotdb/db/query/reader/series/SeriesReader.java | 469 ++++++ .../reader/series/SeriesReaderByTimestamp.java | 93 ++ .../seriesRelated/SeriesReaderByTimestamp.java | 57 - .../seriesRelated/SeriesReaderWithValueFilter.java | 113 -- .../SeriesReaderWithoutValueFilter.java | 261 ---- .../universal/CachedPriorityMergeReader.java | 8 +- .../db/query/reader/universal/IterateReader.java | 90 -- .../reader/universal/PriorityMergeReader.java | 48 +- .../universal/PriorityMergeReaderByTimestamp.java | 75 - .../timegenerator/AbstractNodeConstructor.java | 75 - .../query/timegenerator/EngineNodeConstructor.java | 68 - .../query/timegenerator/EngineTimeGenerator.java | 67 - .../query/timegenerator/ServerTimeGenerator.java | 75 + .../org/apache/iotdb/db/rescon/MemTablePool.java | 24 +- .../apache/iotdb/db/rescon/PrimitiveArrayPool.java | 16 +- .../java/org/apache/iotdb/db/service/IService.java | 2 + .../org/apache/iotdb/db/service/JDBCService.java | 7 +- .../org/apache/iotdb/db/service/JMXService.java | 10 +- .../apache/iotdb/db/service/MetricsService.java | 25 +- .../apache/iotdb/db/service/RegisterManager.java | 2 +- .../org/apache/iotdb/db/service/StartupChecks.java | 2 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 451 ++++-- .../iotdb/db/sync/conf/SyncSenderConfig.java | 18 - .../iotdb/db/sync/receiver/load/FileLoader.java | 2 +- .../db/sync/receiver/load/FileLoaderManager.java | 9 +- .../receiver/recover/ISyncReceiverLogAnalyzer.java | 1 - .../db/sync/receiver/transfer/SyncServiceImpl.java | 5 +- .../db/sync/sender/manage/ISyncFileManager.java | 10 +- .../db/sync/sender/manage/SyncFileManager.java | 143 +- .../iotdb/db/sync/sender/transfer/ISyncClient.java | 6 +- .../iotdb/db/sync/sender/transfer/SyncClient.java | 134 +- .../java/org/apache/iotdb/db/utils/FileUtils.java | 8 +- .../java/org/apache/iotdb/db/utils/MemUtils.java | 21 +- .../java/org/apache/iotdb/db/utils/MergeUtils.java | 1 + .../apache/iotdb/db/utils/QueryDataSetUtils.java | 1 - .../java/org/apache/iotdb/db/utils/QueryUtils.java | 14 + .../apache/iotdb/db/utils/RandomDeleteCache.java | 16 +- .../org/apache/iotdb/db/utils/SchemaUtils.java | 17 +- .../java/org/apache/iotdb/db/utils/SyncUtils.java | 10 +- .../apache/iotdb/db/utils/TimeValuePairUtils.java | 66 +- .../org/apache/iotdb/db/utils/UpgradeUtils.java | 6 +- .../iotdb/db/utils/datastructure/BinaryTVList.java | 54 +- .../db/utils/datastructure/BooleanTVList.java | 55 +- .../iotdb/db/utils/datastructure/DoubleTVList.java | 59 +- .../iotdb/db/utils/datastructure/FloatTVList.java | 59 +- .../iotdb/db/utils/datastructure/IntTVList.java | 55 +- .../iotdb/db/utils/datastructure/LongTVList.java | 54 +- .../iotdb/db/utils/datastructure/TVList.java | 152 +- .../iotdb/db/writelog/recover/LogReplayer.java | 8 +- .../writelog/recover/TsFileRecoverPerformer.java | 2 +- .../adapter/IoTDBConfigDynamicAdapterTest.java | 3 +- .../iotdb/db/engine/MetadataManagerHelper.java | 85 +- .../db/engine/cache/DeviceMetaDataCacheTest.java | 20 +- .../db/engine/memtable/PrimitiveMemTableTest.java | 80 +- .../apache/iotdb/db/engine/merge/MergeLogTest.java | 2 +- .../iotdb/db/engine/merge/MergeOverLapTest.java | 41 +- .../iotdb/db/engine/merge/MergeTaskTest.java | 192 +-- .../apache/iotdb/db/engine/merge/MergeTest.java | 16 +- .../engine/modification/DeletionFileNodeTest.java | 122 +- .../db/engine/modification/DeletionQueryTest.java | 35 +- .../storagegroup/FileNodeManagerBenchmark.java | 6 +- .../storagegroup/StorageGroupProcessorTest.java | 58 +- .../iotdb/db/engine/storagegroup/TTLTest.java | 135 +- .../engine/storagegroup/TsFileProcessorTest.java | 160 ++- .../version/SimpleFileVersionControllerTest.java | 4 +- .../iotdb/db/integration/IOTDBGroupByIT.java | 67 +- .../integration/IOTDBGroupByInnerIntervalIT.java | 26 +- .../iotdb/db/integration/IoTDBAggregationIT.java | 216 ++- .../integration/IoTDBAggregationLargeDataIT.java | 2 + .../integration/IoTDBAggregationSmallDataIT.java | 129 +- .../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 1487 ++++++++++++++++++++ .../iotdb/db/integration/IoTDBAuthorizationIT.java | 3 +- .../db/integration/IoTDBDeleteStorageGroupIT.java | 33 +- .../iotdb/db/integration/IoTDBDeletionIT.java | 19 +- .../iotdb/db/integration/IoTDBDisableAlignIT.java | 401 ++++++ .../db/integration/IoTDBEngineTimeGeneratorIT.java | 10 +- .../apache/iotdb/db/integration/IoTDBFillIT.java | 2 +- .../db/integration/IoTDBFlushQueryMergeTest.java | 20 +- .../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 713 ---------- .../integration/IoTDBLoadExternalTsfileTest.java | 84 +- .../iotdb/db/integration/IoTDBMergeTest.java | 135 +- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 10 +- .../iotdb/db/integration/IoTDBMultiSeriesIT.java | 56 +- .../iotdb/db/integration/IoTDBQueryDemoIT.java | 148 +- ...IoTDBAggregationIT.java => IoTDBRecoverIT.java} | 315 +---- .../db/integration/IoTDBSequenceDataQueryIT.java | 23 +- .../iotdb/db/integration/IoTDBSeriesReaderIT.java | 57 +- .../iotdb/db/integration/IoTDBSimpleQueryTest.java | 59 + .../apache/iotdb/db/integration/IoTDBTtlIT.java | 22 +- .../org/apache/iotdb/db/metadata/MGraphTest.java | 81 -- .../iotdb/db/metadata/MManagerAdvancedTest.java | 95 +- .../iotdb/db/metadata/MManagerBasicTest.java | 352 ++--- .../iotdb/db/metadata/MManagerImproveTest.java | 137 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 295 ++-- .../org/apache/iotdb/db/metadata/MetadataTest.java | 88 -- .../{QueryProcessorTest.java => PlannerTest.java} | 63 +- .../iotdb/db/qp/bench/QueryParseBenchmark.java | 11 +- .../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 9 +- .../db/qp/other/TSPlanContextPropertyTest.java | 92 -- ...ncatOptimizer.java => ConcatOptimizerTest.java} | 107 +- .../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 50 +- .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 340 ++--- .../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 206 --- .../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 196 --- .../db/query/aggregation/AggregateResultTest.java | 265 ++++ .../iotdb/db/query/component/SimpleFileWriter.java | 54 - .../dataset/EngineDataSetWithValueFilterTest.java | 14 +- .../query/executor/GroupByEngineDataSetTest.java | 29 +- .../query/externalsort/ExternalSortEngineTest.java | 40 +- .../db/query/externalsort/FakeChunkReaderWrap.java | 6 +- ...ExternalSortFileSerializerDeserializerTest.java | 6 +- .../iotdb/db/query/reader/ReaderTestHelper.java | 2 + .../fileRelated/UnSealedTsFileReaderTest.java | 105 -- .../NewUnseqResourceMergeReaderTest.java | 102 -- .../resourceRelated/SeqResourceReaderTest.java | 113 -- .../resourceRelated/UnseqResourceReaderTest.java | 143 -- .../reader/series/SeriesAggregateReaderTest.java | 116 ++ .../reader/series/SeriesReaderByTimestampTest.java | 84 ++ .../db/query/reader/series/SeriesReaderTest.java | 127 ++ .../reader/series/SeriesReaderTestUtil.java} | 164 +-- .../reader/seriesRelated/FakedIBatchPoint.java | 110 -- .../reader/seriesRelated/FakedIPointReader.java | 79 -- .../SeriesReaderWithValueFilterTest.java | 59 - .../SeriesReaderWithoutValueFilterTest.java | 74 - .../query/reader/universal/FakedSeriesReader.java | 10 +- .../universal/FakedSeriesReaderByTimestamp.java | 79 -- .../PriorityMergeReaderByTimestampTest.java | 172 --- .../reader/universal/PriorityMergeReaderTest.java | 8 +- .../reader/universal/PriorityMergeReaderTest2.java | 13 +- .../db/sync/receiver/load/FileLoaderTest.java | 56 +- .../recover/SyncReceiverLogAnalyzerTest.java | 8 +- .../db/sync/sender/manage/SyncFileManagerTest.java | 188 ++- .../sender/recover/SyncSenderLogAnalyzerTest.java | 66 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 81 +- .../db/utils/datastructure/LongTVListTest.java | 2 +- .../apache/iotdb/db/writelog/PerformanceTest.java | 15 +- .../iotdb/db/writelog/recover/LogReplayerTest.java | 21 +- .../db/writelog/recover/SeqTsFileRecoverTest.java | 9 +- .../writelog/recover/UnseqTsFileRecoverTest.java | 27 +- server/src/test/resources/logback.xml | 12 +- service-rpc/rpc-changelist.md | 4 +- .../main/java/org/apache/iotdb/rpc/RpcUtils.java | 2 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 14 +- service-rpc/src/main/thrift/rpc.thrift | 29 +- service-rpc/src/pypi/setup.py | 2 +- session/pom.xml | 2 +- .../java/org/apache/iotdb/session/Session.java | 152 +- .../org/apache/iotdb/session/SessionDataSet.java | 143 +- .../org/apache/iotdb/session/IoTDBSessionIT.java | 361 ++++- .../org/apache/iotdb/spark/db/Converter.scala | 37 +- .../org/apache/iotdb/spark/db/DefaultSource.scala | 37 +- .../org/apache/iotdb/spark/db/IoTDBOptions.scala | 37 +- .../scala/org/apache/iotdb/spark/db/IoTDBRDD.scala | 37 +- .../org/apache/iotdb/spark/db/IoTDBRelation.scala | 37 +- .../org/apache/iotdb/spark/db/Transformer.scala | 37 +- .../scala/org/apache/iotdb/spark/db/package.scala | 37 +- .../org/apache/iotdb/spark/db/IoTDBTest.scala | 37 +- .../org/apache/iotdb/spark/tsfile/Converter.scala | 37 +- .../apache/iotdb/spark/tsfile/DefaultSource.scala | 36 +- .../iotdb/spark/tsfile/NarrowConverter.scala | 37 +- .../spark/tsfile/NarrowTsFileOutputWriter.scala | 37 +- .../apache/iotdb/spark/tsfile/Transformer.scala | 37 +- .../iotdb/spark/tsfile/TsFileWriterFactory.scala | 36 +- .../apache/iotdb/spark/tsfile/WideConverter.scala | 37 +- .../spark/tsfile/WideTsFileOutputWriter.scala | 37 +- .../org/apache/iotdb/spark/tsfile/package.scala | 36 +- .../apache/iotdb/spark/tsfile/ConverterTest.scala | 37 +- .../org/apache/iotdb/spark/tsfile/TSFileSuit.scala | 37 +- .../apache/iotdb/tsfile/common/cache/LRUCache.java | 8 +- .../iotdb/tsfile/common/conf/TSFileConfig.java | 18 +- .../iotdb/tsfile/common/conf/TSFileDescriptor.java | 7 +- .../tsfile/common/constant/TsFileConstant.java | 1 - .../iotdb/tsfile/file/header/ChunkHeader.java | 8 +- .../iotdb/tsfile/file/metadata/ChunkMetaData.java | 411 +++--- .../tsfile/fileSystem/fsFactory/FSFactory.java | 67 + .../tsfile/fileSystem/fsFactory/HDFSFactory.java | 15 + .../fileSystem/fsFactory/LocalFSFactory.java | 9 + .../apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 4 +- .../apache/iotdb/tsfile/read}/TimeValuePair.java | 2 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 53 +- .../apache/iotdb/tsfile/read/common/BatchData.java | 52 +- .../org/apache/iotdb/tsfile/read/common/Field.java | 64 +- .../org/apache/iotdb/tsfile/read/common/Path.java | 3 +- .../apache/iotdb/tsfile/read/common/RowRecord.java | 10 + .../iotdb/tsfile/read/common/SignalBatchData.java | 5 + .../common/{RowRecord.java => TimeColumn.java} | 66 +- ...kLoaderImpl.java => CachedChunkLoaderImpl.java} | 16 +- .../iotdb/tsfile/read/controller/IChunkLoader.java | 8 +- .../read/expression/impl/GlobalTimeExpression.java | 2 +- .../expression/impl/SingleSeriesExpression.java | 2 +- .../iotdb/tsfile/read/filter/GroupByFilter.java | 24 +- .../iotdb/tsfile/read/filter/TimeFilter.java | 16 + .../iotdb/tsfile/read/filter/ValueFilter.java | 16 + .../tsfile/read/filter/basic/BinaryFilter.java | 2 +- .../iotdb/tsfile/read/filter/basic/Filter.java | 2 +- .../tsfile/read/filter/basic/UnaryFilter.java | 7 +- .../tsfile/read/filter/factory/FilterFactory.java | 2 - .../read/filter/factory/FilterSerializeId.java | 2 +- .../tsfile/read/filter/operator/AndFilter.java | 4 +- .../iotdb/tsfile/read/filter/operator/Eq.java | 6 +- .../iotdb/tsfile/read/filter/operator/Gt.java | 13 +- .../iotdb/tsfile/read/filter/operator/GtEq.java | 13 +- .../filter/operator/{NotFilter.java => In.java} | 92 +- .../iotdb/tsfile/read/filter/operator/Lt.java | 13 +- .../iotdb/tsfile/read/filter/operator/LtEq.java | 13 +- .../iotdb/tsfile/read/filter/operator/NotEq.java | 13 +- .../tsfile/read/filter/operator/NotFilter.java | 4 +- .../tsfile/read/filter/operator/OrFilter.java | 4 +- .../query/dataset/DataSetWithTimeGenerator.java | 4 +- .../tsfile/read/query/dataset/EmptyDataSet.java | 22 +- .../tsfile/read/query/dataset/QueryDataSet.java | 34 - .../query/executor/ExecutorWithTimeGenerator.java | 4 +- .../read/query/timegenerator/TimeGenerator.java | 99 +- .../query/timegenerator/TimeGeneratorImpl.java | 130 -- .../query/timegenerator/TsFileTimeGenerator.java | 51 + .../read/query/timegenerator/node/AndNode.java | 100 +- .../read/query/timegenerator/node/LeafNode.java | 57 +- .../tsfile/read/query/timegenerator/node/Node.java | 5 +- .../read/query/timegenerator/node/OrNode.java | 121 +- .../tsfile/read/reader/BatchDataIterator.java | 44 +- .../tsfile/read/reader/DefaultTsFileInput.java | 2 +- .../iotdb/tsfile/read/reader/IChunkReader.java | 17 +- .../{IDataReader.java => reader/IPageReader.java} | 13 +- .../iotdb/tsfile/read}/reader/IPointReader.java | 12 +- .../tsfile/read/reader/chunk/ChunkReader.java | 87 +- .../read/reader/chunk/ChunkReaderByTimestamp.java | 4 +- .../iotdb/tsfile/read/reader/page/PageReader.java | 42 +- .../reader/series/AbstractFileSeriesReader.java | 37 +- .../read/reader/series/EmptyFileSeriesReader.java | 5 - .../org/apache/iotdb/tsfile/utils/PublicBAOS.java | 13 - .../apache/iotdb/tsfile/write/TsFileWriter.java | 23 +- .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 14 +- .../apache/iotdb/tsfile/write/page/PageWriter.java | 12 +- .../tsfile/write/schema/MeasurementSchema.java | 2 +- .../write/writer/ForceAppendTsFileWriter.java | 8 +- .../write/writer/RestorableTsFileIOWriter.java | 5 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 9 +- .../decoder/delta/DeltaBinaryEncoderLongTest.java | 18 +- .../apache/iotdb/tsfile/read/ExpressionTest.java | 60 + .../org/apache/iotdb/tsfile/read/ReadTest.java | 18 +- .../iotdb/tsfile/read/common/BatchDataTest.java | 82 ++ .../tsfile/read/controller/ChunkLoaderTest.java | 2 +- .../read/filter/MinTimeMaxTimeFilterTest.java | 6 + .../read/query/executor/QueryExecutorTest.java | 4 +- .../tsfile/read/query/timegenerator/NodeTest.java | 100 +- .../query/timegenerator/ReaderByTimestampTest.java | 4 +- .../query/timegenerator/TimeGeneratorTest.java | 9 +- .../tsfile/read/reader/FakedBatchReader.java} | 47 +- .../iotdb/tsfile/read/reader/ReaderTest.java | 6 +- .../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 56 +- .../iotdb/tsfile/utils/TsPrimitiveTypeTest.java | 60 + .../iotdb/tsfile/write/TsFileWriterTest.java | 26 +- .../org/apache/iotdb/tsfile/write/WriteTest.java | 12 +- .../iotdb/tsfile/write/writer/PageWriterTest.java | 18 +- 550 files changed, 22049 insertions(+), 19501 deletions(-)
