You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2023/01/12 14:16:33 UTC
[iotdb] 02/02: Merge branch 'master' into Move-ConfigNodeConfig-into-CommonConfig
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 6b8c7295e672b812033fc8495ae75674fadf2f6d
Merge: ff1991cb17 0308ab6cab
Author: YongzaoDan <53...@qq.com>
AuthorDate: Thu Jan 12 22:16:20 2023 +0800
Merge branch 'master' into Move-ConfigNodeConfig-into-CommonConfig
.../confignode/manager/ClusterSchemaManager.java | 79 +-
.../manager/ClusterSchemaManagerTest.java | 32 +-
.../apache/iotdb/consensus/iot/IoTConsensus.java | 1 +
.../consensus/iot/IoTConsensusServerImpl.java | 86 +-
.../consensus/iot/IoTConsensusServerMetrics.java | 2 +-
.../consensus/iot/logdispatcher/LogDispatcher.java | 2 +-
.../service/IoTConsensusRPCServiceProcessor.java | 2 +-
.../apache/iotdb/consensus/iot/ReplicateTest.java | 32 +-
.../apache/iotdb/consensus/iot/StabilityTest.java | 55 +-
docs/UserGuide/API/Programming-MQTT.md | 6 +-
.../UserGuide/Ecosystem-Integration/Flink-IoTDB.md | 3 +-
.../Apache-IoTDB-DataNode-Dashboard.json | 15015 +++++++++++++++----
docs/UserGuide/Monitor-Alert/Metric-Tool.md | 31 +
docs/zh/UserGuide/API/Programming-MQTT.md | 6 +-
.../UserGuide/Ecosystem-Integration/Flink-IoTDB.md | 8 +-
docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 31 +
.../org/apache/iotdb/flink/FlinkIoTDBSink.java | 2 +-
.../apache/iotdb/it/env/cluster/AbstractEnv.java | 64 +-
.../iotdb/it/env/cluster/AbstractNodeWrapper.java | 7 -
.../iotdb/it/env/remote/RemoteServerEnv.java | 7 +
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 13 +
.../apache/iotdb/itbase/env/BaseNodeWrapper.java | 2 -
.../it/cluster/IoTDBClusterNodeErrorStartUpIT.java | 60 +-
.../load/IoTDBClusterRegionLeaderBalancingIT.java | 28 +-
.../it/partition/IoTDBPartitionDurableIT.java | 24 +-
.../iotdb/metrics/AbstractMetricService.java | 9 +-
.../resources/conf/iotdb-common.properties | 2 +-
.../commons/schema/tree/AbstractTreeVisitor.java | 2 +-
.../resources/tools/tsfile/settle-tsfile.bat | 62 +
.../resources/tools/tsfile/settle-tsfile.sh | 48 +
.../execute/utils/reader/PointPriorityReader.java | 14 +-
.../db/engine/settle/SettleRequestHandler.java | 323 +
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 30 +
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 30 +
.../mtree/store/disk/schemafile/SchemaFile.java | 21 +-
.../disk/schemafile/pagemgr/BTreePageManager.java | 5 +-
.../store/disk/schemafile/pagemgr/PageManager.java | 17 +-
.../traverser/TraverserWithLimitOffsetWrapper.java | 10 +
.../db/metadata/query/reader/ISchemaReader.java | 16 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 10 +
.../schemaregion/SchemaRegionSchemaFileImpl.java | 10 +
.../schema/CountGroupByLevelScanOperator.java | 3 +
.../operator/schema/SchemaCountOperator.java | 3 +
.../operator/schema/SchemaQueryScanOperator.java | 3 +
.../schema/source/PathsUsingTemplateSource.java | 26 +
.../AbstractSeriesAggregationScanOperator.java | 8 +-
.../db/mpp/execution/schedule/DriverScheduler.java | 32 +-
.../mpp/execution/schedule/DriverTaskThread.java | 8 +-
.../mpp/execution/schedule/ExecutionContext.java | 10 +
.../mpp/execution/schedule/IDriverScheduler.java | 3 +-
.../queue/multilevelqueue/DriverTaskHandle.java | 92 +
.../multilevelqueue/MultilevelPriorityQueue.java | 290 +
.../schedule/queue/multilevelqueue/Priority.java | 73 +
.../db/mpp/execution/schedule/task/DriverTask.java | 71 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 7 +
.../tools/settle/TsFileSettleByCompactionTool.java | 123 +
.../compaction/FastAlignedCrossCompactionTest.java | 134 +
.../FastNonAlignedCrossCompactionTest.java | 138 +
.../db/engine/settle/SettleRequestHandlerTest.java | 162 +
.../mpp/execution/operator/OperatorMemoryTest.java | 35 +-
.../schema/CountGroupByLevelMergeOperatorTest.java | 95 +-
.../operator/schema/SchemaCountOperatorTest.java | 88 +-
.../operator/schema/SchemaOperatorTestUtil.java | 66 +
.../schema/SchemaQueryScanOperatorTest.java | 79 +-
.../schedule/DefaultDriverSchedulerTest.java | 87 +-
.../DriverTaskTimeoutSentinelThreadTest.java | 18 +-
thrift-commons/src/main/thrift/common.thrift | 4 +
thrift/src/main/thrift/datanode.thrift | 2 +
68 files changed, 14384 insertions(+), 3483 deletions(-)
diff --cc confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
index ac82a02b76,6259a753f4..6f42d68514
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
@@@ -101,11 -99,9 +101,9 @@@ public class ClusterSchemaManager
private static final Logger LOGGER = LoggerFactory.getLogger(ClusterSchemaManager.class);
- private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
- private static final double SCHEMA_REGION_PER_DATA_NODE = CONF.getSchemaRegionPerDataNode();
- private static final double DATA_REGION_PER_PROCESSOR = CONF.getDataRegionPerProcessor();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final int LEAST_SCHEMA_REGION_GROUP_NUM = COMMON_CONFIG.getLeastSchemaRegionGroupNum();
+ private static final double SCHEMA_REGION_PER_DATA_NODE = COMMON_CONFIG.getSchemaRegionPerDataNode();
- private static final int LEAST_DATA_REGION_GROUP_NUM = COMMON_CONFIG.getLeastDataRegionGroupNum();
+ private static final double DATA_REGION_PER_PROCESSOR = COMMON_CONFIG.getDataRegionPerProcessor();
private final IManager configManager;
private final ClusterSchemaInfo clusterSchemaInfo;
diff --cc server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index 9d8a215928,a44774faa4..5740a12226
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@@ -59,7 -60,9 +60,8 @@@ import org.apache.iotdb.db.engine.Stora
import org.apache.iotdb.db.engine.cache.BloomFilterCache;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
+ import org.apache.iotdb.db.engine.settle.SettleRequestHandler;
import org.apache.iotdb.db.exception.StorageEngineException;
-import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.metadata.cache.DataNodeSchemaCache;
import org.apache.iotdb.db.metadata.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.metadata.schemaregion.SchemaEngine;