This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/fix_procedure_bug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit db2729d1190310f9a3b516c60b577f02bf9ff8f0 Merge: afe82dfe06 0f0816ec20 Author: Beyyes <[email protected]> AuthorDate: Wed Sep 7 16:03:05 2022 +0800 Merge branch 'master' into beyyes/fix_procedure_bug .../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 - .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +- .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 - .../resources/conf/iotdb-confignode.properties | 6 +- .../confignode/client/DataNodeRequestType.java | 4 +- .../sync/datanode/SyncDataNodeClientPool.java | 14 +- .../iotdb/confignode/conf/ConfigNodeConfig.java | 2 +- .../confignode/conf/ConfigNodeDescriptor.java | 4 +- .../confignode/conf/ConfigNodeStartupCheck.java | 7 + .../manager/load/balancer/RouteBalancer.java | 5 +- .../procedure/env/DataNodeRemoveHandler.java | 144 +++++++++++--------- .../procedure/impl/RegionMigrateProcedure.java | 25 ++-- .../procedure/state/RegionTransitionState.java | 4 +- .../service/thrift/ConfigNodeRPCService.java | 6 +- .../thrift/ConfigNodeRPCServiceProcessor.java | 7 + .../apache/iotdb/consensus/config/RatisConfig.java | 59 +++++++- .../multileader/service/MultiLeaderRPCService.java | 4 +- .../iotdb/consensus/ratis/RatisConsensus.java | 53 +++++++- docs/Download/README.md | 28 ++-- docs/UserGuide/API/Status-Codes.md | 3 +- .../Maintenance-Tools/Maintenance-Command.md | 6 +- docs/UserGuide/Query-Data/Last-Query.md | 18 ++- docs/zh/Download/README.md | 28 ++-- docs/zh/UserGuide/API/Status-Codes.md | 3 +- .../{Flink TsFile.md => Flink-TsFile.md} | 0 .../{Grafana Plugin.md => Grafana-Plugin.md} | 0 .../{Spark TsFile.md => Spark-TsFile.md} | 0 .../Maintenance-Tools/Maintenance-Command.md | 6 +- docs/zh/UserGuide/Query-Data/Last-Query.md | 18 ++- .../java/org/apache/iotdb/db/it/IoTDBFilterIT.java | 119 ++++++++++++++++ .../org/apache/iotdb/db/it/IoTDBNestedQueryIT.java | 2 +- .../{IoTDBPipeSinkIT.java => IoTDBPipeIT.java} | 82 ++++++++---- .../apache/iotdb/db/it/sync/IoTDBPipeSinkIT.java | 4 +- .../db/integration/sync/IoTDBSyncSenderIT.java | 1 + .../iotdb/commons/client/ClientPoolFactory.java | 6 +- .../sync/SyncThriftClientWithErrorHandler.java | 6 +- .../apache/iotdb/commons/cluster/NodeStatus.java | 8 +- .../iotdb/commons/concurrent/ThreadName.java | 62 +++------ .../apache/iotdb/commons/conf/CommonConfig.java | 10 +- .../commons/enums/HandleSystemErrorStrategy.java | 17 +-- .../commons/exception/ConfigurationException.java | 23 +++- .../org/apache/iotdb/commons/path/PartialPath.java | 64 ++++++++- .../apache/iotdb/commons/sync/SyncConstant.java | 4 +- .../apache/iotdb/commons/utils/NodeUrlUtils.java | 7 + .../client/mock/MockInternalRPCService.java | 4 +- .../apache/iotdb/commons/path/PartialPathTest.java | 23 +++- .../resources/conf/iotdb-datanode.properties | 13 +- .../org/apache/iotdb/db/auth/AuthorityChecker.java | 6 +- .../apache/iotdb/db/client/ConfigNodeClient.java | 17 +++ .../iotdb/db/client/DataNodeClientPoolFactory.java | 4 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +- .../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 1 + .../apache/iotdb/db/engine/StorageEngineV2.java | 6 + .../iotdb/db/engine/snapshot/SnapshotLoader.java | 8 ++ .../iotdb/db/engine/storagegroup/DataRegion.java | 23 ++-- .../db/engine/storagegroup/TsFileManager.java | 14 +- .../db/engine/storagegroup/TsFileProcessor.java | 29 ++-- .../dataregion/StorageGroupManager.java | 10 -- .../iotdb/db/localconfignode/LocalConfigNode.java | 65 ++++++--- .../iotdb/db/metadata/logfile/MLogWriter.java | 3 +- .../schemaregion/SchemaRegionMemoryImpl.java | 11 -- .../schemaregion/SchemaRegionSchemaFileImpl.java | 11 -- .../db/mpp/common/header/ColumnHeaderConstant.java | 17 +++ .../db/mpp/common/header/DatasetHeaderFactory.java | 4 + .../execution/exchange/MPPDataExchangeManager.java | 1 + .../execution/exchange/MPPDataExchangeService.java | 6 +- .../db/mpp/execution/exchange/SinkHandle.java | 3 +- .../db/mpp/execution/exchange/SourceHandle.java | 7 +- .../iotdb/db/mpp/plan/constant/StatementType.java | 2 +- .../plan/execution/config/ConfigTaskVisitor.java | 15 ++- .../config/executor/ClusterConfigTaskExecutor.java | 39 +++++- .../config/executor/IConfigTaskExecutor.java | 17 ++- .../executor/StandaloneConfigTaskExecutor.java | 90 ++++++++----- .../DropTriggerTask.java} | 15 +-- .../execution/config/sys/sync/CreatePipeTask.java | 4 +- .../execution/config/sys/sync/DropPipeTask.java | 4 +- .../execution/config/sys/sync/ShowPipeTask.java | 41 +++++- .../execution/config/sys/sync/StartPipeTask.java | 4 +- .../execution/config/sys/sync/StopPipeTask.java | 4 +- .../iotdb/db/mpp/plan/parser/ASTVisitor.java | 10 +- .../db/mpp/plan/statement/StatementVisitor.java | 5 + .../statement/metadata/CreateTriggerStatement.java | 9 ++ .../DropTriggerStatement.java} | 57 ++------ .../statement/sys/sync/CreatePipeStatement.java | 38 ++++++ .../binary/CompareBinaryColumnTransformer.java | 12 +- .../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 36 +++-- .../iotdb/db/protocol/mqtt/PublishHandler.java | 39 +++--- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 2 - .../iotdb/db/query/control/SessionManager.java | 16 ++- .../java/org/apache/iotdb/db/service/DataNode.java | 8 +- .../db/service/DataNodeInternalRPCService.java | 6 +- .../iotdb/db/service/InfluxDBRPCService.java | 4 +- .../org/apache/iotdb/db/service/RPCService.java | 8 +- .../iotdb/db/service/RegionMigrateService.java | 58 ++++---- .../impl/DataNodeInternalRPCServiceImpl.java | 61 +++++---- .../java/org/apache/iotdb/db/sync/SyncService.java | 95 +++++++++++++ .../iotdb/db/sync/common/ISyncInfoFetcher.java | 5 +- .../iotdb/db/sync/common/LocalSyncInfoFetcher.java | 19 ++- .../org/apache/iotdb/db/sync/common/SyncInfo.java | 35 ++++- .../db/sync/common/persistence/SyncLogReader.java | 8 +- .../db/sync/common/persistence/SyncLogWriter.java | 17 ++- .../iotdb/db/sync/receiver/load/TsFileLoader.java | 54 ++++---- .../iotdb/db/sync/sender/manager/ISyncManager.java | 38 +++--- .../db/sync/sender/manager/LocalSyncManager.java | 90 +++++++++++++ .../db/sync/sender/manager/SchemaSyncManager.java | 149 --------------------- .../db/sync/sender/manager/TsFileSyncManager.java | 106 --------------- .../org/apache/iotdb/db/sync/sender/pipe/Pipe.java | 12 ++ .../iotdb/db/sync/sender/pipe/TsFilePipe.java | 144 ++++++++------------ .../db/sync/transport/client/SenderManager.java | 1 - .../apache/iotdb/db/utils/ErrorHandlingUtils.java | 8 +- .../apache/iotdb/db/utils/sync/SyncPipeUtil.java | 47 +++++++ .../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 7 +- .../iotdb/db/wal/checkpoint/CheckpointManager.java | 5 +- .../engine/storagegroup/TsFileProcessorTest.java | 6 +- .../iotdb/db/protocol/mqtt/PublishHandlerTest.java | 7 +- .../db/sync/receiver/manager/SyncInfoTest.java | 8 +- .../db/sync/receiver/recovery/SyncLogTest.java | 8 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + site/src/main/.vuepress/config.js | 2 +- .../src/main/thrift/confignode.thrift | 27 ++++ thrift/src/main/thrift/datanode.thrift | 82 +++++++----- 121 files changed, 1696 insertions(+), 1053 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java index 996da840bf,9cbe669564..6e91124e15 --- a/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java +++ b/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java @@@ -65,12 -64,12 +65,12 @@@ public class RegionMigrateService imple } /** - * add a region peer + * submit AddRegionPeerTask * * @param req TMigrateRegionReq - * @return submit task succeed? + * @return if the submit task succeed */ - public synchronized boolean submitAddRegionPeerTask(TMigrateRegionReq req) { + public synchronized boolean submitAddRegionPeerTask(TMaintainPeerReq req) { boolean submitSucceed = true; try { @@@ -87,12 -86,12 +87,12 @@@ } /** - * remove a region peer + * submit RemoveRegionPeerTask * * @param req TMigrateRegionReq - * @return submit task succeed? + * @return if the submit task succeed */ - public synchronized boolean submitRemoveRegionPeerTask(TMigrateRegionReq req) { + public synchronized boolean submitRemoveRegionPeerTask(TMaintainPeerReq req) { boolean submitSucceed = true; try {
