This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch xianyi in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 30ac72e0368107a57a8bc0fc0446182febe53962 Merge: 1aebcaa a3cd374 Author: Steve Yurong Su <[email protected]> AuthorDate: Thu Nov 25 16:12:01 2021 +0800 merge master .../java/org/apache/iotdb/cli/AbstractCli.java | 2 +- .../main/java/org/apache/iotdb/tool/ExportCsv.java | 4 +- .../main/java/org/apache/iotdb/tool/ImportCsv.java | 10 +- client-py/SessionExample.py | 4 +- client-py/iotdb/utils/BitMap.py | 3 +- client-py/iotdb/utils/IoTDBConstants.py | 1 + client-py/iotdb/utils/IoTDBRpcDataSet.py | 138 +++++- client-py/iotdb/utils/SessionDataSet.py | 26 +- client-py/iotdb/utils/Tablet.py | 10 +- client-py/tests/tablet_performance_comparison.py | 129 ++++-- client-py/tests/test_dataframe.py | 29 +- client-py/tests/test_todf.py | 216 ++++++++++ .../org/apache/iotdb/cluster/ClusterIoTDB.java | 4 + .../log/snapshot/PullSnapshotTaskDescriptor.java | 2 +- .../apache/iotdb/cluster/metadata/CMManager.java | 8 +- .../cluster/partition/NodeAdditionResult.java | 4 +- .../iotdb/cluster/partition/NodeRemovalResult.java | 4 +- .../iotdb/cluster/partition/PartitionGroup.java | 33 +- .../iotdb/cluster/partition/PartitionTable.java | 6 +- .../partition/balancer/DefaultSlotBalancer.java | 6 +- .../cluster/partition/balancer/SlotBalancer.java | 4 +- .../iotdb/cluster/partition/slot/SlotManager.java | 2 +- .../partition/slot/SlotNodeAdditionResult.java | 2 +- .../cluster/partition/slot/SlotPartitionTable.java | 48 ++- .../iotdb/cluster/partition/slot/SlotStrategy.java | 2 +- .../partition/slot/SlotTimePartitionFilter.java | 3 +- .../cluster/query/ClusterDataQueryExecutor.java | 2 +- .../iotdb/cluster/query/ClusterPlanExecutor.java | 6 +- .../cluster/query/aggregate/ClusterAggregator.java | 3 +- .../cluster/query/fill/ClusterPreviousFill.java | 2 +- .../query/last/ClusterLastQueryExecutor.java | 2 +- .../manage/ClusterSessionManager.java} | 101 ++--- .../cluster/query/reader/ClusterReaderFactory.java | 13 +- ....java => AssignPathAscPriorityMergeReader.java} | 37 +- .../mult/AssignPathDescPriorityMergeReader.java} | 33 +- .../reader/mult/AssignPathManagedMergeReader.java | 43 +- .../mult/IAssignPathPriorityMergeReader.java | 47 ++ .../cluster/query/reader/mult/MultElement.java | 49 +++ .../iotdb/cluster/server/ClusterTSServiceImpl.java | 79 +--- .../cluster/server/PullSnapshotHintService.java | 2 +- .../iotdb/cluster/server/StoppedMemberManager.java | 2 +- .../cluster/server/member/DataGroupMember.java | 7 +- .../cluster/server/member/MetaGroupMember.java | 4 +- .../iotdb/cluster/server/member/RaftMember.java | 2 +- .../cluster/server/service/DataGroupEngine.java | 4 +- .../cluster/utils/nodetool/ClusterMonitor.java | 2 +- .../cluster/utils/nodetool/function/Slot.java | 2 +- .../cluster/partition/SlotPartitionTableTest.java | 2 +- .../mult/AssignPathManagedMergeReaderTest.java | 3 +- .../server/heartbeat/MetaHeartbeatThreadTest.java | 2 +- .../iotdb/cluster/server/member/BaseMember.java | 4 +- .../cluster/server/member/DataGroupMemberTest.java | 13 +- .../cluster/server/member/RaftMemberTest.java | 4 +- docs/UserGuide/API/Programming-Java-Native-API.md | 38 +- .../IoTDB-SQL-Language/Maintenance-Command.md | 4 + .../UserGuide/API/Programming-Java-Native-API.md | 23 +- .../IoTDB-SQL-Language/Maintenance-Command.md | 3 + .../java/org/apache/iotdb/flink/TsFileUtils.java | 4 +- .../main/java/org/apache/iotdb/SessionExample.java | 44 +- .../java/org/apache/iotdb/tsfile/TsFileRead.java | 8 +- .../apache/iotdb/tsfile/TsFileSequenceRead.java | 2 +- .../apache/iotdb/tsfile/TsFileWriteWithTablet.java | 2 +- .../iotdb/flink/tsfile/TsFileInputFormat.java | 6 +- .../tsfile/RowTsFileOutputFormatTestBase.java | 4 +- .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 2 +- .../iotdb/hadoop/tsfile/TSFRecordReader.java | 4 +- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 2 +- .../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 58 +-- .../dropwizard/DropwizardMetricManager.java | 134 +++--- .../dropwizard/type/DropwizardHistogram.java | 5 - .../dropwizard/DropwizardMetricManagerTest.java | 15 +- .../org/apache/iotdb/metrics/MetricManager.java | 6 +- .../iotdb/metrics/impl/DoNothingHistogram.java | 4 - .../org/apache/iotdb/metrics/type/Histogram.java | 3 - .../micrometer/MicrometerMetricManager.java | 162 ++++--- .../micrometer/type/MicrometerHistogram.java | 5 - .../micrometer/MicrometerMetricManagerTest.java | 52 +++ .../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 2 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 8 +- .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 8 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 4 +- .../iotdb/db/engine/cache/AccountableString.java | 64 --- .../db/engine/compaction/TsFileIdentifier.java | 2 +- .../compaction/cross/CrossCompactionStrategy.java | 2 +- .../compaction/inner/InnerCompactionStrategy.java | 2 +- .../iotdb/db/engine/flush/MemTableFlushTask.java | 5 +- .../iotdb/db/engine/flush/NotifyFlushMemTable.java | 12 - .../iotdb/db/engine/memtable/AbstractMemTable.java | 245 +++++------ .../engine/memtable/AlignedWritableMemChunk.java | 123 ++++-- .../memtable/AlignedWritableMemChunkGroup.java | 81 ++++ .../apache/iotdb/db/engine/memtable/IMemTable.java | 9 +- .../db/engine/memtable/IWritableMemChunk.java | 11 +- .../db/engine/memtable/IWritableMemChunkGroup.java | 42 +- .../db/engine/memtable/PrimitiveMemTable.java | 17 +- .../iotdb/db/engine/memtable/WritableMemChunk.java | 18 +- .../db/engine/memtable/WritableMemChunkGroup.java | 112 +++++ .../querycontext/AlignedReadOnlyMemChunk.java | 4 +- .../engine/storagegroup/StorageGroupProcessor.java | 15 +- .../db/engine/storagegroup/TsFileProcessor.java | 29 +- .../metadata/TemplateImcompatibeException.java | 28 +- .../org/apache/iotdb/db/metadata/MManager.java | 71 ++- .../iotdb/db/metadata/logfile/MLogWriter.java | 2 +- .../iotdb/db/metadata/mnode/EntityMNode.java | 12 - .../org/apache/iotdb/db/metadata/mnode/IMNode.java | 2 + .../iotdb/db/metadata/mnode/InternalMNode.java | 12 + .../iotdb/db/metadata/mnode/MeasurementMNode.java | 3 + .../org/apache/iotdb/db/metadata/mtree/MTree.java | 259 ++++++++--- .../db/metadata/mtree/traverser/Traverser.java | 115 +++-- .../traverser/collector/MeasurementCollector.java | 29 ++ .../apache/iotdb/db/metadata/path/AlignedPath.java | 33 +- .../iotdb/db/metadata/path/MeasurementPath.java | 9 +- .../apache/iotdb/db/metadata/path/PartialPath.java | 4 +- .../iotdb/db/metadata/template/Template.java | 113 ++--- .../db/metadata/template/TemplateManager.java | 2 +- .../apache/iotdb/db/metadata/utils/MetaUtils.java | 2 +- .../iotdb/db/metrics/server/ServerArgument.java | 6 +- .../org/apache/iotdb/db/mqtt/PublishHandler.java | 84 ++-- .../iotdb/db/qp/logical/crud/InOperator.java | 2 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 22 +- .../iotdb/db/qp/physical/crud/DeletePlan.java | 2 +- .../db/qp/physical/crud/InsertMultiTabletPlan.java | 2 +- .../iotdb/db/qp/physical/crud/InsertPlan.java | 26 +- .../iotdb/db/qp/physical/crud/InsertRowPlan.java | 2 +- .../physical/crud/InsertRowsOfOneDevicePlan.java | 2 +- .../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 2 +- .../db/qp/physical/crud/InsertTabletPlan.java | 2 +- .../iotdb/db/qp/physical/crud/SelectIntoPlan.java | 2 +- .../db/qp/physical/sys/ActivateTemplatePlan.java | 2 +- .../db/qp/physical/sys/AppendTemplatePlan.java | 2 +- .../iotdb/db/qp/physical/sys/AuthorPlan.java | 2 +- .../qp/physical/sys/AutoCreateDeviceMNodePlan.java | 2 +- .../iotdb/db/qp/physical/sys/ChangeAliasPlan.java | 2 +- .../db/qp/physical/sys/ChangeTagOffsetPlan.java | 2 +- .../iotdb/db/qp/physical/sys/ClearCachePlan.java | 2 +- .../physical/sys/CreateAlignedTimeSeriesPlan.java | 2 +- .../qp/physical/sys/CreateContinuousQueryPlan.java | 2 +- .../iotdb/db/qp/physical/sys/CreateIndexPlan.java | 2 +- .../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 2 +- .../db/qp/physical/sys/CreateSnapshotPlan.java | 2 +- .../db/qp/physical/sys/CreateTemplatePlan.java | 4 +- .../db/qp/physical/sys/CreateTimeSeriesPlan.java | 2 +- .../db/qp/physical/sys/CreateTriggerPlan.java | 2 +- .../iotdb/db/qp/physical/sys/DataAuthPlan.java | 2 +- .../db/qp/physical/sys/DeleteStorageGroupPlan.java | 2 +- .../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 2 +- .../qp/physical/sys/DropContinuousQueryPlan.java | 2 +- .../iotdb/db/qp/physical/sys/DropIndexPlan.java | 2 +- .../iotdb/db/qp/physical/sys/DropTriggerPlan.java | 2 +- .../apache/iotdb/db/qp/physical/sys/FlushPlan.java | 2 +- .../apache/iotdb/db/qp/physical/sys/MNodePlan.java | 2 +- .../db/qp/physical/sys/MeasurementMNodePlan.java | 2 +- .../apache/iotdb/db/qp/physical/sys/MergePlan.java | 2 +- .../db/qp/physical/sys/PruneTemplatePlan.java | 2 +- .../db/qp/physical/sys/SetStorageGroupPlan.java | 2 +- .../db/qp/physical/sys/SetSystemModePlan.java | 2 +- .../iotdb/db/qp/physical/sys/SetTTLPlan.java | 2 +- .../iotdb/db/qp/physical/sys/SetTemplatePlan.java | 2 +- .../iotdb/db/qp/physical/sys/StartTriggerPlan.java | 2 +- .../iotdb/db/qp/physical/sys/StopTriggerPlan.java | 2 +- .../db/qp/physical/sys/StorageGroupMNodePlan.java | 2 +- .../db/qp/physical/sys/UnsetTemplatePlan.java | 2 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 8 +- .../apache/iotdb/db/qp/utils/DatetimeUtils.java | 12 +- .../db/query/aggregation/impl/CountAggrResult.java | 1 + .../iotdb/db/query/control/SessionManager.java | 2 +- .../db/query/control/SessionTimeoutManager.java | 17 +- .../db/query/executor/AggregationExecutor.java | 34 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 6 +- .../db/query/executor/fill/LastPointReader.java | 1 + .../query/reader/chunk/MemAlignedChunkLoader.java | 34 +- .../query/reader/chunk/MemAlignedChunkReader.java | 110 +++++ .../query/reader/chunk/MemAlignedPageReader.java | 109 +++++ ...ader.java => AlignedSeriesAggregateReader.java} | 36 +- .../iotdb/db/query/reader/series/SeriesReader.java | 49 ++- .../reader/series/SeriesReaderByTimestamp.java | 5 +- .../iotdb/db/query/udf/builtin/UDTFCast.java | 2 +- .../iotdb/db/rest/filter/AuthorizationFilter.java | 2 +- .../db/rest/handler/AuthorizationHandler.java | 20 +- .../iotdb/db/rest/impl/RestApiServiceImpl.java | 59 +-- .../org/apache/iotdb/db/service/TSServiceImpl.java | 42 +- .../db/service/basic/BasicServiceProvider.java | 21 +- .../apache/iotdb/db/tools/IoTDBDataDirViewer.java | 4 +- .../db/tools/settle/TsFileAndModSettleTool.java | 2 +- .../iotdb/db/tools/vis/TsFileExtractVisdata.java | 2 +- .../db/tools/watermark/WatermarkDetector.java | 4 +- .../java/org/apache/iotdb/db/utils/MemUtils.java | 31 +- .../db/writelog/node/ExclusiveWriteLogNode.java | 2 - .../iotdb/db/writelog/recover/LogReplayer.java | 25 +- .../org/apache/iotdb/db/constant/TestConstant.java | 3 + .../engine/compaction/cross/MergeOverLapTest.java | 2 + .../inner/InnerSpaceCompactionUtilsTest.java | 4 +- .../db/engine/memtable/MemTableTestUtils.java | 6 +- .../db/engine/memtable/MemtableBenchmark.java | 7 +- .../db/engine/memtable/PrimitiveMemTableTest.java | 58 ++- .../apache/iotdb/db/integration/IoTDBLastIT.java | 9 +- ... => IoTDBAggregationWithoutValueFilter2IT.java} | 13 +- .../IoTDBAggregationWithoutValueFilterIT.java | 444 +++++++++++++++++++ ...regationWithoutValueFilterWithDeletion2IT.java} | 16 +- ...ggregationWithoutValueFilterWithDeletionIT.java | 447 +++++++++++++++++++ ...tValueFilter2IT.java => IoTDBLastQuery2IT.java} | 11 +- .../db/integration/aligned/IoTDBLastQueryIT.java | 374 ++++++++++++++++ ...2IT.java => IoTDBLastQueryWithDeletion2IT.java} | 14 +- .../aligned/IoTDBLastQueryWithDeletionIT.java | 380 ++++++++++++++++ ...java => IoTDBLastQueryWithoutLastCache2IT.java} | 14 +- .../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 379 ++++++++++++++++ ...BLastQueryWithoutLastCacheWithDeletion2IT.java} | 21 +- ...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 384 +++++++++++++++++ ...T.java => IoTDBRawQueryWithValueFilter2IT.java} | 11 +- ...IT.java => IoTDBRawQueryWithValueFilterIT.java} | 398 +++++++++++------ ...TDBRawQueryWithValueFilterWithDeletion2IT.java} | 13 +- ...oTDBRawQueryWithValueFilterWithDeletionIT.java} | 385 ++++++++++++----- .../IoTDBRawQueryWithoutValueFilter2IT.java | 8 +- .../aligned/IoTDBRawQueryWithoutValueFilterIT.java | 8 +- ...BRawQueryWithoutValueFilterWithDeletion2IT.java | 8 +- ...DBRawQueryWithoutValueFilterWithDeletionIT.java | 8 +- .../iotdb/db/metadata/MManagerBasicTest.java | 222 ++++++++-- .../org/apache/iotdb/db/metadata/TemplateTest.java | 4 +- .../apache/iotdb/db/mqtt/PublishHandlerTest.java | 75 +++- .../iotdb/db/qp/physical/InsertRowPlanTest.java | 77 +++- .../iotdb/db/qp/physical/InsertTabletPlanTest.java | 137 ++++++ .../iotdb/db/qp/physical/PhysicalPlanTest.java | 61 +-- .../org/apache/iotdb/db/utils/MemUtilsTest.java | 10 +- .../iotdb/db/utils/TsFileRewriteToolTest.java | 6 +- .../db/writelog/recover/SeqTsFileRecoverTest.java | 18 +- .../main/java/org/apache/iotdb/rpc/RpcUtils.java | 4 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + .../java/org/apache/iotdb/session/Session.java | 96 +---- .../org/apache/iotdb/session/pool/SessionPool.java | 51 --- .../apache/iotdb/session/template/Template.java | 2 +- .../session/IoTDBSessionDisableMemControlIT.java | 205 +++++++++ .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 268 ++++++++++++ .../session/IoTDBSessionVectorABDeviceIT.java | 3 + .../iotdb/session/IoTDBSessionVectorInsertIT.java | 75 ++++ .../java/org/apache/iotdb/session/SessionTest.java | 93 ++-- .../apache/iotdb/session/template/TemplateUT.java | 56 ++- site/pom.xml | 2 +- .../org/apache/iotdb/spark/tsfile/qp/Executor.java | 4 +- .../apache/iotdb/spark/tsfile/DefaultSource.scala | 6 +- thrift/src/main/thrift/rpc.thrift | 7 +- .../tsfile/file/metadata/AlignedChunkMetadata.java | 4 + .../file/metadata/AlignedTimeSeriesMetadata.java | 4 + .../iotdb/tsfile/file/metadata/ChunkMetadata.java | 14 +- .../tsfile/file/metadata/TimeseriesMetadata.java | 13 +- .../{ReadOnlyTsFile.java => TsFileReader.java} | 4 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 190 ++++++-- .../apache/iotdb/tsfile/read/common/BatchData.java | 16 + .../org/apache/iotdb/tsfile/read/common/Chunk.java | 13 +- .../org/apache/iotdb/tsfile/read/common/Field.java | 26 ++ .../org/apache/iotdb/tsfile/read/common/Path.java | 2 +- .../read/controller/MetadataQuerierByFileImpl.java | 87 ++-- .../iotdb/tsfile/read/filter/TimeFilter.java | 11 + .../iotdb/tsfile/read/filter/operator/Like.java | 6 +- .../query/dataset/DataSetWithTimeGenerator.java | 15 +- .../query/dataset/DataSetWithoutTimeGenerator.java | 24 +- .../reader/IAlignedPageReader.java} | 10 +- .../read/reader/chunk/AlignedChunkReader.java | 6 +- .../chunk/AlignedChunkReaderByTimestamp.java | 47 ++ .../tsfile/read/reader/page/AlignedPageReader.java | 9 +- .../reader/series/AbstractFileSeriesReader.java | 4 +- .../read/reader/series/FileSeriesReader.java | 18 +- .../reader/series/FileSeriesReaderByTimestamp.java | 28 +- .../apache/iotdb/tsfile/utils/FilePathUtils.java | 2 +- .../tsfile/v2/read/TsFileSequenceReaderForV2.java | 21 +- .../apache/iotdb/tsfile/write/TsFileWriter.java | 84 +++- .../write/chunk/AlignedChunkGroupWriterImpl.java | 44 +- .../tsfile/write/chunk/AlignedChunkWriterImpl.java | 28 ++ .../chunk/NonAlignedChunkGroupWriterImpl.java | 40 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 16 +- .../iotdb/tsfile/read/ReadInPartitionTest.java | 4 +- .../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 241 ----------- .../org/apache/iotdb/tsfile/read/ReadTest.java | 4 +- .../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 4 +- .../apache/iotdb/tsfile/read/TsFileReaderTest.java | 477 +++++++++++++++++++++ .../tsfile/read/TsFileSequenceReaderTest.java | 4 +- .../read/query/timegenerator/ReadWriteTest.java | 6 +- .../timegenerator/TimeGeneratorReadEmptyTest.java | 6 +- .../timegenerator/TimeGeneratorReadWriteTest.java | 6 +- .../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 122 ++++++ .../tsfile/write/DefaultSchemaTemplateTest.java | 4 +- ...SameMeasurementsWithDifferentDataTypesTest.java | 6 +- .../iotdb/tsfile/write/TsFileReadWriteTest.java | 6 +- .../iotdb/tsfile/write/TsFileWriteApiTest.java | 266 +++++++----- .../iotdb/tsfile/write/TsFileWriterTest.java | 14 +- .../write/writer/ForceAppendTsFileWriterTest.java | 8 +- .../write/writer/RestorableTsFileIOWriterTest.java | 15 +- .../zeppelin/iotdb/IoTDBInterpreterTest.java | 3 +- 286 files changed, 8280 insertions(+), 2745 deletions(-) diff --cc example/session/src/main/java/org/apache/iotdb/SessionExample.java index a8e94ea,1f1c164..f3fc703 --- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java +++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java @@@ -21,7 -21,12 +21,9 @@@ package org.apache.iotdb import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; -import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.session.Session; -import org.apache.iotdb.session.SessionDataSet; -import org.apache.iotdb.session.SessionDataSet.DataIterator; + import org.apache.iotdb.session.template.MeasurementNode; + import org.apache.iotdb.session.template.Template; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
