This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch metric in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 999c7312054e813fd6babbd7562797b75a2119ac Merge: b85e02a323a ef6dc0a8e14 Author: HTHou <[email protected]> AuthorDate: Sun Dec 17 22:42:19 2023 +0800 Merge branch 'master' of github.com:apache/iotdb into metric .../iotdb/it/env/cluster/ClusterConstant.java | 5 - .../it/env/cluster/config/MppDataNodeConfig.java | 6 + .../iotdb/it/env/cluster/node/DataNodeWrapper.java | 9 - .../it/env/remote/config/RemoteDataNodeConfig.java | 5 + .../apache/iotdb/itbase/env/DataNodeConfig.java | 2 + .../it/cluster/IoTDBClusterRestartIT.java | 17 +- .../confignode/it/cluster/IoTDBClusterStartIT.java | 93 +++++++++++ .../apache/iotdb/db/it/GrafanaApiServiceIT.java | 5 +- .../org/apache/iotdb/db/it/IoTDBRestServiceIT.java | 36 +++- .../iotdb/db/it/auth/IoTDBSeriesPermissionIT.java | 4 +- .../apache/iotdb/db/it/query/IoTDBResultSetIT.java | 7 +- .../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 85 ++++++++-- .../apache/iotdb/pipe/it/IoTDBPipeExtractorIT.java | 22 +-- .../iotdb/zeppelin/it/IoTDBInterpreterIT.java | 10 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + .../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 + .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 13 +- .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 + .../consensus/request/ConfigPhysicalPlan.java | 8 + .../consensus/request/ConfigPhysicalPlanType.java | 5 +- .../write/confignode/UpdateClusterIdPlan.java | 76 +++++++++ .../request/write/pipe/PipeEnrichedPlan.java | 79 +++++++++ .../statemachine/ConfigRegionStateMachine.java | 6 +- .../iotdb/confignode/manager/ClusterManager.java | 67 ++++++++ .../iotdb/confignode/manager/ConfigManager.java | 21 ++- .../apache/iotdb/confignode/manager/IManager.java | 10 ++ .../iotdb/confignode/manager/ProcedureManager.java | 17 +- .../manager/pipe/task/PipeTaskCoordinator.java | 10 +- .../iotdb/confignode/persistence/ClusterInfo.java | 109 ++++++++++++ .../persistence/executor/ConfigPlanExecutor.java | 13 ++ .../confignode/persistence/pipe/PipeTaskInfo.java | 52 +++--- .../impl/pipe/AbstractOperatePipeProcedureV2.java | 18 +- .../runtime/PipeHandleLeaderChangeProcedure.java | 3 +- .../runtime/PipeHandleMetaChangeProcedure.java | 3 +- .../impl/pipe/runtime/PipeMetaSyncProcedure.java | 3 +- .../impl/pipe/task/CreatePipeProcedureV2.java | 4 +- .../impl/pipe/task/DropPipeProcedureV2.java | 4 +- .../impl/pipe/task/StartPipeProcedureV2.java | 24 +-- .../impl/pipe/task/StopPipeProcedureV2.java | 24 +-- .../confignode/service/ConfigNodeShutdownHook.java | 2 + .../thrift/ConfigNodeRPCServiceProcessor.java | 45 +++-- .../request/ConfigPhysicalPlanSerDeTest.java | 12 ++ .../confignode/persistence/ClusterInfoTest.java | 67 ++++++++ .../consensus/iot/client/DispatchLogHandler.java | 3 +- .../iotdb/consensus/ratis/DiskGuardianTest.java | 3 +- .../iotdb/consensus/ratis/RatisConsensusTest.java | 25 +-- .../iotdb/consensus/ratis/RecoverReadTest.java | 4 +- .../apache/iotdb/consensus/ratis/TestUtils.java | 25 ++- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +- .../pipe/receiver/PipePlanToStatementVisitor.java | 186 +++++++++++++++++++++ .../iotdb/db/protocol/client/ConfigNodeClient.java | 37 ++-- .../common/header/ColumnHeaderConstant.java | 16 +- .../common/header/DatasetHeaderFactory.java | 4 + .../operator/schema/source/DeviceSchemaSource.java | 15 ++ .../queryengine/plan/analyze/AnalyzeVisitor.java | 2 +- .../plan/execution/config/ConfigTaskVisitor.java | 8 + .../config/executor/ClusterConfigTaskExecutor.java | 101 ++++++++++- .../config/executor/IConfigTaskExecutor.java | 10 ++ .../config/metadata/ShowClusterIdTask.java | 65 +++++++ .../db/queryengine/plan/parser/ASTVisitor.java | 20 ++- .../plan/planner/LogicalPlanVisitor.java | 4 +- .../plan/statement/StatementVisitor.java | 5 + .../statement/metadata/ShowClusterIdStatement.java | 18 +- .../metadata/view/CreateLogicalViewStatement.java | 10 +- .../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 3 +- .../mtree/impl/pbtree/MTreeBelowSGCachedImpl.java | 3 +- .../read/resp/info/IDeviceSchemaInfo.java | 2 + .../read/resp/info/impl/ShowDevicesResult.java | 11 ++ .../utils/filter/DeviceFilterVisitor.java | 26 +++ .../apache/iotdb/db/service/IoTDBShutdownHook.java | 3 +- .../db/storageengine/dataregion/DataRegion.java | 178 ++++++++++---------- .../dataregion/HashLastFlushTimeMap.java | 115 ++++--------- .../dataregion/ILastFlushTimeMap.java | 31 ++-- .../dataregion/snapshot/SnapshotTaker.java | 14 +- .../schemaRegion/SchemaRegionBasicTest.java | 42 ++--- .../db/protocol/rest/IoTDBRestServiceTest.java | 15 ++ .../schema/SchemaQueryScanOperatorTest.java | 6 +- .../storageengine/dataregion/DataRegionTest.java | 48 +++--- .../resources/conf/iotdb-common.properties | 8 +- .../apache/iotdb/commons/conf/IoTDBConstant.java | 1 + .../iotdb/commons/schema/filter/SchemaFilter.java | 3 + .../commons/schema/filter/SchemaFilterFactory.java | 5 + .../commons/schema/filter/SchemaFilterType.java | 3 + .../commons/schema/filter/SchemaFilterVisitor.java | 5 + .../commons/schema/filter/impl/TemplateFilter.java | 73 ++++++++ .../commons/utils/ThriftConfigNodeSerDeUtils.java | 3 + .../src/main/thrift/confignode.thrift | 44 +++-- 88 files changed, 1718 insertions(+), 513 deletions(-)
