You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2022/11/24 07:18:59 UTC
[iotdb] 01/01: merge with upstream/mastere
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch IOTDB-5029
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 072fa2ffa674486e7f66ede0a9cf73a114732ccd
Merge: 5cd92b3122 24de040d1f
Author: Liu Xuxin <li...@outlook.com>
AuthorDate: Thu Nov 24 15:18:46 2022 +0800
merge with upstream/mastere
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 203 +-
.../resources/conf/iotdb-confignode.properties | 4 -
.../client/sync/SyncDataNodeClientPool.java | 14 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 51 +-
.../confignode/conf/ConfigNodeDescriptor.java | 37 +-
.../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 | 6 +-
.../manager/load/LoadManagerMetrics.java | 10 +-
.../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/metric/NodeInfoMetrics.java | 4 +-
.../persistence/metric/PartitionInfoMetrics.java | 14 +-
.../persistence/partition/PartitionInfo.java | 8 +-
.../persistence/schema/ClusterSchemaInfo.java | 20 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 45 +-
.../procedure/env/DataNodeRemoveHandler.java | 28 +-
.../impl/node/RemoveDataNodeProcedure.java | 2 +-
.../statemachine/CreateRegionGroupsProcedure.java | 13 +-
.../iotdb/confignode/service/ConfigNode.java | 7 +-
.../thrift/ConfigNodeRPCServiceHandlerMetrics.java | 2 +-
.../thrift/ConfigNodeRPCServiceMetrics.java | 2 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 4 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 8 +-
.../router/leader/GreedyLeaderBalancerTest.java | 146 +
.../leader/LeaderBalancerComparisonTest.java | 369 +++
.../MinCostFlowLeaderBalancerTest.java} | 33 +-
.../GreedyPriorityTest.java} | 8 +-
.../LeaderPriorityBalancerTest.java} | 56 +-
.../common/request/IndexedConsensusRequest.java | 27 +-
.../iotdb/consensus/config/MultiLeaderConfig.java | 63 +-
.../multileader/MultiLeaderConsensus.java | 4 +-
.../multileader/MultiLeaderServerImpl.java | 2 +-
.../multileader/MultiLeaderServerMetrics.java | 4 +-
.../multileader/logdispatcher/LogDispatcher.java | 153 +-
.../logdispatcher/LogDispatcherThreadMetrics.java | 4 +-
.../logdispatcher/MultiLeaderMemoryManager.java | 10 +-
.../MultiLeaderMemoryManagerMetrics.java | 2 +-
.../multileader/logdispatcher/PendingBatch.java | 46 +-
.../multileader/logdispatcher/SyncStatus.java | 19 +-
.../service/MultiLeaderRPCServiceProcessor.java | 38 +-
.../multileader/logdispatcher/SyncStatusTest.java | 21 +-
docs/UserGuide/API/RestService.md | 60 +-
docs/UserGuide/Cluster/Cluster-Concept.md | 15 +
docs/UserGuide/Cluster/Cluster-Setup.md | 228 +-
.../Ecosystem-Integration/Grafana-Plugin.md | 2 +-
docs/UserGuide/FAQ/Frequently-asked-questions.md | 2 +-
.../Maintenance-Tools/Maintenance-Command.md | 234 +-
.../Maintenance-Tools/TsFile-Split-Tool.md | 25 +-
.../{Storage-Group.md => Database.md} | 4 +-
docs/UserGuide/Operate-Metadata/Timeseries.md | 4 +-
docs/UserGuide/Query-Data/Overview.md | 17 +-
docs/UserGuide/QuickStart/Files.md | 15 +-
.../Reference/ConfigNode-Config-Manual.md | 86 +-
docs/UserGuide/Reference/DataNode-Config-Manual.md | 96 +-
docs/UserGuide/{API => Reference}/Status-Codes.md | 0
docs/UserGuide/Write-Data/REST-API.md | 6 +-
docs/zh/UserGuide/API/RestService.md | 74 +-
docs/zh/UserGuide/Cluster/Cluster-Concept.md | 15 +
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 231 +-
.../Ecosystem-Integration/Grafana-Plugin.md | 2 +-
.../zh/UserGuide/FAQ/Frequently-asked-questions.md | 2 +-
.../Maintenance-Tools/Maintenance-Command.md | 229 +-
.../Maintenance-Tools/TsFile-Split-Tool.md | 20 +-
.../{Storage-Group.md => Database.md} | 6 +-
docs/zh/UserGuide/Operate-Metadata/Template.md | 2 +-
docs/zh/UserGuide/Operate-Metadata/Timeseries.md | 14 +-
docs/zh/UserGuide/Query-Data/Overview.md | 18 +-
docs/zh/UserGuide/QuickStart/Files.md | 14 +-
.../Reference/ConfigNode-Config-Manual.md | 177 +-
.../UserGuide/Reference/DataNode-Config-Manual.md | 210 +-
.../UserGuide/{API => Reference}/Status-Codes.md | 0
docs/zh/UserGuide/Write-Data/REST-API.md | 6 +-
grafana-plugin/go.sum | 2 +-
grafana-plugin/pkg/plugin/plugin.go | 8 +-
.../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 +-
.../it/IoTDBSyntaxConventionStringLiteralIT.java | 2 +-
.../db/it/alignbydevice/IoTDBAlignByDeviceIT.java | 75 +-
.../dropwizard/DropwizardMetricManager.java | 3 +-
.../dropwizard/type/DropwizardAutoGauge.java | 19 +-
.../iotdb/metrics/AbstractMetricManager.java | 134 +-
.../iotdb/metrics/AbstractMetricService.java | 204 +-
.../iotdb/metrics/DoNothingMetricService.java | 8 +-
.../apache/iotdb/metrics/config/MetricConfig.java | 255 +-
.../metrics/config/MetricConfigDescriptor.java | 61 +-
.../apache/iotdb/metrics/config/ReloadLevel.java | 6 +-
.../DoNothingAutoGauge.java} | 13 +-
.../iotdb/metrics/impl/DoNothingCounter.java | 2 +-
.../apache/iotdb/metrics/impl/DoNothingGauge.java | 2 +-
.../iotdb/metrics/impl/DoNothingHistogram.java | 2 +-
.../metrics/impl/DoNothingHistogramSnapshot.java | 2 +-
.../DoNothingMetric.java} | 14 +-
.../iotdb/metrics/impl/DoNothingMetricManager.java | 11 +-
.../apache/iotdb/metrics/impl/DoNothingRate.java | 2 +-
.../apache/iotdb/metrics/impl/DoNothingTimer.java | 2 +-
.../metricsets/jvm/JvmClassLoaderMetrics.java | 4 +-
.../metrics/metricsets/jvm/JvmCompileMetrics.java | 2 +-
.../iotdb/metrics/metricsets/jvm/JvmGcMetrics.java | 4 +-
.../metrics/metricsets/jvm/JvmMemoryMetrics.java | 12 +-
.../metrics/metricsets/jvm/JvmThreadMetrics.java | 8 +-
.../iotdb/metrics/reporter/CompositeReporter.java | 22 +-
.../iotdb/metrics/reporter/InternalReporter.java | 104 +
.../MemoryInternalReporter.java} | 43 +-
.../apache/iotdb/metrics/reporter/Reporter.java | 8 +-
.../OutPutFormat.java => type/AutoGauge.java} | 15 +-
.../org/apache/iotdb/metrics/type/Counter.java | 6 +-
.../java/org/apache/iotdb/metrics/type/Gauge.java | 8 +-
.../org/apache/iotdb/metrics/type/Histogram.java | 6 +-
.../iotdb/metrics/type/HistogramSnapshot.java | 18 +-
.../org/apache/iotdb/metrics/type/IMetric.java | 10 +-
.../java/org/apache/iotdb/metrics/type/Rate.java | 14 +-
.../java/org/apache/iotdb/metrics/type/Timer.java | 10 +-
...OutPutFormat.java => InternalReporterType.java} | 8 +-
.../iotdb/metrics/utils/IoTDBMetricsUtils.java | 27 +
.../org/apache/iotdb/metrics/utils/MetricInfo.java | 11 +-
.../iotdb/metrics/config/MetricConfigTest.java | 118 +-
.../micrometer/MicrometerMetricManager.java | 3 +-
.../micrometer/type/MicrometerAutoGauge.java | 19 +-
.../resources/conf/iotdb-common.properties | 22 +-
.../apache/iotdb/commons/client/ClientManager.java | 2 +-
.../commons/service/metric/MetricService.java | 105 +-
openapi/src/main/openapi3/iotdb-rest.yaml | 17 +-
.../resources/conf/iotdb-datanode.properties | 11 +-
.../tools/tsfile/print-tsfile-visdata.bat | 62 -
.../resources/tools/tsfile/print-tsfile-visdata.sh | 51 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 18 +-
.../iotdb/db/engine/cache/ChunkCacheMetrics.java | 2 +-
.../cache/TimeSeriesMetadataCacheMetrics.java | 4 +-
.../iotdb/db/engine/flush/FlushManagerMetrics.java | 4 +-
.../db/engine/storagegroup/DataRegionMetrics.java | 2 +-
.../storagegroup/TsFileProcessorInfoMetrics.java | 2 +-
.../metadata/cache/DataNodeSchemaCacheMetrics.java | 2 +-
.../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 +-
.../rescon/SchemaStatisticsManagerMetrics.java | 2 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 6 +-
.../iotdb/db/mpp/execution/driver/DataDriver.java | 4 +-
.../exchange/MPPDataExchangeServiceMetrics.java | 2 +-
...MppDataExchangeServiceThriftHandlerMetrics.java | 2 +-
.../operator/process/AbstractIntoOperator.java | 21 +-
.../operator/process/DeviceViewIntoOperator.java | 2 +-
.../operator/process/DeviceViewOperator.java | 16 +-
.../execution/operator/process/IntoOperator.java | 2 +-
.../operator/process/last/LastQueryOperator.java | 6 +-
.../iotdb/db/mpp/plan/analyze/TypeProvider.java | 7 -
.../db/mpp/plan/execution/QueryExecution.java | 2 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 635 ++--
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 19 +-
.../planner/distribution/DistributionPlanner.java | 2 +-
.../planner/distribution/ExchangeNodeAdder.java | 111 +
.../db/mpp/plan/planner/plan/node/PlanNode.java | 16 +-
.../plan/node/write/InsertMultiTabletsNode.java | 2 +-
.../plan/planner/plan/node/write/InsertNode.java | 7 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 3 +
.../rest/handler/RequestValidationHandler.java | 14 +-
.../rest/handler/StatementConstructionHandler.java | 2 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 3396 --------------------
.../iotdb/db/qp/strategy/LogicalGenerator.java | 51 +-
.../pool/RawQueryReadTaskPoolManagerMetrics.java | 4 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 15 +-
.../service/DataNodeInternalRPCServiceMetrics.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 12 +
.../org/apache/iotdb/db/service/RPCService.java | 8 +-
.../apache/iotdb/db/service/RPCServiceMetrics.java | 2 +-
.../db/service/metrics/DataNodeMetricsHelper.java | 14 +-
.../iotdb/db/service/metrics/FileMetrics.java | 16 +-
.../db/service/metrics/IoTDBInternalReporter.java | 172 +
.../iotdb/db/service/metrics/ProcessMetrics.java | 18 +-
.../iotdb/db/service/metrics/SystemMetrics.java | 16 +-
.../metrics/recorder/CacheMetricsRecorder.java | 2 +-
.../recorder/CompactionMetricsRecorder.java | 4 +-
.../InternalServiceThriftHandlerMetrics.java | 2 +-
.../handler/RPCServiceThriftHandlerMetrics.java | 2 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 61 +-
.../db/tools/schema/SchemaFileSketchTool.java | 3 +-
.../iotdb/db/tools/vis/TsFileExtractVisdata.java | 170 -
.../main/java/org/apache/iotdb/db/tools/vis/vis.m | 290 --
.../metadata/mtree/schemafile/SchemaFileTest.java | 3 +-
.../apache/iotdb/db/metric/MetricServiceTest.java | 11 +-
.../operator/DeviceCompactOperatorTest.java | 9 +
.../execution/operator/DeviceViewOperatorTest.java | 3 +
.../mpp/execution/operator/OperatorMemoryTest.java | 4 +-
.../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java | 3 +
.../distribution/AggregationDistributionTest.java | 34 +-
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 3 +
.../iotdb/db/qp/logical/LogicalPlanSmallTest.java | 3 +
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 3 +
.../org/apache/iotdb/db/qp/sql/ASTVisitorTest.java | 66 +-
.../iotdb/db/qp/sql/IoTDBsqlVisitorTest.java | 99 -
.../iotdb/db/query/dataset/ListDataSetTest.java | 3 +
.../iotdb/db/tools/SchemaFileSketchTest.java | 14 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 2 -
.../iotdb/db/utils/TsFileRewriteToolTest.java | 6 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 4 +-
.../java/org/apache/iotdb/session/Session.java | 9 +-
site/src/main/.vuepress/config.js | 8 +-
thrift-commons/src/main/thrift/common.thrift | 1 +
.../src/main/thrift/confignode.thrift | 5 +-
.../src/main/thrift/mutlileader.thrift | 2 +-
thrift/src/main/thrift/client.thrift | 1 +
thrift/src/main/thrift/datanode.thrift | 6 +-
225 files changed, 4399 insertions(+), 7073 deletions(-)