This is an automated email from the ASF dual-hosted git repository. yongzao pushed a commit to branch Move-ConfigNodeConfig-into-CommonConfig in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1611727710f290373c45bf6d3e0f60813888a442 Merge: 342f3b8e65 4f1409df4d Author: YongzaoDan <[email protected]> AuthorDate: Wed Jan 11 14:53:11 2023 +0800 Merge branch 'master' into Move-ConfigNodeConfig-into-CommonConfig Jenkinsfile | 42 +- antlr/pom.xml | 2 +- cli/pom.xml | 2 +- client-cpp/pom.xml | 2 +- client-py/pom.xml | 2 +- code-coverage/pom.xml | 2 +- compile-tools/pom.xml | 2 +- compile-tools/thrift/pom.xml | 2 +- confignode/pom.xml | 2 +- .../resources/conf/iotdb-confignode.properties | 11 + .../iotdb/confignode/conf/ConfigNodeConfig.java | 2 +- .../iotdb/confignode/conf/ConfigNodeConstant.java | 1 + .../iotdb/confignode/manager/ConsensusManager.java | 10 +- .../iotdb/confignode/manager/ProcedureManager.java | 2 +- .../persistence/schema/ClusterSchemaInfo.java | 14 - .../procedure/env/DataNodeRemoveHandler.java | 15 +- .../impl/statemachine/RegionMigrateProcedure.java | 15 +- consensus/pom.xml | 2 +- .../iotdb/consensus/config/ConsensusConfig.java | 9 +- .../iotdb/consensus/config/IoTConsensusConfig.java | 40 +- .../apache/iotdb/consensus/config/RatisConfig.java | 219 +++++--- .../iot/client/IoTConsensusClientPool.java | 14 +- .../apache/iotdb/consensus/ratis/RatisClient.java | 10 +- .../iotdb/consensus/ratis/RatisConsensus.java | 12 +- .../iotdb/consensus/ratis/RatisConsensusTest.java | 2 +- distribution/pom.xml | 2 +- .../Apache-IoTDB-ConfigNode-Dashboard.json | 2 +- .../Apache-IoTDB-DataNode-Dashboard.json | 6 +- docs/UserGuide/Reference/Common-Config-Manual.md | 16 +- .../Reference/ConfigNode-Config-Manual.md | 18 + docs/UserGuide/Reference/DataNode-Config-Manual.md | 18 + docs/UserGuide/Reference/Status-Codes.md | 15 +- .../zh/UserGuide/Reference/Common-Config-Manual.md | 16 +- .../Reference/ConfigNode-Config-Manual.md | 20 +- .../UserGuide/Reference/DataNode-Config-Manual.md | 18 + docs/zh/UserGuide/Reference/Status-Codes.md | 249 +++++----- example/client-cpp-example/pom.xml | 2 +- example/ext-pipe-plugin-example/pom.xml | 4 +- example/flink/pom.xml | 2 +- example/hadoop/pom.xml | 2 +- example/influxdb-protocol-example/pom.xml | 2 +- example/jdbc/pom.xml | 2 +- example/kafka/pom.xml | 2 +- example/mqtt-customize/pom.xml | 2 +- example/mqtt/pom.xml | 2 +- example/pom.xml | 2 +- example/pulsar/pom.xml | 2 +- example/rabbitmq/pom.xml | 2 +- example/rest-java-example/pom.xml | 2 +- example/rocketmq/pom.xml | 2 +- example/session/pom.xml | 2 +- example/trigger/pom.xml | 2 +- example/tsfile/pom.xml | 2 +- example/udf/pom.xml | 2 +- external-api/pom.xml | 2 +- external-pipe-api/pom.xml | 2 +- flink-iotdb-connector/pom.xml | 2 +- flink-tsfile-connector/pom.xml | 2 +- grafana-connector/pom.xml | 2 +- grafana-plugin/pom.xml | 2 +- hadoop/pom.xml | 2 +- hive-connector/pom.xml | 2 +- influxdb-protocol/pom.xml | 2 +- integration-test/pom.xml | 5 +- .../apache/iotdb/it/env/cluster/AbstractEnv.java | 15 +- .../iotdb/it/env/cluster/AbstractNodeWrapper.java | 36 +- .../iotdb/it/env/cluster/ConfigNodeWrapper.java | 19 +- .../iotdb/it/env/cluster/DataNodeWrapper.java | 9 + .../org/apache/iotdb/it/env/cluster/EnvUtils.java | 25 +- .../iotdb/it/env/cluster/MppClusterConfig.java | 15 + .../apache/iotdb/it/env/cluster/MppJVMConfig.java | 116 +++++ .../iotdb/it/env/remote/RemoteClusterConfig.java | 12 + .../iotdb/it/env/remote/RemoteJVMConfig.java | 19 +- .../org/apache/iotdb/itbase/env/ClusterConfig.java | 30 +- .../org/apache/iotdb/itbase/env/JVMConfig.java | 53 +- .../it/cluster/IoTDBClusterNodeErrorStartUpIT.java | 6 +- .../it/cluster/IoTDBClusterRestartIT.java | 3 +- .../it/partition/IoTDBPartitionGetterIT.java | 94 ++-- integration/pom.xml | 2 +- .../iotdb/db/integration/IoTDBCheckConfigIT.java | 3 - isession/pom.xml | 2 +- jdbc/pom.xml | 2 +- library-udf/pom.xml | 2 +- metrics/dropwizard-metrics/pom.xml | 2 +- .../type/DropwizardHistogramSnapshot.java | 14 +- metrics/interface/pom.xml | 2 +- .../metrics/impl/DoNothingHistogramSnapshot.java | 12 +- .../iotdb/metrics/type/HistogramSnapshot.java | 6 +- metrics/micrometer-metrics/pom.xml | 4 +- .../type/MicrometerHistogramSnapshot.java | 14 +- .../metrics/micrometer/type/MicrometerTimer.java | 2 +- ....java => MicrometerTimerHistogramSnapshot.java} | 30 +- metrics/pom.xml | 2 +- mlnode/.flake8 | 33 ++ mlnode/.gitignore | 5 + external-pipe-api/pom.xml => mlnode/README.md | 42 +- mlnode/iotdb/__init__.py | 17 + mlnode/iotdb/mlnode/__init__.py | 17 + mlnode/iotdb/mlnode/client.py | 51 ++ mlnode/iotdb/mlnode/config.py | 107 ++++ mlnode/iotdb/mlnode/constant.py | 21 + mlnode/iotdb/mlnode/exception.py | 26 + mlnode/iotdb/mlnode/handler.py | 53 ++ mlnode/iotdb/mlnode/log.py | 34 ++ mlnode/iotdb/mlnode/script.py | 36 ++ mlnode/iotdb/mlnode/service.py | 60 +++ mlnode/iotdb/mlnode/util.py | 48 ++ mlnode/pom.xml | 2 +- mlnode/pyproject.toml | 54 ++ mlnode/resources/conf/iotdb-mlnode.toml | 50 ++ mlnode/resources/conf/logging_config.ini | 40 ++ node-commons/pom.xml | 2 +- .../resources/conf/iotdb-common.properties | 4 +- .../apache/iotdb/commons/client/ClientManager.java | 7 +- .../iotdb/commons/client/ClientPoolFactory.java | 30 +- .../iotdb/commons/client/IClientManager.java | 8 +- .../client/property/ClientPoolProperty.java | 34 +- .../iotdb/commons/concurrent/ThreadName.java | 4 +- .../apache/iotdb/commons/conf/CommonConfig.java | 1 + .../commons/schema/tree/AbstractTreeVisitor.java | 92 +++- .../iotdb/commons/schema/tree/ITreeNode.java | 4 +- .../apache/iotdb/commons/utils/StatusUtils.java | 4 +- .../iotdb/commons/client/ClientManagerTest.java | 10 +- openapi/pom.xml | 2 +- pom.xml | 3 +- rewrite-tsfile-tool/pom.xml | 2 +- schema-engine-rocksdb/pom.xml | 2 +- .../schemaregion/rocksdb/RSchemaRegion.java | 126 +---- .../schemaregion/rocksdb/mnode/RMNode.java | 5 + schema-engine-tag/pom.xml | 2 +- .../metadata/tagSchemaRegion/TagSchemaRegion.java | 70 +-- server/pom.xml | 2 +- .../resources/conf/iotdb-datanode.properties | 16 +- .../apache/iotdb/db/audit/AuditLogOperation.java | 14 +- .../org/apache/iotdb/db/audit/AuditLogStorage.java | 12 +- .../org/apache/iotdb/db/audit/AuditLogger.java | 236 +++++++++ .../iotdb/db/client/DataNodeClientPoolFactory.java | 10 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 98 +++- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 23 +- .../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 6 + .../db/consensus/DataRegionConsensusImpl.java | 28 +- .../db/consensus/SchemaRegionConsensusImpl.java | 28 +- .../execute/task/CrossSpaceCompactionTask.java | 27 +- .../execute/task/InnerSpaceCompactionTask.java | 29 +- .../fast/AlignedSeriesCompactionExecutor.java | 8 - .../fast/NonAlignedSeriesCompactionExecutor.java | 2 - .../readchunk/AlignedSeriesCompactionExecutor.java | 9 +- .../readchunk/SingleSeriesCompactionExecutor.java | 11 +- .../utils/writer/AbstractCompactionWriter.java | 12 +- .../compaction/schedule/CompactionTaskManager.java | 15 +- .../iotdb/db/localconfignode/LocalConfigNode.java | 294 ----------- .../db/localconfignode/LocalDataPartitionInfo.java | 111 ----- .../localconfignode/LocalDataPartitionTable.java | 127 ----- .../localconfignode/LocalSchemaPartitionTable.java | 122 ----- .../iotdb/db/metadata/LocalSchemaProcessor.java | 250 ---------- .../idtable/entry/InsertMeasurementMNode.java | 5 + .../db/metadata/mnode/AboveDatabaseMNode.java | 20 +- .../org/apache/iotdb/db/metadata/mnode/IMNode.java | 7 +- .../iotdb/db/metadata/mnode/InternalMNode.java | 5 + .../iotdb/db/metadata/mnode/MeasurementMNode.java | 5 + .../mnode/iterator/AbstractTraverserIterator.java | 115 +++++ .../iterator/CachedTraverserIterator.java} | 27 +- .../iterator/MemoryTraverserIterator.java} | 22 +- .../iotdb/db/metadata/mtree/ConfigMTree.java | 250 ++++------ .../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 68 +-- .../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 483 +++++++++--------- .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 492 ++++++++++-------- .../db/metadata/mtree/store/CachedMTreeStore.java | 18 + .../iotdb/db/metadata/mtree/store/IMTreeStore.java | 6 + .../db/metadata/mtree/store/MemMTreeStore.java | 19 + .../db/metadata/mtree/traverser/Traverser.java | 452 ++--------------- .../traverser/TraverserWithLimitOffsetWrapper.java | 122 +++++ .../DatabaseTraverser.java} | 49 +- .../EntityTraverser.java} | 60 ++- .../mtree/traverser/basic/MNodeTraverser.java | 103 ++++ .../MeasurementTraverser.java} | 41 +- .../traverser/collector/CollectorTraverser.java | 96 ---- ...eGroupCollector.java => DatabaseCollector.java} | 38 +- .../mtree/traverser/collector/EntityCollector.java | 48 +- .../traverser/collector/MNodeAboveSGCollector.java | 25 +- .../mtree/traverser/collector/MNodeCollector.java | 58 +-- .../traverser/collector/MeasurementCollector.java | 58 +-- .../metadata/mtree/traverser/counter/Counter.java | 8 +- ...orageGroupCounter.java => DatabaseCounter.java} | 31 +- ...StorageGroupCounter.java => EntityCounter.java} | 29 +- .../mtree/traverser/updater/EntityUpdater.java | 65 +++ .../traverser/updater/MeasurementUpdater.java | 66 +++ .../metadata/mtree/traverser/updater/Updater.java | 11 +- .../impl/read/SchemaRegionReadPlanFactory.java | 10 + .../schemaregion/impl/read/ShowNodesPlanImpl.java | 20 +- .../plan/schemaregion/read/IShowNodesPlan.java | 7 +- .../plan/schemaregion/result/ShowNodesResult.java | 42 +- .../schemaregion/result/ShowTimeSeriesResult.java | 10 +- .../db/metadata/query/info/INodeSchemaInfo.java | 8 +- .../metadata/query/info/ITimeSeriesSchemaInfo.java | 5 +- .../db/metadata/schemaregion/ISchemaRegion.java | 99 +--- .../db/metadata/schemaregion/SchemaEngine.java | 3 +- .../schemaregion/SchemaRegionMemoryImpl.java | 242 ++++----- .../schemaregion/SchemaRegionSchemaFileImpl.java | 195 +++----- .../storagegroup/IStorageGroupSchemaManager.java | 53 -- .../storagegroup/StorageGroupSchemaManager.java | 78 --- .../apache/iotdb/db/metadata/tag/TagManager.java | 3 +- .../iotdb/db/mpp/aggregation/AvgAccumulator.java | 8 +- .../iotdb/db/mpp/aggregation/CountAccumulator.java | 4 +- .../db/mpp/aggregation/ExtremeAccumulator.java | 8 +- .../db/mpp/aggregation/FirstValueAccumulator.java | 12 +- .../mpp/aggregation/FirstValueDescAccumulator.java | 12 +- .../db/mpp/aggregation/LastValueAccumulator.java | 12 +- .../mpp/aggregation/LastValueDescAccumulator.java | 12 +- .../db/mpp/aggregation/MaxTimeAccumulator.java | 2 +- .../db/mpp/aggregation/MaxTimeDescAccumulator.java | 2 +- .../db/mpp/aggregation/MaxValueAccumulator.java | 8 +- .../db/mpp/aggregation/MinTimeAccumulator.java | 2 +- .../db/mpp/aggregation/MinTimeDescAccumulator.java | 2 +- .../db/mpp/aggregation/MinValueAccumulator.java | 8 +- .../iotdb/db/mpp/aggregation/SumAccumulator.java | 8 +- .../visitor/SchemaTreeDeviceVisitor.java | 2 +- .../visitor/SchemaTreeMeasurementVisitor.java | 3 +- .../iotdb/db/mpp/execution/StateMachine.java | 4 +- .../iotdb/db/mpp/execution/driver/DataDriver.java | 37 +- .../db/mpp/execution/driver/DataDriverContext.java | 48 +- .../iotdb/db/mpp/execution/driver/Driver.java | 34 +- .../db/mpp/execution/driver/DriverContext.java | 76 ++- .../iotdb/db/mpp/execution/driver/IDriver.java | 5 +- .../db/mpp/execution/driver/SchemaDriver.java | 5 +- .../mpp/execution/driver/SchemaDriverContext.java | 13 +- .../exchange/IMPPDataExchangeManager.java | 4 +- .../db/mpp/execution/exchange/LocalSinkHandle.java | 25 +- .../mpp/execution/exchange/LocalSourceHandle.java | 27 +- .../execution/exchange/MPPDataExchangeManager.java | 113 ++++- .../mpp/execution/exchange/SharedTsBlockQueue.java | 5 + .../db/mpp/execution/exchange/SinkHandle.java | 2 +- .../db/mpp/execution/exchange/SourceHandle.java | 2 +- .../fragment/FragmentInstanceContext.java | 127 +++-- .../fragment/FragmentInstanceExecution.java | 25 +- .../fragment/FragmentInstanceManager.java | 37 +- .../db/mpp/execution/operator/OperatorContext.java | 32 +- .../operator/factory/OperatorFactory.java} | 26 +- .../operator/factory/SourceOperatorFactory.java | 41 +- .../process/RawDataAggregationOperator.java | 51 +- .../process/SingleInputAggregationOperator.java | 12 +- .../process/SlidingWindowAggregationOperator.java | 11 + .../operator/process/join/TimeJoinOperator.java | 1 - .../last/AbstractUpdateLastCacheOperator.java | 2 +- .../schema/CountGroupByLevelMergeOperator.java | 7 + ...tor.java => CountGroupByLevelScanOperator.java} | 76 +-- .../operator/schema/CountMergeOperator.java | 7 + .../operator/schema/DevicesCountOperator.java | 65 --- .../schema/NodePathsSchemaScanOperator.java | 147 ------ .../operator/schema/SchemaCountOperator.java | 33 +- .../operator/schema/SchemaQueryScanOperator.java | 39 +- .../operator/schema/TimeSeriesCountOperator.java | 85 ---- .../DeviceSchemaSource.java} | 66 +-- .../operator/schema/source/ISchemaSource.java | 50 ++ .../operator/schema/source/NodeSchemaSource.java | 81 +++ .../PathsUsingTemplateSource.java} | 55 +-- .../schema/source/SchemaSourceFactory.java | 78 +++ .../TimeSeriesSchemaSource.java} | 81 ++- .../operator/source/AlignedSeriesScanUtil.java | 3 +- .../operator/source/ExchangeOperator.java | 4 + .../operator/source/SeriesScanOperator.java | 76 ++- .../execution/operator/source/SeriesScanUtil.java | 6 +- .../operator/window/EqualEventBooleanWindow.java} | 25 +- .../window/EqualEventBooleanWindowManager.java | 64 +++ .../operator/window/EqualEventDoubleWindow.java} | 25 +- .../window/EqualEventDoubleWindowManager.java | 64 +++ .../operator/window/EqualEventFloatWindow.java} | 25 +- .../window/EqualEventFloatWindowManager.java | 64 +++ .../operator/window/EqualEventIntWindow.java} | 25 +- .../window/EqualEventIntWindowManager.java | 63 +++ .../operator/window/EqualEventLongWindow.java} | 25 +- .../window/EqualEventLongWindowManager.java | 63 +++ .../operator/window/EqualEventTextWindow.java} | 25 +- .../window/EqualEventTextWindowManager.java | 64 +++ .../operator/window/EventBooleanWindow.java | 66 +++ .../operator/window/EventBooleanWindowManager.java | 46 ++ .../operator/window/EventDoubleWindow.java | 66 +++ .../operator/window/EventDoubleWindowManager.java | 46 ++ .../operator/window/EventFloatWindow.java | 66 +++ .../operator/window/EventFloatWindowManager.java | 46 ++ .../execution/operator/window/EventIntWindow.java | 66 +++ .../operator/window/EventIntWindowManager.java | 46 ++ .../execution/operator/window/EventLongWindow.java | 66 +++ .../operator/window/EventLongWindowManager.java | 46 ++ .../execution/operator/window/EventTextWindow.java | 67 +++ .../operator/window/EventTextWindowManager.java | 46 ++ .../window/{TimeWindow.java => EventWindow.java} | 61 +-- .../operator/window/EventWindowManager.java | 138 ++++++ .../operator/window/EventWindowParameter.java | 61 +++ .../db/mpp/execution/operator/window/IWindow.java | 2 +- .../execution/operator/window/IWindowManager.java | 68 ++- .../mpp/execution/operator/window/TimeWindow.java | 2 +- .../operator/window/TimeWindowManager.java | 73 ++- .../operator/window/TimeWindowParameter.java | 11 +- .../window/VariationEventDoubleWindow.java} | 25 +- .../window/VariationEventDoubleWindowManager.java | 66 +++ .../window/VariationEventFloatWindow.java} | 25 +- .../window/VariationEventFloatWindowManager.java | 66 +++ .../operator/window/VariationEventIntWindow.java} | 25 +- .../window/VariationEventIntWindowManager.java | 66 +++ .../operator/window/VariationEventLongWindow.java} | 25 +- .../window/VariationEventLongWindowManager.java | 66 +++ .../operator/window/WindowManagerFactory.java | 84 ++++ .../operator/window/WindowParameter.java} | 23 +- .../mpp/execution/operator/window/WindowType.java | 19 +- .../execution/schedule/AbstractDriverThread.java | 9 +- .../db/mpp/execution/schedule/DriverScheduler.java | 143 +++--- ...eption.java => DriverTaskAbortedException.java} | 8 +- .../mpp/execution/schedule/DriverTaskThread.java | 12 +- .../schedule/DriverTaskTimeoutSentinelThread.java | 2 +- .../mpp/execution/schedule/IDriverScheduler.java | 7 +- .../schedule/queue/IDIndexedAccessible.java | 2 +- .../schedule/queue/IndexedBlockingQueue.java | 3 +- .../execution/schedule/queue/L1PriorityQueue.java | 10 +- .../execution/schedule/queue/L2PriorityQueue.java | 16 +- .../db/mpp/execution/schedule/task/DriverTask.java | 44 +- .../task/{DriverTaskID.java => DriverTaskId.java} | 49 +- .../db/mpp/plan/execution/QueryExecution.java | 2 +- .../config/executor/ClusterConfigTaskExecutor.java | 81 ++- .../plan/planner/LocalExecutionPlanContext.java | 175 ++++--- .../db/mpp/plan/planner/LocalExecutionPlanner.java | 100 ++-- .../plan/planner/MemoryDistributionCalculator.java | 472 ------------------ .../db/mpp/plan/planner/OperatorTreeGenerator.java | 383 ++++++++------ .../db/mpp/plan/planner/PipelineDriverFactory.java | 59 +++ .../db/mpp/plan/scheduler/ClusterScheduler.java | 2 +- .../scheduler/FragmentInstanceDispatcherImpl.java | 2 +- .../scheduler/load/LoadTsFileDispatcherImpl.java | 4 +- .../iotdb/db/query/control/SessionManager.java | 45 +- .../query/control/clientsession/ClientSession.java | 2 +- .../apache/iotdb/db/service/IoTDBShutdownHook.java | 4 +- .../service/thrift/impl/ClientRPCServiceImpl.java | 117 ++++- .../iotdb/db/engine/MetadataManagerHelper.java | 158 ------ .../compaction/TestUtilsForAlignedSeries.java | 42 +- .../db/engine/compaction/cross/MergeTest.java | 19 - .../inner/AbstractInnerSpaceCompactionTest.java | 19 - .../inner/FastCompactionPerformerAlignedTest.java | 3 - ...nerSeqCompactionWithReadChunkPerformerTest.java | 17 - ...rUnseqCompactionWithReadPointPerformerTest.java | 19 - .../ReadChunkCompactionPerformerAlignedTest.java | 3 - .../inner/sizetiered/SizeTieredCompactionTest.java | 19 - .../recover/SizeTieredCompactionRecoverTest.java | 16 - .../compaction/utils/CompactionConfigRestorer.java | 2 +- .../db/engine/memtable/MemTableFlushTaskTest.java | 2 - .../iotdb/db/metadata/mtree/ConfigMTreeTest.java | 31 -- .../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 69 --- .../schemaRegion/SchemaRegionAliasAndTagTest.java | 32 +- .../schemaRegion/SchemaRegionBasicTest.java | 105 ++-- .../schemaRegion/SchemaRegionManagementTest.java | 43 +- .../schemaRegion/SchemaRegionTemplateTest.java | 64 +++ .../schemaRegion/SchemaRegionTestUtil.java | 67 ++- .../apache/iotdb/db/metric/MetricServiceTest.java | 4 +- .../iotdb/db/mpp/execution/DataDriverTest.java | 52 +- .../execution/exchange/LocalSinkHandleTest.java | 26 +- .../execution/exchange/LocalSourceHandleTest.java | 12 +- .../exchange/MPPDataExchangeManagerTest.java | 8 +- .../mpp/execution/exchange/SourceHandleTest.java | 82 +-- .../operator/AggregationOperatorTest.java | 17 +- .../AlignedSeriesAggregationScanOperatorTest.java | 9 +- .../operator/AlignedSeriesScanOperatorTest.java | 92 ++-- .../execution/operator/AlignedSeriesTestUtil.java | 53 -- .../operator/DeviceMergeOperatorTest.java | 77 ++- .../execution/operator/DeviceViewOperatorTest.java | 16 +- .../mpp/execution/operator/FillOperatorTest.java | 17 +- .../operator/LastQueryMergeOperatorTest.java | 25 +- .../execution/operator/LastQueryOperatorTest.java | 49 +- .../operator/LastQuerySortOperatorTest.java | 49 +- .../mpp/execution/operator/LimitOperatorTest.java | 22 +- .../execution/operator/LinearFillOperatorTest.java | 57 +-- .../execution/operator/MergeSortOperatorTest.java | 205 ++++---- .../mpp/execution/operator/OffsetOperatorTest.java | 73 ++- .../mpp/execution/operator/OperatorMemoryTest.java | 232 ++------- .../operator/RawDataAggregationOperatorTest.java | 549 ++++++++++++++++++++- .../SeriesAggregationScanOperatorTest.java | 8 +- .../execution/operator/SeriesScanOperatorTest.java | 8 +- .../operator/SingleDeviceViewOperatorTest.java | 20 +- .../SlidingWindowAggregationOperatorTest.java | 12 +- .../execution/operator/TimeJoinOperatorTest.java | 56 +-- .../operator/UpdateLastCacheOperatorTest.java | 13 +- .../operator/VerticallyConcatOperatorTest.java | 14 +- .../schema/CountGroupByLevelMergeOperatorTest.java | 76 ++- .../operator/schema/SchemaCountOperatorTest.java | 223 ++------- .../schema/SchemaQueryScanOperatorTest.java | 79 ++- .../schedule/DefaultDriverSchedulerTest.java | 166 ++++--- .../execution/schedule/DriverSchedulerTest.java | 45 +- .../DriverTaskTimeoutSentinelThreadTest.java | 23 +- .../schedule/queue/L1PriorityQueueTest.java | 6 +- .../schedule/queue/L2PriorityQueueTest.java | 12 +- .../mpp/execution/schedule/queue/QueueElement.java | 4 +- .../query/reader/series/SeriesReaderTestUtil.java | 18 + .../iotdb/db/rescon/ResourceManagerTest.java | 19 - .../DataNodeInternalRPCServiceImplTest.java | 11 +- .../db/sync/datasource/PipeOpManagerTest.java | 3 - .../apache/iotdb/db/utils/EnvironmentUtils.java | 14 +- .../org/apache/iotdb/db/utils/SchemaTestUtils.java | 22 +- .../db/wal/recover/WALRecoverManagerTest.java | 32 -- .../db/wal/recover/file/TsFilePlanRedoerTest.java | 53 -- .../file/UnsealedTsFileRecoverPerformerTest.java | 31 -- service-rpc/pom.xml | 2 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + session/pom.xml | 2 +- site/pom.xml | 2 +- spark-iotdb-connector/pom.xml | 2 +- .../apache/iotdb/spark/db/EnvironmentUtils.java | 3 - spark-tsfile/pom.xml | 2 +- testcontainer/pom.xml | 2 +- thrift-commons/pom.xml | 2 +- thrift-confignode/pom.xml | 2 +- thrift-influxdb/pom.xml | 2 +- thrift-iot-consensus/pom.xml | 2 +- thrift-mlnode/pom.xml | 2 +- thrift-mlnode/src/main/thrift/mlnode.thrift | 10 +- thrift/pom.xml | 2 +- trigger-api/pom.xml | 2 +- tsfile/pom.xml | 2 +- udf-api/pom.xml | 2 +- zeppelin-interpreter/pom.xml | 2 +- 416 files changed, 9370 insertions(+), 7496 deletions(-) diff --cc confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java index 08dc667767,1b48ba80b1..991591e99c --- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java @@@ -19,10 -19,13 +19,10 @@@ package org.apache.iotdb.confignode.conf; import org.apache.iotdb.common.rpc.thrift.TEndPoint; - import org.apache.iotdb.commons.conf.CommonDescriptor; + import org.apache.iotdb.commons.client.property.ClientPoolProperty.DefaultProperty; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.confignode.manager.load.balancer.RegionBalancer; -import org.apache.iotdb.confignode.manager.load.balancer.router.leader.ILeaderBalancer; import org.apache.iotdb.confignode.manager.load.balancer.router.priority.IPriorityBalancer; -import org.apache.iotdb.confignode.manager.partition.RegionGroupExtensionPolicy; -import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.rpc.RpcUtils; import java.io.File; diff --cc node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java index d0bde6b9bb,5fcf500672..7731b680a4 --- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java @@@ -18,11 -18,9 +18,12 @@@ */ package org.apache.iotdb.commons.conf; + import org.apache.iotdb.commons.client.property.ClientPoolProperty.DefaultProperty; import org.apache.iotdb.commons.cluster.NodeStatus; +import org.apache.iotdb.commons.consensus.ConsensusProtocolClass; import org.apache.iotdb.commons.enums.HandleSystemErrorStrategy; +import org.apache.iotdb.commons.loadbalance.LeaderDistributionPolicy; +import org.apache.iotdb.commons.loadbalance.RegionGroupExtensionPolicy; import org.apache.iotdb.tsfile.fileSystem.FSType; import org.slf4j.Logger; diff --cc server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java index 8b763fb887,52114a1415..b477637d1c --- a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java +++ b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java @@@ -46,12 -46,12 +46,12 @@@ public class DataNodeClientPoolFactory new ConfigNodeClient.Factory( manager, new ThriftClientProperty.Builder() - .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS()) - .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnable()) + .setConnectionTimeoutMs(conf.getDnConnectionTimeoutInMS()) + .setRpcThriftCompressionEnabled(conf.isDnRpcThriftCompressionEnable()) .build()), new ClientPoolProperty.Builder<ConfigNodeClient>() - .setMaxIdleClientForEachNode(conf.getDnCoreConnectionForInternalService()) - .setMaxTotalClientForEachNode(conf.getDnMaxConnectionForInternalService()) + .setCoreClientNumForEachNode(conf.getCoreClientNumForEachNode()) + .setMaxClientNumForEachNode(conf.getMaxClientNumForEachNode()) .build() .getConfig()); } @@@ -67,14 -67,18 +67,18 @@@ new ConfigNodeClient.Factory( manager, new ThriftClientProperty.Builder() - .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS() * 10) - .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnable()) + .setConnectionTimeoutMs(conf.getDnConnectionTimeoutInMS() * 10) + .setRpcThriftCompressionEnabled(conf.isDnRpcThriftCompressionEnable()) .setSelectorNumOfAsyncClientManager( - conf.getSelectorNumOfClientManager() / 10 > 0 - ? conf.getSelectorNumOfClientManager() / 10 + conf.getDnSelectorThreadCountOfClientManager() / 10 > 0 + ? conf.getDnSelectorThreadCountOfClientManager() / 10 : 1) .build()), - new ClientPoolProperty.Builder<ConfigNodeClient>().build().getConfig()); + new ClientPoolProperty.Builder<ConfigNodeClient>() + .setCoreClientNumForEachNode(conf.getCoreClientNumForEachNode()) + .setMaxClientNumForEachNode(conf.getMaxClientNumForEachNode()) + .build() + .getConfig()); } } } diff --cc server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index 576a6e3412,fd6513a688..ff07d75747 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@@ -225,10 -225,10 +225,10 @@@ public class IoTDBDescriptor Integer.parseInt( properties .getProperty( - "dn_connection_timeout_ms", String.valueOf(conf.getConnectionTimeoutInMS())) + "dn_connection_timeout_ms", String.valueOf(conf.getDnConnectionTimeoutInMS())) .trim())); - conf.setDnMaxConnectionForInternalService( + conf.setCoreClientNumForEachNode( Integer.parseInt( properties .getProperty( @@@ -240,11 -240,11 +240,11 @@@ Integer.parseInt( properties .getProperty( - "dn_core_connection_for_internal_service", - String.valueOf(conf.getDnCoreConnectionForInternalService())) + "dn_max_client_count_for_each_node_in_client_manager", + String.valueOf(conf.getMaxClientNumForEachNode())) .trim())); - conf.setSelectorNumOfClientManager( + conf.setDnSelectorThreadCountOfClientManager( Integer.parseInt( properties .getProperty( diff --cc server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java index de650940ff,104fbc087f..8ff6585f55 --- a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java @@@ -69,21 -70,22 +70,22 @@@ public class DataRegionConsensusImpl IoTConsensusConfig.newBuilder() .setRpc( RPC.newBuilder() - .setConnectionTimeoutInMs(conf.getConnectionTimeoutInMS()) - .setRpcSelectorThreadNum(conf.getRpcSelectorThreadCount()) + .setConnectionTimeoutInMs(conf.getDnConnectionTimeoutInMS()) + .setRpcSelectorThreadNum(conf.getDnRpcSelectorThreadCount()) .setRpcMinConcurrentClientNum( - conf.getRpcMinConcurrentClientNum()) + conf.getDnRpcMinConcurrentClientNum()) .setRpcMaxConcurrentClientNum( - conf.getRpcMaxConcurrentClientNum()) + conf.getDnRpcMaxConcurrentClientNum()) .setRpcThriftCompressionEnabled( - conf.isRpcThriftCompressionEnable()) + conf.isDnRpcThriftCompressionEnable()) .setSelectorNumOfClientManager( - conf.getSelectorNumOfClientManager()) + conf.getDnSelectorThreadCountOfClientManager()) .setThriftServerAwaitTimeForStopService( conf.getThriftServerAwaitTimeForStopService()) - .setThriftMaxFrameSize(conf.getDnThriftMaxFrameSize()) - .setMaxConnectionForInternalService( - conf.getDnMaxConnectionForInternalService()) + .setThriftMaxFrameSize(conf.getThriftMaxFrameSize()) + .setCoreClientNumForEachNode( + conf.getCoreClientNumForEachNode()) + .setMaxClientNumForEachNode(conf.getMaxClientNumForEachNode()) .build()) .setReplication( IoTConsensusConfig.Replication.newBuilder()
