You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/11/24 11:35:54 UTC
[iotdb] 02/05: merge master
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/fix_remove_node_problem_1123
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 65b6eee4212c59978e7d30a8039a499bde9b0d20
Merge: 887a4d42f1 03c826930a
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed Nov 23 23:23:26 2022 +0800
merge master
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 20 +-
confignode/src/assembly/confignode.xml | 4 -
.../resources/conf/iotdb-confignode.properties | 68 ++-
.../confignode/client/ConfigNodeRequestType.java | 2 +-
.../client/sync/SyncConfigNodeClientPool.java | 5 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 51 +-
.../confignode/conf/ConfigNodeDescriptor.java | 38 +-
.../confignode/conf/ConfigNodeStartupCheck.java | 23 +-
.../consensus/request/ConfigPhysicalPlan.java | 6 +-
.../consensus/request/ConfigPhysicalPlanType.java | 2 +-
.../write/region/CreateRegionGroupsPlan.java | 19 +
...tPlan.java => AdjustMaxRegionGroupNumPlan.java} | 46 +-
.../confignode/manager/ClusterSchemaManager.java | 80 +--
.../iotdb/confignode/manager/ConfigManager.java | 9 +-
.../iotdb/confignode/manager/ConsensusManager.java | 52 +-
.../manager/load/balancer/RegionBalancer.java | 1 +
.../manager/load/balancer/RouteBalancer.java | 117 ++--
.../manager/load/balancer/router/LeaderRouter.java | 90 ----
.../router/leader/GreedyLeaderBalancer.java | 186 +++++++
.../{IRouter.java => leader/ILeaderBalancer.java} | 30 +-
.../MinCostFlowLeaderBalancer.java} | 100 +++-
.../manager/load/balancer/router/mcf/MCFEdge.java | 34 --
.../GreedyPriorityBalancer.java} | 65 ++-
.../IPriorityBalancer.java} | 24 +-
.../LeaderPriorityBalancer.java} | 49 +-
.../iotdb/confignode/manager/node/NodeManager.java | 2 +-
.../manager/partition/PartitionManager.java | 60 ++-
.../persistence/executor/ConfigPlanExecutor.java | 6 +-
.../persistence/partition/PartitionInfo.java | 7 +-
.../persistence/schema/ClusterSchemaInfo.java | 20 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 73 ++-
.../procedure/env/DataNodeRemoveHandler.java | 1 -
.../impl/node/AddConfigNodeProcedure.java | 38 +-
.../impl/schema/DeactivateTemplateProcedure.java | 6 +-
.../impl/schema/DeleteTimeSeriesProcedure.java | 6 +-
.../impl/schema/UnsetTemplateProcedure.java | 4 +-
.../statemachine/CreateRegionGroupsProcedure.java | 13 +-
.../procedure/state/AddConfigNodeState.java | 3 +-
.../iotdb/confignode/service/ConfigNode.java | 7 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 12 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 8 +-
.../router/leader/GreedyLeaderBalancerTest.java | 146 +++++
.../leader/LeaderBalancerComparisonTest.java | 369 +++++++++++++
.../MinCostFlowLeaderBalancerTest.java} | 33 +-
.../GreedyPriorityTest.java} | 8 +-
.../LeaderPriorityBalancerTest.java} | 56 +-
.../confignode1conf/iotdb-confignode-metric.yml | 48 --
.../confignode1conf/iotdb-confignode.properties | 10 +-
.../confignode2conf/iotdb-confignode-metric.yml | 48 --
.../confignode2conf/iotdb-confignode.properties | 10 +-
.../confignode3conf/iotdb-confignode-metric.yml | 48 --
.../confignode3conf/iotdb-confignode.properties | 10 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 44 +-
.../iotdb/consensus/ratis/RatisConsensusTest.java | 23 +-
distribution/src/assembly/all.xml | 12 -
distribution/src/assembly/confignode.xml | 6 -
distribution/src/assembly/datanode.xml | 8 -
docs/UserGuide/Cluster/Cluster-Concept.md | 4 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 66 +--
docs/UserGuide/Data-Concept/Deadband-Process.md | 2 +-
docs/UserGuide/Data-Concept/Schema-Template.md | 15 +
.../{Write-Data => Maintenance-Tools}/CSV-Tool.md | 0
.../Maintenance-Tools/Maintenance-Command.md | 126 ++---
docs/UserGuide/Maintenance-Tools/NodeTool.md | 297 -----------
.../TsFile-Load-Export-Tool.md} | 0
docs/UserGuide/Monitor-Alert/Metric-Tool.md | 68 +--
.../{Storage-Group.md => Database.md} | 4 +-
docs/UserGuide/Operate-Metadata/Template.md | 2 +-
docs/UserGuide/Operate-Metadata/Timeseries.md | 4 +-
docs/UserGuide/Reference/Keywords.md | 401 +++++++-------
docs/UserGuide/Reference/SQL-Reference.md | 12 +-
docs/UserGuide/Reference/Syntax-Conventions.md | 587 ---------------------
.../Syntax-Conventions/Detailed-Grammar.md | 28 +
docs/UserGuide/Syntax-Conventions/Identifier.md | 141 +++++
docs/UserGuide/Syntax-Conventions/KeyValue-Pair.md | 119 +++++
.../Keywords-And-Reserved-Words.md | 26 +
.../UserGuide/Syntax-Conventions/Literal-Values.md | 157 ++++++
.../Syntax-Conventions/NodeName-In-Path.md | 119 +++++
.../Syntax-Conventions/Session-And-TsFile-API.md | 119 +++++
docs/UserGuide/Write-Data/Batch-Load-Tool.md | 32 ++
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 49 +-
docs/zh/UserGuide/Data-Concept/Deadband-Process.md | 2 +-
docs/zh/UserGuide/Data-Concept/Schema-Template.md | 15 +
.../{Write-Data => Maintenance-Tools}/CSV-Tool.md | 2 +-
.../Maintenance-Tools/Maintenance-Command.md | 120 ++---
docs/zh/UserGuide/Maintenance-Tools/NodeTool.md | 293 ----------
.../TsFile-Load-Export-Tool.md} | 0
docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 67 +--
.../{Storage-Group.md => Database.md} | 6 +-
docs/zh/UserGuide/Operate-Metadata/Template.md | 4 +-
docs/zh/UserGuide/Operate-Metadata/Timeseries.md | 14 +-
docs/zh/UserGuide/Reference/Keywords.md | 401 +++++++-------
docs/zh/UserGuide/Reference/SQL-Reference.md | 12 +-
docs/zh/UserGuide/Reference/Syntax-Conventions.md | 586 --------------------
.../Syntax-Conventions/Detailed-Grammar.md | 28 +
docs/zh/UserGuide/Syntax-Conventions/Identifier.md | 142 +++++
.../UserGuide/Syntax-Conventions/KeyValue-Pair.md | 119 +++++
.../Keywords-And-Reserved-Words.md | 26 +
.../UserGuide/Syntax-Conventions/Literal-Values.md | 150 ++++++
.../Syntax-Conventions/NodeName-In-Path.md | 120 +++++
.../Syntax-Conventions/Session-And-TsFile-API.md | 119 +++++
docs/zh/UserGuide/Write-Data/Batch-Load-Tool.md | 32 ++
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 9 +
.../java/org/apache/iotdb/it/env/MppConfig.java | 7 +
.../org/apache/iotdb/itbase/env/BaseConfig.java | 8 +
.../it/IoTDBClusterRegionLeaderBalancingIT.java | 26 +-
.../iotdb/confignode/it/IoTDBClusterRestartIT.java | 8 +-
.../it/partition/IoTDBPartitionGetterIT.java | 55 +-
.../partition/IoTDBPartitionInheritPolicyTest.java | 3 +-
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 2 +-
.../db/it/alignbydevice/IoTDBAlignByDeviceIT.java | 75 +--
.../db/it/aligned/IoTDBGroupByLevelQueryIT.java | 39 +-
.../db/it/schema/IoTDBCreateTimeseriesIT.java | 2 +-
.../db/it/schema/IoTDBDeactivateTemplateIT.java | 8 +-
.../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 2 +-
.../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 4 +-
.../db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java | 20 +
metrics/ReadMe.md | 29 +-
.../reporter/DropwizardPrometheusReporter.java | 2 +-
.../resources/conf/iotdb-confignode-metric.yml | 49 --
.../resources/conf/iotdb-datanode-metric.yml | 49 --
.../iotdb/metrics/AbstractMetricService.java | 6 +-
.../apache/iotdb/metrics/config/MetricConfig.java | 41 +-
.../metrics/config/MetricConfigDescriptor.java | 186 ++++---
.../iotdb/metrics/config/MetricConstant.java | 37 --
.../{MonitorType.java => MetricFrameType.java} | 2 +-
.../iotdb/metrics/config/MetricConfigTest.java | 79 +--
.../interface/src/test/resources/iotdb-metric.yml | 52 --
.../reporter/MicrometerPrometheusReporter.java | 4 +-
.../resources/conf/iotdb-common.properties | 22 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 16 +
.../schemaregion/rocksdb/RSchemaRegion.java | 33 +-
.../metadata/tagSchemaRegion/TagSchemaRegion.java | 18 +-
.../resources/conf/iotdb-datanode.properties | 65 +++
.../assembly/resources/tools/rocksdb-transfer.bat | 126 -----
.../assembly/resources/tools/rocksdb-transfer.sh | 82 ---
server/src/assembly/server.xml | 4 -
.../apache/iotdb/db/client/ConfigNodeClient.java | 5 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 +-
.../iotdb/db/metadata/LocalSchemaProcessor.java | 18 -
.../iotdb/db/metadata/mtree/ConfigMTree.java | 2 +-
.../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 20 +-
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 20 +-
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 20 +-
.../store/disk/schemafile/AliasIndexPage.java | 2 +-
.../mtree/store/disk/schemafile/InternalPage.java | 2 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 40 +-
.../disk/schemafile/pagemgr/IPageManager.java | 5 +-
.../store/disk/schemafile/pagemgr/PageManager.java | 10 +-
.../mtree/traverser/counter/CounterTraverser.java | 4 +-
.../counter/MeasurementGroupByLevelCounter.java | 12 +-
.../db/metadata/schemaregion/ISchemaRegion.java | 19 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 29 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 27 +-
.../metadata/visitor/SchemaExecutionVisitor.java | 4 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 8 +-
.../iotdb/db/mpp/execution/driver/DataDriver.java | 4 +-
.../operator/process/AbstractIntoOperator.java | 21 +-
.../operator/process/DeviceViewIntoOperator.java | 2 +-
.../operator/process/DeviceViewOperator.java | 16 +-
.../execution/operator/process/IntoOperator.java | 2 +-
.../operator/schema/CountMergeOperator.java | 18 +-
.../operator/schema/DevicesCountOperator.java | 4 +-
.../schema/LevelTimeSeriesCountOperator.java | 4 +-
.../operator/schema/NodePathsCountOperator.java | 2 +-
.../operator/schema/TimeSeriesCountOperator.java | 4 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 62 ++-
.../memory/StatementMemorySourceVisitor.java | 6 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 25 +-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 19 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 28 +-
.../recorder/CompactionMetricsRecorder.java | 4 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 41 +-
.../db/tools/schema/SchemaFileSketchTool.java | 3 +-
.../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 27 +-
.../metadata/mtree/schemafile/SchemaFileTest.java | 3 +-
.../apache/iotdb/db/metric/MetricServiceTest.java | 6 +-
.../operator/DeviceMergeOperatorTest.java | 9 +
.../execution/operator/DeviceViewOperatorTest.java | 3 +
.../operator/schema/CountMergeOperatorTest.java | 8 +-
.../operator/schema/SchemaCountOperatorTest.java | 10 +-
.../iotdb/db/tools/SchemaFileSketchTest.java | 14 +-
.../datanode1conf/iotdb-datanode-metric.yml | 48 --
.../datanode1conf/iotdb-datanode.properties | 8 +
.../datanode2conf/iotdb-datanode-metric.yml | 48 --
.../datanode2conf/iotdb-datanode.properties | 8 +
.../datanode3conf/iotdb-datanode-metric.yml | 48 --
.../datanode3conf/iotdb-datanode.properties | 10 +-
.../java/org/apache/iotdb/session/Session.java | 9 +-
site/src/main/.vuepress/config.js | 36 +-
thrift-commons/src/main/thrift/common.thrift | 1 +
.../src/main/thrift/confignode.thrift | 8 +-
thrift/src/main/thrift/client.thrift | 1 +
thrift/src/main/thrift/datanode.thrift | 8 +-
.../iotdb/udf/api/collector/PointCollector.java | 4 +-
195 files changed, 4483 insertions(+), 4421 deletions(-)
diff --cc docs/UserGuide/Cluster/Cluster-Setup.md
index 98c8539321,edeece8026..16b61c6cb9
--- a/docs/UserGuide/Cluster/Cluster-Setup.md
+++ b/docs/UserGuide/Cluster/Cluster-Setup.md
@@@ -127,9 -129,9 +129,9 @@@ The adding ConfigNode also use the star
### Start DataNode
-You could add any number of DataNode.
+You could add no less than the number of data/schema_replication_factor DataNode.
- Please set the important parameters in iotdb-datanode.properties.
+ Please set the important parameters in iotdb-datanode.properties:
| **Configuration** | **Description** |
|-------------------------------------|--------------------------------------------------|