This is an automated email from the ASF dual-hosted git repository.

xingtanzjr pushed a commit to branch multiLeader_out_of_order
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 9c8f90677b3f5be5c4924b938d8096778ecf7579
Merge: c33c824476 842105470d
Author: stormbroken <[email protected]>
AuthorDate: Fri Jul 22 15:23:12 2022 +0800

    Merge branch 'remote-master' into fix/multiLeader_out_of_order

 .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   |  24 +-
 .../confignode/client/DataNodeRequestType.java     |   3 +-
 .../async/datanode/AsyncDataNodeClientPool.java    | 221 +++---
 .../async/handlers/AbstractRetryHandler.java       |  33 +-
 .../client/async/handlers/CreateRegionHandler.java |  14 +-
 .../client/async/handlers/FlushHandler.java        |  16 +-
 .../async/handlers/FunctionManagementHandler.java  |  11 +-
 .../client/async/handlers/SetTTLHandler.java       |   7 +-
 .../handlers/UpdateRegionRouteMapHandler.java      |   9 +-
 .../request/write/RemoveDataNodePlan.java          | 124 +---
 .../statemachine/PartitionRegionStateMachine.java  |   2 -
 .../confignode/manager/ClusterSchemaManager.java   |  30 +-
 .../iotdb/confignode/manager/ConfigManager.java    |  10 +-
 .../confignode/manager/DataNodeRemoveManager.java  | 806 ---------------------
 .../apache/iotdb/confignode/manager/IManager.java  |   6 +-
 .../iotdb/confignode/manager/NodeManager.java      |  71 +-
 .../iotdb/confignode/manager/ProcedureManager.java |  34 +
 .../iotdb/confignode/manager/UDFManager.java       |  63 +-
 .../iotdb/confignode/manager/load/LoadManager.java |  31 +-
 .../iotdb/confignode/persistence/NodeInfo.java     | 191 +----
 .../procedure/env/ConfigNodeProcedureEnv.java      |  26 +-
 .../procedure/env/DataNodeRemoveHandler.java       | 381 ++++++++++
 .../procedure/impl/AbstractNodeProcedure.java      |  64 ++
 .../procedure/impl/AddConfigNodeProcedure.java     |  33 +-
 .../procedure/impl/RegionMigrateProcedure.java     | 230 ++++++
 .../procedure/impl/RemoveConfigNodeProcedure.java  |  33 +-
 .../procedure/impl/RemoveDataNodeProcedure.java    | 184 +++++
 .../confignode/procedure/scheduler/LockQueue.java  |  63 ++
 .../state/RegionTransitionState.java}              |  21 +-
 .../state/RemoveDataNodeState.java}                |  22 +-
 .../procedure/store/ProcedureFactory.java          |  14 +
 .../iotdb/confignode/service/ConfigNode.java       |  27 -
 .../confignode/service/ConfigNodeCommandLine.java  |  31 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |   2 +-
 .../request/write/RemoveDataNodePlanTest.java      |   1 -
 .../iotdb/db/it/IoTDBInsertWithoutTimeIT.java      | 122 ++++
 .../org/apache/iotdb/db/it/utils/TestUtils.java    |  12 +-
 .../db/integration/IoTDBInsertWithoutTimeIT.java   | 131 ----
 .../commons/partition/DataPartitionQueryParam.java |  14 -
 pom.xml                                            |   2 +-
 .../operator/process/TimeJoinOperator.java         |   7 +-
 .../org/apache/iotdb/db/mpp/plan/Coordinator.java  |  47 +-
 .../apache/iotdb/db/mpp/plan/analyze/Analysis.java |  11 +
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |  11 +-
 .../mpp/plan/analyze/ClusterPartitionFetcher.java  |  63 +-
 .../db/mpp/plan/analyze/cache/PartitionCache.java  | 166 +++--
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |  64 +-
 .../db/mpp/plan/planner/LocalExecutionPlanner.java |  39 +-
 .../db/mpp/plan/planner/LogicalPlanBuilder.java    |  54 +-
 .../db/mpp/plan/planner/LogicalPlanVisitor.java    |  45 +-
 .../plan/planner/distribution/SourceRewriter.java  |  32 +-
 .../planner/plan/node/process/AggregationNode.java |  12 +-
 .../planner/plan/node/process/DeviceMergeNode.java |  44 +-
 .../planner/plan/node/process/DeviceViewNode.java  |  42 +-
 .../plan/planner/plan/node/process/FillNode.java   |  13 +-
 .../plan/planner/plan/node/process/FilterNode.java |   8 +-
 .../plan/node/process/GroupByLevelNode.java        |  12 +-
 .../plan/node/process/LastQueryMergeNode.java      |  48 +-
 .../node/process/SlidingWindowAggregationNode.java |  12 +-
 .../plan/planner/plan/node/process/SortNode.java   |  12 +-
 .../planner/plan/node/process/TimeJoinNode.java    |  12 +-
 .../planner/plan/node/process/TransformNode.java   |  12 +-
 .../source/AlignedSeriesAggregationScanNode.java   |  10 +-
 .../plan/node/source/AlignedSeriesScanNode.java    |  12 +-
 .../node/source/SeriesAggregationScanNode.java     |  10 +-
 .../node/source/SeriesAggregationSourceNode.java   |   6 +-
 .../planner/plan/node/source/SeriesScanNode.java   |  14 +-
 .../planner/plan/parameter/OrderByParameter.java   |  89 +++
 .../plan/statement/component/OrderByComponent.java |  92 +++
 .../component/{OrderBy.java => Ordering.java}      |  22 +-
 .../db/mpp/plan/statement/component/SortItem.java  |  83 +++
 .../db/mpp/plan/statement/component/SortKey.java   |  21 +-
 .../db/mpp/plan/statement/crud/QueryStatement.java |  62 +-
 .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java    |  53 +-
 .../java/org/apache/iotdb/db/service/DataNode.java | 105 ---
 .../db/service/DataNodeServerCommandLine.java      | 120 ++-
 .../iotdb/db/service/RegionMigrateService.java     |  15 +-
 .../org/apache/iotdb/db/utils/SchemaUtils.java     |   6 +-
 .../iotdb/db/mpp/execution/DataDriverTest.java     |   4 +-
 .../operator/AlignedSeriesScanOperatorTest.java    |   6 +-
 .../mpp/execution/operator/LimitOperatorTest.java  |   4 +-
 .../mpp/execution/operator/OffsetOperatorTest.java |   8 +-
 .../operator/RawDataAggregationOperatorTest.java   |   4 +-
 .../execution/operator/TimeJoinOperatorTest.java   |   8 +-
 .../mpp/plan/analyze/cache/PartitionCacheTest.java | 432 +++++++++++
 .../mpp/plan/plan/FragmentInstanceSerdeTest.java   |  11 +-
 .../db/mpp/plan/plan/QueryLogicalPlanUtil.java     | 149 ++--
 .../distribution/AggregationDistributionTest.java  |  34 +-
 .../distribution/DistributionPlannerBasicTest.java |  42 +-
 .../mpp/plan/plan/distribution/LastQueryTest.java  |   3 +-
 .../distribution/NoDataRegionPlanningTest.java     |  20 +-
 .../node/process/AggregationNodeSerdeTest.java     |   6 +-
 .../plan/node/process/DeviceViewNodeSerdeTest.java |  16 +-
 .../plan/node/process/ExchangeNodeSerdeTest.java   |   5 +-
 .../plan/plan/node/process/FillNodeSerdeTest.java  |   7 +-
 .../plan/node/process/FilterNodeSerdeTest.java     |   7 +-
 .../node/process/GroupByLevelNodeSerdeTest.java    |   8 +-
 .../plan/plan/node/process/LimitNodeSerdeTest.java |   4 +-
 .../plan/node/process/OffsetNodeSerdeTest.java     |   4 +-
 .../plan/plan/node/process/SortNodeSerdeTest.java  |   7 +-
 .../plan/node/process/TimeJoinNodeSerdeTest.java   |   9 +-
 .../source/SeriesAggregationScanNodeSerdeTest.java |   4 +-
 .../plan/node/source/SeriesScanNodeSerdeTest.java  |   4 +-
 103 files changed, 3041 insertions(+), 2370 deletions(-)

Reply via email to