This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch geely_car_0205_confignode in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 84d13845f895d2458194afc9522c79f0391a0a6f Merge: 35355c351b 8a4aec1f3a Author: Beyyes <[email protected]> AuthorDate: Fri Feb 3 02:35:03 2023 +0800 Merge branch 'geely_car' of github.com:apache/iotdb into geely_car .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 4 +- .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 8 + client-cpp/src/main/Session.cpp | 2 + client-cpp/src/main/Session.h | 10 +- client-py/iotdb/Session.py | 2 +- .../iotdb/confignode/conf/ConfigNodeConfig.java | 85 ++-- .../confignode/conf/ConfigNodeDescriptor.java | 38 +- .../confignode/conf/ConfigNodeStartupCheck.java | 9 +- .../statemachine/ConfigNodeRegionStateMachine.java | 20 +- ...eption.java => DatabaseNotExistsException.java} | 6 +- .../confignode/manager/ClusterSchemaManager.java | 129 +++--- .../iotdb/confignode/manager/ConfigManager.java | 13 +- .../iotdb/confignode/manager/load/LoadManager.java | 6 +- .../manager/load/balancer/RegionBalancer.java | 6 +- .../iotdb/confignode/manager/node/NodeManager.java | 2 +- .../manager/partition/PartitionManager.java | 62 ++- .../persistence/executor/ConfigPlanExecutor.java | 2 +- .../persistence/partition/PartitionInfo.java | 8 +- .../persistence/schema/ClusterSchemaInfo.java | 50 ++- .../procedure/env/ConfigNodeProcedureEnv.java | 11 +- .../statemachine/CreateRegionGroupsProcedure.java | 4 +- .../iotdb/confignode/service/ConfigNode.java | 4 + .../thrift/ConfigNodeRPCServiceProcessor.java | 67 ++- .../persistence/ClusterSchemaInfoTest.java | 3 +- .../org/apache/iotdb/consensus/IStateMachine.java | 39 +- .../DeserializedBatchIndexedConsensusRequest.java | 65 +++ .../iotdb/consensus/config/IoTConsensusConfig.java | 15 + .../consensus/iot/IoTConsensusServerImpl.java | 122 +++++- .../iot/client/IoTConsensusClientPool.java | 4 +- .../iot/logdispatcher/IndexController.java | 3 +- .../consensus/iot/logdispatcher/LogDispatcher.java | 4 +- .../consensus/iot/logdispatcher/SyncStatus.java | 4 +- .../service/IoTConsensusRPCServiceProcessor.java | 6 +- .../ratis/ApplicationStateMachineProxy.java | 4 +- .../iotdb/consensus/simple/SimpleServerImpl.java | 5 + .../apache/iotdb/consensus/EmptyStateMachine.java | 5 + .../iotdb/consensus/iot/util/TestStateMachine.java | 29 +- .../apache/iotdb/consensus/ratis/TestUtils.java | 13 +- .../consensus/simple/SimpleConsensusTest.java | 5 + docs/UserGuide/API/Programming-JDBC.md | 4 +- docs/UserGuide/API/Programming-Java-Native-API.md | 38 +- docs/UserGuide/Monitor-Alert/Metric-Tool.md | 265 ++++++++---- docs/UserGuide/Query-Data/Overview.md | 52 ++- .../UserGuide/QuickStart/Command-Line-Interface.md | 2 +- docs/UserGuide/QuickStart/Files.md | 2 +- docs/UserGuide/QuickStart/WayToGetIoTDB.md | 6 +- docs/UserGuide/Reference/Common-Config-Manual.md | 47 ++- docs/zh/UserGuide/API/Programming-JDBC.md | 4 +- .../UserGuide/API/Programming-Java-Native-API.md | 38 +- docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 447 ++++++++++++--------- docs/zh/UserGuide/Query-Data/Overview.md | 52 ++- .../zh/UserGuide/Reference/Common-Config-Manual.md | 81 ++-- .../main/java/org/apache/iotdb/JDBCExample.java | 2 +- .../iotdb/SyntaxConventionRelatedExample.java | 2 +- .../main/java/org/apache/iotdb/SessionExample.java | 53 ++- .../iotdb/SyntaxConventionRelatedExample.java | 2 +- integration-test/import-control.xml | 3 + .../iotdb/it/env/cluster/MppCommonConfig.java | 17 +- .../it/env/cluster/MppSharedCommonConfig.java | 19 +- .../iotdb/it/env/remote/RemoteCommonConfig.java | 9 +- .../org/apache/iotdb/itbase/env/CommonConfig.java | 6 +- .../it/cluster/IoTDBClusterNodeGetterIT.java | 3 - .../partition/IoTDBAutoRegionGroupExtensionIT.java | 78 ++-- .../IoTDBCustomRegionGroupExtensionIT.java | 4 +- .../it/partition/IoTDBPartitionCreationIT.java | 4 +- .../it/partition/IoTDBPartitionGetterIT.java | 6 +- .../confignode/it/utils/ConfigNodeTestUtils.java | 1 - .../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 10 - .../scalar/IoTDBDiffFunction2IT.java | 2 +- .../scalar/IoTDBDiffFunction3IT.java | 2 +- .../scalar/IoTDBDiffFunctionIT.java | 14 + .../iotdb/db/it/query/IoTDBNullOperandIT.java | 40 ++ .../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 20 + .../apache/iotdb/db/it/sync/SyncTransportTest.java | 4 +- .../apache/iotdb/db/it/utils/AlignedWriteUtil.java | 12 + .../org/apache/iotdb/db/it/utils/TestUtils.java | 31 ++ .../iotdb/session/it/IoTDBSessionQueryIT.java | 327 +++++++++++++++ .../iotdb/zeppelin/it/IoTDBInterpreterIT.java | 12 +- .../versionadaption/IoTDBDDLVersionAdaptionIT.java | 6 +- .../IoTDBDeletionVersionAdaptionIT.java | 18 +- .../IoTDBQueryVersionAdaptionIT.java | 8 +- .../java/org/apache/iotdb/isession/ISession.java | 25 ++ .../org/apache/iotdb/isession/SessionConfig.java | 2 +- .../apache/iotdb/isession/pool/ISessionPool.java | 27 +- .../org/apache/iotdb/isession/util/Version.java | 3 +- .../main/java/org/apache/iotdb/jdbc/Config.java | 4 +- .../main/java/org/apache/iotdb/jdbc/Constant.java | 3 +- .../resources/conf/iotdb-common.properties | 44 +- .../apache/iotdb/commons/conf/IoTDBConstant.java | 3 +- .../commons/schema/tree/AbstractTreeVisitor.java | 13 +- pom.xml | 2 +- .../iotdb/db/client/DataNodeInternalClient.java | 7 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 29 +- .../db/consensus/DataRegionConsensusImpl.java | 20 +- .../consensus/statemachine/BaseStateMachine.java | 9 +- .../statemachine/DataRegionStateMachine.java | 245 ++--------- .../IoTConsensusDataRegionStateMachine.java | 111 +++++ .../statemachine/SchemaRegionStateMachine.java | 11 +- .../iotdb/db/engine/TsFileMetricManager.java | 28 ++ .../exception/CompactionExceptionHandler.java | 11 +- .../execute/recover/CompactionRecoverTask.java | 110 ++--- .../execute/task/CrossSpaceCompactionTask.java | 33 +- .../execute/task/InnerSpaceCompactionTask.java | 19 +- .../compaction/execute/utils/CompactionUtils.java | 21 +- .../execute/utils/log/CompactionLogAnalyzer.java | 26 +- .../execute/utils/log/CompactionLogger.java | 12 + .../execute/utils/log/TsFileIdentifier.java | 6 +- .../writer/AbstractCrossCompactionWriter.java | 5 +- .../writer/AbstractInnerCompactionWriter.java | 4 +- .../db/engine/modification/ModificationFile.java | 9 + .../iotdb/db/engine/storagegroup/DataRegion.java | 28 ++ .../db/engine/storagegroup/TsFileManager.java | 4 +- .../db/engine/storagegroup/TsFileResource.java | 7 +- .../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 2 +- .../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 57 +-- .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 25 +- .../db/metadata/mtree/store/CachedMTreeStore.java | 193 ++++++--- .../iotdb/db/metadata/mtree/store/IMTreeStore.java | 2 + .../db/metadata/mtree/store/MemMTreeStore.java | 5 + .../store/ReentrantReadOnlyCachedMTreeStore.java | 130 ++++++ .../mtree/store/StampedWriterPreferredLock.java | 207 ++++++++++ .../mtree/store/disk/cache/CacheManager.java | 38 +- .../mtree/store/disk/cache/ICacheManager.java | 3 + .../mtree/store/disk/schemafile/RecordUtils.java | 23 +- .../db/metadata/mtree/traverser/Traverser.java | 34 +- .../mtree/traverser/basic/DatabaseTraverser.java | 6 +- .../mtree/traverser/basic/EntityTraverser.java | 6 +- .../mtree/traverser/basic/MNodeTraverser.java | 6 +- .../traverser/basic/MeasurementTraverser.java | 6 +- .../MeasurementCounter.java} | 34 +- .../mtree/traverser/updater/EntityUpdater.java | 6 +- .../traverser/updater/MeasurementUpdater.java | 6 +- .../metadata/rescon/SchemaStatisticsManager.java | 4 +- .../schemaregion/SchemaRegionMemoryImpl.java | 12 +- .../schemaregion/SchemaRegionSchemaFileImpl.java | 13 +- .../db/mpp/aggregation/AccumulatorFactory.java | 8 +- .../SlidingWindowAggregatorFactory.java | 4 +- .../db/mpp/common/header/ColumnHeaderConstant.java | 33 +- .../db/mpp/common/header/DatasetHeaderFactory.java | 6 +- .../schematree/visitor/SchemaTreeVisitor.java | 1 + .../operator/process/AggregationOperator.java | 6 +- .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 9 +- .../mpp/plan/analyze/ClusterPartitionFetcher.java | 76 +++- .../iotdb/db/mpp/plan/analyze/TypeProvider.java | 5 +- .../config/executor/ClusterConfigTaskExecutor.java | 3 +- .../config/metadata/SetStorageGroupTask.java | 7 + .../config/metadata/ShowStorageGroupTask.java | 42 -- .../config/metadata/ShowVariablesTask.java | 4 - .../iotdb/db/mpp/plan/parser/ASTVisitor.java | 25 +- .../db/mpp/plan/parser/StatementGenerator.java | 59 +++ .../db/mpp/plan/planner/LogicalPlanBuilder.java | 10 +- .../distribution/DistributionPlanContext.java | 14 + .../plan/planner/distribution/SourceRewriter.java | 54 ++- .../plan/parameter/AggregationDescriptor.java | 7 +- .../planner/plan/parameter/AggregationType.java | 113 ------ .../statement/component/GroupByTimeComponent.java | 2 +- .../plan/statement/component/WhereCondition.java | 6 +- .../metadata/SetStorageGroupStatement.java | 72 ++-- .../metadata/ShowStorageGroupStatement.java | 66 +++ .../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 4 +- .../java/org/apache/iotdb/db/service/DataNode.java | 1 + .../iotdb/db/service/metrics/FileMetrics.java | 18 + .../service/thrift/impl/ClientRPCServiceImpl.java | 75 ++++ .../impl/DataNodeInternalRPCServiceImpl.java | 5 +- .../org/apache/iotdb/db/utils/SchemaUtils.java | 12 +- .../apache/iotdb/db/utils/TypeInferenceUtils.java | 8 + .../FastCrossCompactionPerformerTest.java | 6 +- .../ReadPointCompactionPerformerTest.java | 13 +- .../cross/CrossSpaceCompactionExceptionTest.java | 200 +++++++++ .../RewriteCrossSpaceCompactionRecoverTest.java | 266 ++++++++++++ .../inner/InnerSpaceCompactionExceptionTest.java | 178 ++++++++ .../SizeTieredCompactionRecoverTest.java | 235 +++++++++++ .../mtree/lock/StampedWriterPreferredLockTest.java | 212 ++++++++++ .../metadata/mtree/schemafile/RecordUtilTests.java | 10 +- .../metadata/mtree/schemafile/SchemaFileTest.java | 2 +- .../iotdb/db/mpp/aggregation/AccumulatorTest.java | 22 +- .../operator/AggregationOperatorTest.java | 48 +-- .../AlignedSeriesAggregationScanOperatorTest.java | 98 ++--- .../mpp/execution/operator/OperatorMemoryTest.java | 36 +- .../operator/RawDataAggregationOperatorTest.java | 126 +++--- .../SeriesAggregationScanOperatorTest.java | 98 ++--- .../SlidingWindowAggregationOperatorTest.java | 36 +- .../operator/VerticallyConcatOperatorTest.java | 6 +- .../plan/analyze/AggregationDescriptorTest.java | 22 +- .../iotdb/db/mpp/plan/analyze/AnalyzeTest.java | 6 +- .../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java | 4 +- .../db/mpp/plan/plan/QueryLogicalPlanUtil.java | 92 ++--- .../distribution/AggregationDistributionTest.java | 58 +-- .../node/process/AggregationNodeSerdeTest.java | 118 +++--- .../node/process/GroupByLevelNodeSerdeTest.java | 8 +- .../plan/node/process/GroupByTagNodeSerdeTest.java | 10 +- .../source/SeriesAggregationScanNodeSerdeTest.java | 4 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + .../java/org/apache/iotdb/session/Session.java | 104 +++++ .../apache/iotdb/session/SessionConnection.java | 92 +++++ .../org/apache/iotdb/session/pool/SessionPool.java | 110 +++++ .../apache/iotdb/session/pool/SessionPoolTest.java | 4 +- thrift-commons/src/main/thrift/common.thrift | 13 + .../src/main/thrift/confignode.thrift | 19 +- thrift/src/main/thrift/client.thrift | 25 +- 200 files changed, 5396 insertions(+), 1967 deletions(-)
