You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/07/18 11:21:55 UTC

[iotdb] branch xingtanzjr/query_retry updated (b92f426d84 -> 6b6180322b)

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

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


    from b92f426d84 add schema partition fetch logic for each retry
     add 34c871e6f6 fix the issue that TransformNode is not considered in ExchangeNodeAddr (#6662)
     add 2befe1325c [IOTDB-3829] Add UT for route algorithms (#6674)
     add cbd8d835ef Reduce data size of IoTDBMultiDeviceIT #6676
     add 8cd42fa076 [IOTDB-3714] Refactor operators related to aggregate query to support batch processing (#6622)
     add b84ac57ef7 [IOTDB-3618] StorageEngine failed to recover: / by zero (#6677)
     add 2bf38a0b69 [IOTDB-3833] fixed Grafana 9 connects to iotdb and reports expression should not be null (#6682)
     add 134963f9b0 Fix remove config node bug (#6679)
     add c379c51043 [IOTDB-3800]Add Node Type Column to 'SHOW CHILD PATHS' query (#6654)
     add dcadc62f53 [IOTDB-3834] fixed [0.14]grafana-plugin display data error (#6683)
     add ba8bfad35c Add weak read consistency policy for MPP (#6681)
     add b309f71b95 [IOTDB-3836] REST API for data type in a case-insensitive (#6684)
     add 70772cb868 [IOTDB-3778] Use SeriesScanUtil in compaction for point reader (#6668)
     add d0d298e986 [IOTDB-3720] Unify retry logic of AsyncClientPool in ConfigNode (#6670)
     add e0453b7d8f [IOTDB-3840]  deserialize RemoveDataNodePlan exception (#6686)
     add 8d77e78491 [IOTDB-3765] Reinforce DataNode startup process (#6643)
     add f7cfd32a35 [To rel/0.13] [IOTDB-3813] Ignore the ClosedByInterruptException log when shutdown IoTDB (#6689)
     add 9eaa804235 [IOTDB-3839] Fix genRealTimeRegionRoutingMap bug (#6685)
     add 967cde609a [IOTDB-3851] C++ client method of tablet sorting optimization (#6690)
     add 45849ac74b [IOTDB-3849] Rename TDataNodeLocation to TDataNodeConfiguration (#6694)
     add cf98f639e5 [IOTDB-3796] Throw exception while using without null clause in MPP (#6644)
     add e28048f5fb [IOTDB-3854] add interface to provide getOrCreate SchemaEntry when update lastCache. (#6693)
     add 8334acd76f [IOTDB-3775][IOTDB-3776]Avoid serializing resource file and adding mods to file that don't contain the device when deleting data (#6621)
     add adedb34e4f [IOTDB-3830] Refactor schema fetch (#6678)
     new 6b6180322b Merge branch 'master' into xingtanzjr/query_retry

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 client-cpp/src/main/Session.cpp                    |   12 +-
 .../confignode/client/AsyncDataNodeClientPool.java |  343 ----
 .../confignode/client/ConfigNodeRequestType.java   |   10 +-
 .../confignode/client/DataNodeRequestType.java     |   21 +-
 .../confignode}/AsyncConfigNodeClientPool.java     |    4 +-
 .../async/datanode/AsyncDataNodeClientPool.java    |  283 ++++
 .../async/handlers/AbstractRetryHandler.java       |   75 +
 .../handlers/ConfigNodeHeartbeatHandler.java       |    2 +-
 .../{ => async}/handlers/CreateRegionHandler.java  |   43 +-
 .../handlers/DataNodeHeartbeatHandler.java         |    2 +-
 .../client/{ => async}/handlers/FlushHandler.java  |   34 +-
 .../handlers/FunctionManagementHandler.java        |   37 +-
 .../client/{ => async}/handlers/SetTTLHandler.java |   34 +-
 .../handlers/UpdateRegionRouteMapHandler.java      |   31 +-
 .../confignode}/SyncConfigNodeClientPool.java      |   15 +-
 .../datanode}/SyncDataNodeClientPool.java          |   23 +-
 .../confignode/conf/ConfigNodeRemoveCheck.java     |   14 +-
 .../consensus/request/ConfigPhysicalPlan.java      |   10 +-
 .../consensus/request/ConfigPhysicalPlanType.java  |    3 +-
 ...Plan.java => GetDataNodeConfigurationPlan.java} |   28 +-
 .../request/write/ActivateDataNodePlan.java        |   71 -
 .../request/write/RegisterDataNodePlan.java        |    8 +-
 .../request/write/RemoveDataNodePlan.java          |    1 -
 .../response/DataNodeConfigurationResp.java        |   48 +-
 ...odeInfosResp.java => DataNodeRegisterResp.java} |   52 +-
 .../response/SchemaNodeManagementResp.java         |    5 +-
 .../confignode/manager/ClusterSchemaManager.java   |   41 +-
 .../iotdb/confignode/manager/ConfigManager.java    |   55 +-
 .../confignode/manager/DataNodeRemoveManager.java  |   23 +-
 .../apache/iotdb/confignode/manager/IManager.java  |   15 +-
 .../iotdb/confignode/manager/NodeManager.java      |   92 +-
 .../iotdb/confignode/manager/PartitionManager.java |    2 +-
 .../confignode/manager/PermissionManager.java      |   13 +-
 .../iotdb/confignode/manager/UDFManager.java       |   84 +-
 .../iotdb/confignode/manager/load/LoadManager.java |   65 +-
 .../manager/load/balancer/RegionBalancer.java      |    4 +-
 .../manager/load/balancer/RouteBalancer.java       |    4 +-
 .../balancer/region/CopySetRegionAllocator.java    |   16 +-
 .../balancer/region/GreedyRegionAllocator.java     |    8 +-
 .../load/balancer/region/IRegionAllocator.java     |    4 +-
 .../manager/load/balancer/router/IRouter.java      |    2 +-
 .../manager/load/balancer/router/LeaderRouter.java |    8 +-
 .../balancer/router/LoadScoreGreedyRouter.java     |    8 +-
 .../load/heartbeat/ConfigNodeHeartbeatCache.java   |    4 +-
 .../load/heartbeat/DataNodeHeartbeatCache.java     |    7 +-
 .../manager/load/heartbeat/INodeCache.java         |    8 +-
 .../confignode/persistence/ClusterSchemaInfo.java  |    6 +-
 .../iotdb/confignode/persistence/NodeInfo.java     |   58 +-
 .../persistence/executor/ConfigPlanExecutor.java   |   17 +-
 .../procedure/env/ConfigNodeProcedureEnv.java      |   31 +-
 .../iotdb/confignode/service/ConfigNode.java       |    6 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |   40 +-
 .../request/ConfigPhysicalPlanSerDeTest.java       |   43 +-
 .../request/write/RemoveDataNodePlanTest.java      |   35 +-
 .../balancer/region/GreedyRegionAllocatorTest.java |   16 +-
 .../load/balancer/router/LeaderRouterTest.java     |  115 ++
 .../balancer/router/LoadScoreGreedyRouterTest.java |  106 ++
 .../iotdb/confignode/persistence/NodeInfoTest.java |   18 +-
 .../thrift/ConfigNodeRPCServiceProcessorTest.java  |   85 +-
 docs/UserGuide/Operate-Metadata/Node.md            |   17 +-
 docs/UserGuide/Reference/DataNode-Config-Manual.md |   28 +-
 docs/zh/UserGuide/Operate-Metadata/Node.md         |   18 +-
 .../UserGuide/Reference/DataNode-Config-Manual.md  |   28 +-
 .../util/TSFileConfigUtilCompletenessTest.java     |    4 +-
 grafana-plugin/pkg/plugin/plugin.go                |    4 +-
 .../java/org/apache/iotdb/it/env/MppConfig.java    |    6 +
 .../org/apache/iotdb/itbase/env/BaseConfig.java    |    8 +
 .../org/apache/iotdb/db/it/IoTDBMultiDeviceIT.java |  121 +-
 .../aligned/IoTDBAggregationWithDeletion2IT.java   |    3 +
 .../it/aligned/IoTDBAggregationWithDeletionIT.java |    4 +
 .../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java  |    3 +
 .../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java  |    4 +-
 .../db/it/aligned/IoTDBAlignedSeriesQueryIT.java   |    4 +
 .../db/it/aligned/IoTDBGroupByLevelQueryIT.java    |    5 +
 ...GroupByQueryWithValueFilterWithDeletion2IT.java |    3 +
 ...BGroupByQueryWithValueFilterWithDeletionIT.java |    4 +
 ...upByQueryWithoutValueFilterWithDeletion2IT.java |    3 +
 ...oupByQueryWithoutValueFilterWithDeletionIT.java |    4 +
 .../iotdb/db/it/env/StandaloneEnvConfig.java       |   11 +
 .../iotdb/db/it/schema/IoTDBMetadataFetchIT.java   |    2 +-
 .../iotdb/db/integration/IoTDBRestartIT.java       |   22 +-
 .../db/integration/sync/IoTDBSyncSenderIT.java     |    2 +-
 .../versionadaption/IoTDBDDLVersionAdaptionIT.java |    3 +-
 .../apache/iotdb/commons/conf/IoTDBConstant.java   |    1 +
 .../partition/SchemaNodeManagementPartition.java   |    9 +-
 .../commons/utils/ThriftCommonsSerDeUtils.java     |   42 +-
 .../schemaregion/rocksdb/RSchemaRegion.java        |   17 +-
 .../schemaregion/rocksdb/mnode/REntityMNode.java   |    6 +
 .../schemaregion/rocksdb/mnode/RInternalMNode.java |    6 +
 .../rocksdb/mnode/RMeasurementMNode.java           |    6 +
 .../rocksdb/mnode/RStorageGroupMNode.java          |    6 +
 .../resources/conf/iotdb-datanode.properties       |   12 +
 .../apache/iotdb/db/client/ConfigNodeClient.java   |   23 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   12 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   22 +
 .../rewrite/task/ReadPointPerformerSubTask.java    |   19 +-
 .../impl/ReadPointCompactionPerformer.java         |   56 +-
 .../engine/compaction/reader/IDataBlockReader.java |    9 +-
 .../compaction/reader/SeriesDataBlockReader.java   |  156 ++
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   10 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   |   24 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |    5 +
 .../db/engine/storagegroup/TsFileResource.java     |   24 +-
 .../iotdb/db/localconfignode/LocalConfigNode.java  |    5 +-
 .../iotdb/db/metadata/LocalSchemaProcessor.java    |    8 +-
 .../db/metadata/cache/DataNodeSchemaCache.java     |   27 +
 .../idtable/entry/InsertMeasurementMNode.java      |    6 +
 .../iotdb/db/metadata/mnode/EntityMNode.java       |    5 +
 .../org/apache/iotdb/db/metadata/mnode/IMNode.java |    2 +
 .../iotdb/db/metadata/mnode/InternalMNode.java     |    5 +
 .../apache/iotdb/db/metadata/mnode/MNodeType.java  |   82 +
 .../iotdb/db/metadata/mnode/MeasurementMNode.java  |    5 +
 .../db/metadata/mnode/StorageGroupEntityMNode.java |    5 +
 .../iotdb/db/metadata/mnode/StorageGroupMNode.java |    5 +
 .../iotdb/db/metadata/mtree/ConfigMTree.java       |   14 +-
 .../iotdb/db/metadata/mtree/IMTreeBelowSG.java     |    5 +-
 .../db/metadata/mtree/MTreeBelowSGCachedImpl.java  |   13 +-
 .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java  |   13 +-
 .../db/metadata/schemaregion/ISchemaRegion.java    |    3 +-
 .../schemaregion/SchemaRegionMemoryImpl.java       |    4 +-
 .../schemaregion/SchemaRegionSchemaFileImpl.java   |    4 +-
 .../storagegroup/IStorageGroupSchemaManager.java   |    3 +-
 .../storagegroup/StorageGroupSchemaManager.java    |    5 +-
 .../iotdb/db/mpp/aggregation/Aggregator.java       |   13 +-
 .../EmptyQueueSlidingWindowAggregator.java         |    1 -
 .../MonotonicQueueSlidingWindowAggregator.java     |    5 +-
 .../NormalQueueSlidingWindowAggregator.java        |    1 -
 .../slidingwindow/SlidingWindowAggregator.java     |    2 +-
 .../iotdb/db/mpp/common/MPPQueryContext.java       |    4 +
 .../apache/iotdb/db/mpp/common/SessionInfo.java    |   25 +-
 .../iotdb/db/mpp/common/header/HeaderConstant.java |    6 +-
 .../fragment/FragmentInstanceContext.java          |   11 +
 .../db/mpp/execution/operator/AggregationUtil.java |  161 ++
 .../db/mpp/execution/operator/OperatorContext.java |   35 +
 .../operator/process/AggregationOperator.java      |  144 +-
 .../process/RawDataAggregationOperator.java        |  187 +--
 .../process/SingleInputAggregationOperator.java    |  149 ++
 .../process/SlidingWindowAggregationOperator.java  |  155 +-
 .../schema/NodeManageMemoryMergeOperator.java      |   47 +-
 .../schema/NodePathsSchemaScanOperator.java        |   39 +-
 .../operator/schema/SchemaFetchMergeOperator.java  |   53 +-
 .../operator/schema/SchemaFetchScanOperator.java   |    4 +
 .../AbstractSeriesAggregationScanOperator.java     |  350 ++++
 .../AlignedSeriesAggregationScanOperator.java      |  377 +----
 .../operator/source/AlignedSeriesScanUtil.java     |   38 +
 .../source/SeriesAggregationScanOperator.java      |  386 +----
 .../execution/operator/source/SeriesScanUtil.java  |   74 +-
 .../mpp/execution/schedule/DriverTaskThread.java   |    6 +-
 .../mpp/execution/timer/ITimeSliceAllocator.java   |   11 +-
 .../timer/RuleBasedTimeSliceAllocator.java         |   66 +
 .../apache/iotdb/db/mpp/plan/analyze/Analysis.java |   19 +-
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |  132 +-
 .../db/mpp/plan/analyze/ClusterSchemaFetcher.java  |   88 +-
 .../db/mpp/plan/analyze/ConcatPathRewriter.java    |   43 -
 .../db/mpp/plan/analyze/FakeSchemaFetcherImpl.java |    6 -
 .../iotdb/db/mpp/plan/analyze/ISchemaFetcher.java  |    3 -
 .../plan/analyze/StandalonePartitionFetcher.java   |   12 +-
 .../mpp/plan/analyze/StandaloneSchemaFetcher.java  |    6 -
 .../memory/StatementMemorySourceVisitor.java       |   37 +-
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |   21 +-
 .../db/mpp/plan/planner/LocalExecutionPlanner.java |  192 ++-
 .../db/mpp/plan/planner/LogicalPlanBuilder.java    |   20 +-
 .../db/mpp/plan/planner/LogicalPlanVisitor.java    |   10 +-
 .../planner/distribution/ExchangeNodeAdder.java    |    6 +
 .../SimpleFragmentParallelPlanner.java             |   28 +
 .../db/mpp/plan/planner/plan/FragmentInstance.java |    6 +
 .../plan/planner/plan/node/PlanGraphPrinter.java   |    8 -
 .../mpp/plan/planner/plan/node/PlanNodeType.java   |    3 -
 .../db/mpp/plan/planner/plan/node/PlanVisitor.java |    5 -
 .../read/NodeManagementMemoryMergeNode.java        |   18 +-
 .../node/metedata/read/SchemaFetchMergeNode.java   |   29 +-
 .../planner/plan/node/process/FilterNullNode.java  |  136 --
 .../planner/plan/node/process/TransformNode.java   |    5 +
 .../plan/planner/plan/node/write/InsertNode.java   |    9 +
 .../plan/parameter/FilterNullParameter.java        |  109 --
 .../statement/component/FilterNullComponent.java   |   97 --
 .../db/mpp/plan/statement/crud/QueryStatement.java |   12 -
 .../statement/internal/SchemaFetchStatement.java   |   13 +-
 .../mpprest/handler/QueryDataSetHandler.java       |   37 +-
 .../handler/StatementConstructionHandler.java      |    3 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |   32 +-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      |    9 +
 .../iotdb/db/query/context/QueryContext.java       |    2 +-
 .../iotdb/db/query/control/SessionManager.java     |    1 +
 .../java/org/apache/iotdb/db/service/DataNode.java |  101 +-
 .../db/wal/recover/file/TsFilePlanRedoer.java      |    6 +
 .../file/UnsealedTsFileRecoverPerformer.java       |    2 +-
 .../ReadPointCompactionPerformerTest.java          | 1689 ++++++++++----------
 .../cross/RewriteCrossSpaceCompactionTest.java     |   84 +-
 .../db/engine/storagegroup/DataRegionTest.java     |   83 +
 .../apache/iotdb/db/metadata/SchemaBasicTest.java  |   16 +-
 .../operator/AggregationOperatorTest.java          |   42 +-
 .../AlignedSeriesAggregationScanOperatorTest.java  |   92 +-
 .../operator/LastQueryMergeOperatorTest.java       |   15 +
 .../operator/RawDataAggregationOperatorTest.java   |    8 +
 .../SeriesAggregationScanOperatorTest.java         |   88 +-
 .../SlidingWindowAggregationOperatorTest.java      |   46 +-
 .../operator/UpdateLastCacheOperatorTest.java      |    8 +
 .../schema/SchemaFetchScanOperatorTest.java        |    6 +-
 .../mpp/plan/plan/FragmentInstanceSerdeTest.java   |   13 +-
 .../db/mpp/plan/plan/QueryLogicalPlanUtil.java     |   13 +-
 .../iotdb/db/mpp/plan/plan/QueryPlannerTest.java   |    2 +-
 .../NodeManagementMemoryMergeNodeSerdeTest.java    |    8 +-
 .../plan/node/process/FilterNullNodeSerdeTest.java |   58 -
 .../plan/scheduler/StandaloneSchedulerTest.java    |   30 +-
 .../db/protocol/rest/IoTDBRestServiceTest.java     |    1 +
 .../iotdb/db/query/dataset/ListDataSetTest.java    |    7 +-
 .../file/UnsealedTsFileRecoverPerformerTest.java   |   62 +
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   17 +-
 thrift-commons/src/main/thrift/common.thrift       |   16 +-
 .../src/main/thrift/confignode.thrift              |   30 +-
 .../iotdb/tsfile/common/conf/TSFileConfig.java     |   22 +
 .../file/metadata/statistics/Statistics.java       |    5 +
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |   12 +-
 .../iotdb/tsfile/read/common/block/TsBlock.java    |    4 +
 .../tsfile/read/common/block/TsBlockBuilder.java   |    6 +-
 .../read/common/block/TsBlockBuilderStatus.java    |    4 +-
 .../tsfile/read/common/block/TsBlockUtil.java      |   59 +
 218 files changed, 5019 insertions(+), 4386 deletions(-)
 delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/client/AsyncDataNodeClientPool.java
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async/confignode}/AsyncConfigNodeClientPool.java (94%)
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/client/async/datanode/AsyncDataNodeClientPool.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/AbstractRetryHandler.java
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/ConfigNodeHeartbeatHandler.java (97%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/CreateRegionHandler.java (75%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/DataNodeHeartbeatHandler.java (98%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/FlushHandler.java (61%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/FunctionManagementHandler.java (53%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/SetTTLHandler.java (56%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/UpdateRegionRouteMapHandler.java (68%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => sync/confignode}/SyncConfigNodeClientPool.java (94%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => sync/datanode}/SyncDataNodeClientPool.java (93%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{GetDataNodeInfoPlan.java => GetDataNodeConfigurationPlan.java} (71%)
 delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/ActivateDataNodePlan.java
 rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{DataNodeInfosResp.java => DataNodeRegisterResp.java} (53%)
 create mode 100644 confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/LeaderRouterTest.java
 create mode 100644 confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/router/LoadScoreGreedyRouterTest.java
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java => server/src/main/java/org/apache/iotdb/db/engine/compaction/reader/IDataBlockReader.java (82%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/reader/SeriesDataBlockReader.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNodeType.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/AggregationUtil.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/SingleInputAggregationOperator.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java => server/src/main/java/org/apache/iotdb/db/mpp/execution/timer/ITimeSliceAllocator.java (76%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/timer/RuleBasedTimeSliceAllocator.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/process/FilterNullNode.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/FilterNullParameter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/component/FilterNullComponent.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/process/FilterNullNodeSerdeTest.java
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockUtil.java


[iotdb] 01/01: Merge branch 'master' into xingtanzjr/query_retry

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6b6180322b25f5b2656370a7981be162f9ec6d73
Merge: b92f426d84 adedb34e4f
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Mon Jul 18 19:20:42 2022 +0800

    Merge branch 'master' into xingtanzjr/query_retry

 client-cpp/src/main/Session.cpp                    |   12 +-
 .../confignode/client/AsyncDataNodeClientPool.java |  343 ----
 .../confignode/client/ConfigNodeRequestType.java   |   10 +-
 .../confignode/client/DataNodeRequestType.java     |   21 +-
 .../confignode}/AsyncConfigNodeClientPool.java     |    4 +-
 .../async/datanode/AsyncDataNodeClientPool.java    |  283 ++++
 .../async/handlers/AbstractRetryHandler.java       |   75 +
 .../handlers/ConfigNodeHeartbeatHandler.java       |    2 +-
 .../{ => async}/handlers/CreateRegionHandler.java  |   43 +-
 .../handlers/DataNodeHeartbeatHandler.java         |    2 +-
 .../client/{ => async}/handlers/FlushHandler.java  |   34 +-
 .../handlers/FunctionManagementHandler.java        |   37 +-
 .../client/{ => async}/handlers/SetTTLHandler.java |   34 +-
 .../handlers/UpdateRegionRouteMapHandler.java      |   31 +-
 .../confignode}/SyncConfigNodeClientPool.java      |   15 +-
 .../datanode}/SyncDataNodeClientPool.java          |   23 +-
 .../confignode/conf/ConfigNodeRemoveCheck.java     |   14 +-
 .../consensus/request/ConfigPhysicalPlan.java      |   10 +-
 .../consensus/request/ConfigPhysicalPlanType.java  |    3 +-
 ...Plan.java => GetDataNodeConfigurationPlan.java} |   28 +-
 .../request/write/ActivateDataNodePlan.java        |   71 -
 .../request/write/RegisterDataNodePlan.java        |    8 +-
 .../request/write/RemoveDataNodePlan.java          |    1 -
 .../response/DataNodeConfigurationResp.java        |   48 +-
 ...odeInfosResp.java => DataNodeRegisterResp.java} |   52 +-
 .../response/SchemaNodeManagementResp.java         |    5 +-
 .../confignode/manager/ClusterSchemaManager.java   |   41 +-
 .../iotdb/confignode/manager/ConfigManager.java    |   55 +-
 .../confignode/manager/DataNodeRemoveManager.java  |   23 +-
 .../apache/iotdb/confignode/manager/IManager.java  |   15 +-
 .../iotdb/confignode/manager/NodeManager.java      |   92 +-
 .../iotdb/confignode/manager/PartitionManager.java |    2 +-
 .../confignode/manager/PermissionManager.java      |   13 +-
 .../iotdb/confignode/manager/UDFManager.java       |   84 +-
 .../iotdb/confignode/manager/load/LoadManager.java |   65 +-
 .../manager/load/balancer/RegionBalancer.java      |    4 +-
 .../manager/load/balancer/RouteBalancer.java       |    4 +-
 .../balancer/region/CopySetRegionAllocator.java    |   16 +-
 .../balancer/region/GreedyRegionAllocator.java     |    8 +-
 .../load/balancer/region/IRegionAllocator.java     |    4 +-
 .../manager/load/balancer/router/IRouter.java      |    2 +-
 .../manager/load/balancer/router/LeaderRouter.java |    8 +-
 .../balancer/router/LoadScoreGreedyRouter.java     |    8 +-
 .../load/heartbeat/ConfigNodeHeartbeatCache.java   |    4 +-
 .../load/heartbeat/DataNodeHeartbeatCache.java     |    7 +-
 .../manager/load/heartbeat/INodeCache.java         |    8 +-
 .../confignode/persistence/ClusterSchemaInfo.java  |    6 +-
 .../iotdb/confignode/persistence/NodeInfo.java     |   58 +-
 .../persistence/executor/ConfigPlanExecutor.java   |   17 +-
 .../procedure/env/ConfigNodeProcedureEnv.java      |   31 +-
 .../iotdb/confignode/service/ConfigNode.java       |    6 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |   40 +-
 .../request/ConfigPhysicalPlanSerDeTest.java       |   43 +-
 .../request/write/RemoveDataNodePlanTest.java      |   35 +-
 .../balancer/region/GreedyRegionAllocatorTest.java |   16 +-
 .../load/balancer/router/LeaderRouterTest.java     |  115 ++
 .../balancer/router/LoadScoreGreedyRouterTest.java |  106 ++
 .../iotdb/confignode/persistence/NodeInfoTest.java |   18 +-
 .../thrift/ConfigNodeRPCServiceProcessorTest.java  |   85 +-
 docs/UserGuide/Operate-Metadata/Node.md            |   17 +-
 docs/UserGuide/Reference/DataNode-Config-Manual.md |   28 +-
 docs/zh/UserGuide/Operate-Metadata/Node.md         |   18 +-
 .../UserGuide/Reference/DataNode-Config-Manual.md  |   28 +-
 .../util/TSFileConfigUtilCompletenessTest.java     |    4 +-
 grafana-plugin/pkg/plugin/plugin.go                |    4 +-
 .../java/org/apache/iotdb/it/env/MppConfig.java    |    6 +
 .../org/apache/iotdb/itbase/env/BaseConfig.java    |    8 +
 .../org/apache/iotdb/db/it/IoTDBMultiDeviceIT.java |  121 +-
 .../aligned/IoTDBAggregationWithDeletion2IT.java   |    3 +
 .../it/aligned/IoTDBAggregationWithDeletionIT.java |    4 +
 .../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java  |    3 +
 .../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java  |    4 +-
 .../db/it/aligned/IoTDBAlignedSeriesQueryIT.java   |    4 +
 .../db/it/aligned/IoTDBGroupByLevelQueryIT.java    |    5 +
 ...GroupByQueryWithValueFilterWithDeletion2IT.java |    3 +
 ...BGroupByQueryWithValueFilterWithDeletionIT.java |    4 +
 ...upByQueryWithoutValueFilterWithDeletion2IT.java |    3 +
 ...oupByQueryWithoutValueFilterWithDeletionIT.java |    4 +
 .../iotdb/db/it/env/StandaloneEnvConfig.java       |   11 +
 .../iotdb/db/it/schema/IoTDBMetadataFetchIT.java   |    2 +-
 .../iotdb/db/integration/IoTDBRestartIT.java       |   22 +-
 .../db/integration/sync/IoTDBSyncSenderIT.java     |    2 +-
 .../versionadaption/IoTDBDDLVersionAdaptionIT.java |    3 +-
 .../apache/iotdb/commons/conf/IoTDBConstant.java   |    1 +
 .../partition/SchemaNodeManagementPartition.java   |    9 +-
 .../commons/utils/ThriftCommonsSerDeUtils.java     |   42 +-
 .../schemaregion/rocksdb/RSchemaRegion.java        |   17 +-
 .../schemaregion/rocksdb/mnode/REntityMNode.java   |    6 +
 .../schemaregion/rocksdb/mnode/RInternalMNode.java |    6 +
 .../rocksdb/mnode/RMeasurementMNode.java           |    6 +
 .../rocksdb/mnode/RStorageGroupMNode.java          |    6 +
 .../resources/conf/iotdb-datanode.properties       |   12 +
 .../apache/iotdb/db/client/ConfigNodeClient.java   |   23 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   12 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   22 +
 .../rewrite/task/ReadPointPerformerSubTask.java    |   19 +-
 .../impl/ReadPointCompactionPerformer.java         |   56 +-
 .../engine/compaction/reader/IDataBlockReader.java |   19 +-
 .../compaction/reader/SeriesDataBlockReader.java   |  156 ++
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   10 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   |   24 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |    5 +
 .../db/engine/storagegroup/TsFileResource.java     |   24 +-
 .../iotdb/db/localconfignode/LocalConfigNode.java  |    5 +-
 .../iotdb/db/metadata/LocalSchemaProcessor.java    |    8 +-
 .../db/metadata/cache/DataNodeSchemaCache.java     |   27 +
 .../idtable/entry/InsertMeasurementMNode.java      |    6 +
 .../iotdb/db/metadata/mnode/EntityMNode.java       |    5 +
 .../org/apache/iotdb/db/metadata/mnode/IMNode.java |    2 +
 .../iotdb/db/metadata/mnode/InternalMNode.java     |    5 +
 .../apache/iotdb/db/metadata/mnode/MNodeType.java  |   82 +
 .../iotdb/db/metadata/mnode/MeasurementMNode.java  |    5 +
 .../db/metadata/mnode/StorageGroupEntityMNode.java |    5 +
 .../iotdb/db/metadata/mnode/StorageGroupMNode.java |    5 +
 .../iotdb/db/metadata/mtree/ConfigMTree.java       |   14 +-
 .../iotdb/db/metadata/mtree/IMTreeBelowSG.java     |    5 +-
 .../db/metadata/mtree/MTreeBelowSGCachedImpl.java  |   13 +-
 .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java  |   13 +-
 .../db/metadata/schemaregion/ISchemaRegion.java    |    3 +-
 .../schemaregion/SchemaRegionMemoryImpl.java       |    4 +-
 .../schemaregion/SchemaRegionSchemaFileImpl.java   |    4 +-
 .../storagegroup/IStorageGroupSchemaManager.java   |    3 +-
 .../storagegroup/StorageGroupSchemaManager.java    |    5 +-
 .../iotdb/db/mpp/aggregation/Aggregator.java       |   13 +-
 .../EmptyQueueSlidingWindowAggregator.java         |    1 -
 .../MonotonicQueueSlidingWindowAggregator.java     |    5 +-
 .../NormalQueueSlidingWindowAggregator.java        |    1 -
 .../slidingwindow/SlidingWindowAggregator.java     |    2 +-
 .../iotdb/db/mpp/common/MPPQueryContext.java       |    4 +
 .../apache/iotdb/db/mpp/common/SessionInfo.java    |   25 +-
 .../iotdb/db/mpp/common/header/HeaderConstant.java |    6 +-
 .../fragment/FragmentInstanceContext.java          |   11 +
 .../db/mpp/execution/operator/AggregationUtil.java |  161 ++
 .../db/mpp/execution/operator/OperatorContext.java |   35 +
 .../operator/process/AggregationOperator.java      |  144 +-
 .../process/RawDataAggregationOperator.java        |  187 +--
 .../process/SingleInputAggregationOperator.java    |  149 ++
 .../process/SlidingWindowAggregationOperator.java  |  155 +-
 .../schema/NodeManageMemoryMergeOperator.java      |   47 +-
 .../schema/NodePathsSchemaScanOperator.java        |   39 +-
 .../operator/schema/SchemaFetchMergeOperator.java  |   53 +-
 .../operator/schema/SchemaFetchScanOperator.java   |    4 +
 .../AbstractSeriesAggregationScanOperator.java     |  350 ++++
 .../AlignedSeriesAggregationScanOperator.java      |  377 +----
 .../operator/source/AlignedSeriesScanUtil.java     |   38 +
 .../source/SeriesAggregationScanOperator.java      |  386 +----
 .../execution/operator/source/SeriesScanUtil.java  |   74 +-
 .../mpp/execution/schedule/DriverTaskThread.java   |    6 +-
 .../mpp/execution/timer/ITimeSliceAllocator.java   |   17 +-
 .../timer/RuleBasedTimeSliceAllocator.java         |   66 +
 .../apache/iotdb/db/mpp/plan/analyze/Analysis.java |   19 +-
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |  132 +-
 .../db/mpp/plan/analyze/ClusterSchemaFetcher.java  |   88 +-
 .../db/mpp/plan/analyze/ConcatPathRewriter.java    |   43 -
 .../db/mpp/plan/analyze/FakeSchemaFetcherImpl.java |    6 -
 .../iotdb/db/mpp/plan/analyze/ISchemaFetcher.java  |    3 -
 .../plan/analyze/StandalonePartitionFetcher.java   |   12 +-
 .../mpp/plan/analyze/StandaloneSchemaFetcher.java  |    6 -
 .../memory/StatementMemorySourceVisitor.java       |   37 +-
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |   21 +-
 .../db/mpp/plan/planner/LocalExecutionPlanner.java |  192 ++-
 .../db/mpp/plan/planner/LogicalPlanBuilder.java    |   20 +-
 .../db/mpp/plan/planner/LogicalPlanVisitor.java    |   10 +-
 .../planner/distribution/ExchangeNodeAdder.java    |    6 +
 .../SimpleFragmentParallelPlanner.java             |   28 +
 .../db/mpp/plan/planner/plan/FragmentInstance.java |    6 +
 .../plan/planner/plan/node/PlanGraphPrinter.java   |    8 -
 .../mpp/plan/planner/plan/node/PlanNodeType.java   |    3 -
 .../db/mpp/plan/planner/plan/node/PlanVisitor.java |    5 -
 .../read/NodeManagementMemoryMergeNode.java        |   18 +-
 .../node/metedata/read/SchemaFetchMergeNode.java   |   29 +-
 .../planner/plan/node/process/FilterNullNode.java  |  136 --
 .../planner/plan/node/process/TransformNode.java   |    5 +
 .../plan/planner/plan/node/write/InsertNode.java   |    9 +
 .../plan/parameter/FilterNullParameter.java        |  109 --
 .../statement/component/FilterNullComponent.java   |   97 --
 .../db/mpp/plan/statement/crud/QueryStatement.java |   12 -
 .../statement/internal/SchemaFetchStatement.java   |   13 +-
 .../mpprest/handler/QueryDataSetHandler.java       |   37 +-
 .../handler/StatementConstructionHandler.java      |    3 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |   32 +-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      |    9 +
 .../iotdb/db/query/context/QueryContext.java       |    2 +-
 .../iotdb/db/query/control/SessionManager.java     |    1 +
 .../java/org/apache/iotdb/db/service/DataNode.java |  101 +-
 .../db/wal/recover/file/TsFilePlanRedoer.java      |    6 +
 .../file/UnsealedTsFileRecoverPerformer.java       |    2 +-
 .../ReadPointCompactionPerformerTest.java          | 1689 ++++++++++----------
 .../cross/RewriteCrossSpaceCompactionTest.java     |   84 +-
 .../db/engine/storagegroup/DataRegionTest.java     |   83 +
 .../apache/iotdb/db/metadata/SchemaBasicTest.java  |   16 +-
 .../operator/AggregationOperatorTest.java          |   42 +-
 .../AlignedSeriesAggregationScanOperatorTest.java  |   92 +-
 .../operator/LastQueryMergeOperatorTest.java       |   15 +
 .../operator/RawDataAggregationOperatorTest.java   |    8 +
 .../SeriesAggregationScanOperatorTest.java         |   88 +-
 .../SlidingWindowAggregationOperatorTest.java      |   46 +-
 .../operator/UpdateLastCacheOperatorTest.java      |    8 +
 .../schema/SchemaFetchScanOperatorTest.java        |    6 +-
 .../mpp/plan/plan/FragmentInstanceSerdeTest.java   |   13 +-
 .../db/mpp/plan/plan/QueryLogicalPlanUtil.java     |   13 +-
 .../iotdb/db/mpp/plan/plan/QueryPlannerTest.java   |    2 +-
 .../NodeManagementMemoryMergeNodeSerdeTest.java    |    8 +-
 .../plan/node/process/FilterNullNodeSerdeTest.java |   58 -
 .../plan/scheduler/StandaloneSchedulerTest.java    |   30 +-
 .../db/protocol/rest/IoTDBRestServiceTest.java     |    1 +
 .../iotdb/db/query/dataset/ListDataSetTest.java    |    7 +-
 .../file/UnsealedTsFileRecoverPerformerTest.java   |   62 +
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   17 +-
 thrift-commons/src/main/thrift/common.thrift       |   16 +-
 .../src/main/thrift/confignode.thrift              |   30 +-
 .../iotdb/tsfile/common/conf/TSFileConfig.java     |   22 +
 .../file/metadata/statistics/Statistics.java       |    5 +
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |   12 +-
 .../iotdb/tsfile/read/common/block/TsBlock.java    |    4 +
 .../tsfile/read/common/block/TsBlockBuilder.java   |    6 +-
 .../read/common/block/TsBlockBuilderStatus.java    |    4 +-
 .../tsfile/read/common/block/TsBlockUtil.java      |   59 +
 218 files changed, 5028 insertions(+), 4393 deletions(-)