This is an automated email from the ASF dual-hosted git repository. marklau99 pushed a commit to branch add-confignode-cpu-metric in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9e0bbf1d90fc9b53d4a82854bd2c5e814f080557 Merge: a083ae56539 14eb3bf3fe6 Author: Liu Xuxin <[email protected]> AuthorDate: Wed Jun 21 20:18:37 2023 +0800 Merge remote-tracking branch 'upstream/master' into add-confignode-cpu-metric .../async/handlers/rpc/SchemaUpdateRPCHandler.java | 6 +- .../confignode/conf/ConfigNodeDescriptor.java | 4 +- .../confignode/conf/SystemPropertiesUtils.java | 1 + .../iotdb/confignode/manager/ProcedureManager.java | 11 +- .../manager/load/service/StatisticsService.java | 3 +- .../manager/pipe/runtime/PipeHeartbeatParser.java | 47 +- .../pipe/runtime/PipeLeaderChangeHandler.java | 18 +- .../pipe/runtime/PipeRuntimeCoordinator.java | 22 +- .../manager/schema/ClusterSchemaManager.java | 6 +- .../impl/pipe/task/CreatePipeProcedureV2.java | 4 +- .../impl/schema/AlterLogicalViewProcedure.java | 47 +- .../thrift/ConfigNodeRPCServiceProcessor.java | 4 +- .../iot/logdispatcher/IndexController.java | 2 +- .../Data-Modeling/SchemaRegion-rocksdb.md | 2 +- .../Maintenance-Tools/SchemaFileSketch-Tool.md | 6 +- docs/UserGuide/Reference/Common-Config-Manual.md | 2 +- docs/UserGuide/Reference/Status-Codes.md | 4 +- .../Data-Modeling/SchemaRegion-rocksdb.md | 2 +- .../Maintenance-Tools/SchemaFileSketch-Tool.md | 8 +- .../zh/UserGuide/Reference/Common-Config-Manual.md | 2 +- docs/zh/UserGuide/Reference/Status-Codes.md | 4 +- .../org/apache/iotdb/flink/FlinkIoTDBSink.java | 2 +- .../apache/iotdb/flink/FlinkTsFileBatchSink.java | 24 +- .../apache/iotdb/flink/FlinkTsFileBatchSource.java | 6 +- .../apache/iotdb/flink/FlinkTsFileStreamSink.java | 24 +- .../iotdb/flink/FlinkTsFileStreamSource.java | 12 +- .../iotdb/hadoop/tsfile/TSFMRReadExample.java | 11 +- .../iotdb/hadoop/tsfile/TSMRWriteExample.java | 29 +- .../main/java/org/apache/iotdb/JDBCExample.java | 21 +- .../org/apache/iotdb/PrepareStatementDemo.java | 13 +- .../iotdb/SyntaxConventionRelatedExample.java | 36 +- .../main/java/org/apache/iotdb/kafka/Consumer.java | 6 +- .../org/apache/iotdb/kafka/ConsumerThread.java | 16 +- .../main/java/org/apache/iotdb/kafka/Producer.java | 8 +- .../server/CustomizedJsonPayloadFormatter.java | 6 +- .../org/apache/iotdb/pulsar/PulsarConsumer.java | 4 +- .../apache/iotdb/pulsar/PulsarConsumerThread.java | 6 +- .../java/org/apache/iotdb/rabbitmq/Constant.java | 18 +- .../iotdb/rabbitmq/RabbitMQChannelUtils.java | 2 + .../apache/iotdb/rabbitmq/RabbitMQConsumer.java | 6 +- .../main/java/org/apache/iotdb/HttpExample.java | 29 +- .../main/java/org/apache/iotdb/HttpsExample.java | 32 +- .../src/main/java/org/apache/iotdb/SSLClient.java | 22 +- .../java/org/apache/iotdb/rocketmq/Constant.java | 2 + .../apache/iotdb/rocketmq/RocketMQConsumer.java | 3 +- .../apache/iotdb/rocketmq/RocketMQProducer.java | 14 +- .../main/java/org/apache/iotdb/rocketmq/Utils.java | 2 +- .../iotdb/AlignedTimeseriesSessionExample.java | 13 +- .../org/apache/iotdb/DataMigrationExample.java | 18 +- .../iotdb/HybridTimeseriesSessionExample.java | 9 +- .../org/apache/iotdb/SessionConcurrentExample.java | 34 +- .../main/java/org/apache/iotdb/SessionExample.java | 32 +- .../java/org/apache/iotdb/SessionPoolExample.java | 1 + .../iotdb/SyntaxConventionRelatedExample.java | 10 +- .../main/java/org/apache/iotdb/TabletExample.java | 139 ++--- .../iotdb/trigger/ClusterAlertingExample.java | 15 +- .../org/apache/iotdb/trigger/LoggerTrigger.java | 85 ++-- .../iotdb/trigger/StatisticsUpdaterTrigger.java | 6 +- .../iotdb/tsfile/TsFileForceAppendWrite.java | 13 +- .../java/org/apache/iotdb/tsfile/TsFileRead.java | 10 +- .../apache/iotdb/tsfile/TsFileSequenceRead.java | 17 +- .../tsfile/TsFileWriteAlignedWithTSRecord.java | 9 +- .../iotdb/tsfile/TsFileWriteAlignedWithTablet.java | 9 +- .../iotdb/tsfile/TsFileWriteWithTSRecord.java | 6 +- .../apache/iotdb/tsfile/TsFileWriteWithTablet.java | 5 +- .../SlidingTimeWindowAccessStrategyExample.java | 45 +- .../java/org/apache/iotdb/udf/UDTFExample.java | 17 +- .../org/apache/iotdb/util/AbstractSchemaIT.java | 4 +- iotdb-client/client-cpp/src/main/Session.h | 4 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 4 +- .../apache/iotdb/metrics/config/MetricConfig.java | 8 +- .../metrics/metricsets/cpu/CpuUsageMetrics.java | 6 +- .../reporter/iotdb/IoTDBSessionReporter.java | 7 +- .../iotdb/metrics/utils/IoTDBMetricsUtils.java | 3 +- .../resources/conf/iotdb-common.properties | 2 +- .../iotdb/commons/concurrent/ThreadName.java | 32 ++ .../runtime/UnSupportedDataTypeException.java | 11 +- .../iotdb/db/client/DataNodeInternalClient.java | 4 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 5 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 11 +- .../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 35 +- .../impl/ReadChunkCompactionPerformer.java | 21 +- .../execute/task/CrossSpaceCompactionTask.java | 3 + .../compaction/execute/utils/CompactionUtils.java | 3 +- .../execute/utils/MultiTsFileDeviceIterator.java | 19 +- .../fast/AlignedSeriesCompactionExecutor.java | 21 + .../readchunk/AlignedSeriesCompactionExecutor.java | 99 ++-- .../readchunk/SingleSeriesCompactionExecutor.java | 56 +-- .../utils/writer/AbstractCompactionWriter.java | 73 ++- .../writer/AbstractCrossCompactionWriter.java | 24 +- .../writer/AbstractInnerCompactionWriter.java | 13 +- .../utils/writer/FastCrossCompactionWriter.java | 4 +- .../writer/ReadPointCrossCompactionWriter.java | 2 +- .../writer/ReadPointInnerCompactionWriter.java | 2 +- .../compaction/io/CompactionTsFileReader.java | 178 +++++++ .../compaction/io/CompactionTsFileWriter.java | 130 +++++ .../compaction/schedule/CompactionTaskManager.java | 10 - .../schedule/constant/CompactionIoDataType.java | 18 +- .../impl/RewriteCrossSpaceCompactionSelector.java | 6 +- .../iotdb/db/engine/flush/MemTableFlushTask.java | 3 +- .../iotdb/db/engine/modification/Deletion.java | 2 +- .../db/engine/modification/ModificationFile.java | 9 +- .../io/LocalTextModificationAccessor.java | 4 + .../modification/utils/TracedBufferedReader.java | 33 +- .../querycontext/AlignedReadOnlyMemChunk.java | 4 +- .../db/engine/querycontext/QueryDataSource.java | 8 +- .../db/engine/querycontext/ReadOnlyMemChunk.java | 5 +- .../iotdb/db/engine/storagegroup/DataRegion.java | 5 + .../db/engine/trigger/builtin/ForwardTrigger.java | 9 +- .../sink/forward/http/HTTPForwardHandler.java | 10 +- .../forward/mqtt/MQTTForwardConfiguration.java | 1 + .../sink/forward/mqtt/MQTTForwardHandler.java | 10 +- .../trigger/sink/mqtt/MQTTConfiguration.java | 3 +- .../db/engine/trigger/utils/BatchHandlerQueue.java | 11 +- .../engine/trigger/utils/HTTPConnectionPool.java | 4 +- .../metadata/SeriesOverflowException.java | 8 +- .../SchemaFileLogCorruptedException.java | 2 +- .../metadata/schemafile/SchemaFileNotExists.java | 2 +- .../schemafile/SchemaPageOverflowException.java | 3 +- .../query/QueryTimeoutRuntimeException.java | 1 + .../ClassLoaderManagerInitializationException.java | 6 +- .../apache/iotdb/db/metadata/MetadataConstant.java | 8 +- .../idtable/AppendOnlyDiskSchemaManager.java | 2 +- .../metadata/metric/SchemaEngineCachedMetric.java | 2 +- .../mtree/store/disk/schemafile/ISchemaFile.java | 4 +- .../mtree/store/disk/schemafile/SchemaFile.java | 28 +- .../store/disk/schemafile/SchemaFileConfig.java | 4 +- .../disk/schemafile/pagemgr/BTreePageManager.java | 2 +- .../store/disk/schemafile/pagemgr/PageManager.java | 2 +- .../rescon/CachedSchemaEngineStatistics.java | 2 +- .../rescon/CachedSchemaRegionStatistics.java | 4 +- .../metadata/rescon/ISchemaRegionStatistics.java | 4 + .../metadata/rescon/MemSchemaRegionStatistics.java | 10 + .../db/metadata/rescon/SchemaResourceManager.java | 4 +- .../db/metadata/schemaregion/SchemaEngine.java | 2 +- .../db/metadata/schemaregion/SchemaEngineMode.java | 2 +- .../schemaregion/SchemaRegionMemoryImpl.java | 12 +- .../schemaregion/SchemaRegionPBTreeImpl.java | 27 +- .../db/metadata/utils/ResourceByPathUtils.java | 10 +- .../metadata/visitor/SchemaExecutionVisitor.java | 2 +- .../iotdb/db/mpp/aggregation/Accumulator.java | 1 + .../iotdb/db/mpp/aggregation/CountAccumulator.java | 4 +- .../slidingwindow/SlidingWindowAggregator.java | 4 +- .../SlidingWindowAggregatorFactory.java | 4 +- .../timerangeiterator/AggrWindowIterator.java | 4 +- .../timerangeiterator/ITimeRangeIterator.java | 7 +- .../timerangeiterator/PreAggrWindowIterator.java | 6 +- .../PreAggrWindowWithNaturalMonthIterator.java | 1 + .../TimeRangeIteratorFactory.java | 1 + .../exchange/IMPPDataExchangeManager.java | 3 +- .../execution/exchange/MPPDataExchangeManager.java | 17 +- .../exchange/MPPDataExchangeServiceMBean.java | 1 + .../MPPDataExchangeServiceThriftHandler.java | 13 +- .../mpp/execution/exchange/SharedTsBlockQueue.java | 8 +- .../exchange/sink/DownStreamChannelIndex.java | 2 +- .../exchange/sink/DownStreamChannelLocation.java | 2 + .../db/mpp/execution/exchange/sink/ISink.java | 6 +- .../mpp/execution/exchange/sink/ISinkHandle.java | 2 +- .../execution/exchange/sink/LocalSinkChannel.java | 7 +- .../execution/exchange/sink/ShuffleSinkHandle.java | 13 +- .../mpp/execution/exchange/sink/SinkChannel.java | 3 + .../execution/exchange/source/ISourceHandle.java | 8 +- .../exchange/source/PipelineSourceHandle.java | 1 + .../execution/exchange/source/SourceHandle.java | 10 +- .../iotdb/db/mpp/execution/memory/MemoryPool.java | 14 +- .../mpp/execution/operator/sink/SinkOperator.java | 1 + .../operator/window/ConditionWindowManager.java | 84 ++-- .../mpp/execution/operator/window/CountWindow.java | 1 + .../operator/window/CountWindowManager.java | 24 +- .../operator/window/CountWindowParameter.java | 1 + .../db/mpp/execution/operator/window/IWindow.java | 8 +- .../execution/operator/window/IWindowManager.java | 18 +- .../operator/window/SessionWindowManager.java | 3 +- .../operator/window/TimeWindowManager.java | 13 +- .../operator/window/WindowManagerFactory.java | 4 + .../execution/operator/window/WindowParameter.java | 2 +- .../execution/schedule/AbstractDriverThread.java | 12 +- .../db/mpp/execution/schedule/DriverScheduler.java | 8 +- .../schedule/DriverTaskAbortedException.java | 2 +- .../mpp/execution/schedule/DriverTaskThread.java | 3 - .../schedule/DriverTaskTimeoutSentinelThread.java | 3 +- .../mpp/execution/schedule/ExecutionContext.java | 3 +- .../mpp/execution/schedule/IDriverScheduler.java | 5 +- .../db/mpp/execution/schedule/ITaskScheduler.java | 3 +- .../db/mpp/execution/schedule/ThreadProducer.java | 1 + .../iotdb/db/mpp/execution/schedule/queue/ID.java | 3 +- .../schedule/queue/IDIndexedAccessible.java | 3 +- .../schedule/queue/IndexedBlockingQueue.java | 50 +- .../queue/IndexedBlockingReserveQueue.java | 2 +- .../execution/schedule/queue/L1PriorityQueue.java | 1 + .../execution/schedule/queue/L2PriorityQueue.java | 1 + .../queue/multilevelqueue/DriverTaskHandle.java | 4 +- .../multilevelqueue/MultilevelPriorityQueue.java | 10 +- .../db/mpp/execution/schedule/task/DriverTask.java | 14 +- .../mpp/execution/schedule/task/DriverTaskId.java | 2 +- .../execution/schedule/task/DriverTaskStatus.java | 3 +- .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 11 +- .../config/executor/ClusterConfigTaskExecutor.java | 8 +- .../db/mpp/plan/planner/OperatorTreeGenerator.java | 297 +++++------ .../db/mpp/plan/planner/SubPlanTypeExtractor.java | 2 + .../plan/planner/distribution/SourceRewriter.java | 8 +- .../plan/node/load/LoadSingleTsFileNode.java | 18 +- .../node/metedata/write/CreateTimeSeriesNode.java | 6 + .../metedata/write/view/AlterLogicalViewNode.java | 5 + .../metedata/write/view/CreateLogicalViewNode.java | 5 + .../plan/node/source/AlignedLastQueryScanNode.java | 1 + .../planner/plan/node/write/InsertRowNode.java | 127 +++-- .../db/mpp/transformation/api/LayerRowReader.java | 4 +- .../dag/column/CaseWhenThenColumnTransformer.java | 6 +- .../mpp/transformation/dag/column/ColumnCache.java | 4 +- .../dag/column/ColumnTransformer.java | 8 +- .../binary/CompareBinaryColumnTransformer.java | 12 +- .../dag/column/leaf/NullColumnTransformer.java | 4 +- .../dag/column/unary/InColumnTransformer.java | 13 +- .../scalar/CastFunctionColumnTransformer.java | 20 +- .../transformation/dag/input/IUDFInputDataSet.java | 4 +- .../MultiInputColumnIntermediateLayer.java | 4 +- ...InputColumnMultiReferenceIntermediateLayer.java | 6 +- ...nputColumnSingleReferenceIntermediateLayer.java | 4 +- .../mpp/transformation/dag/memory/SafetyLine.java | 4 + .../dag/transformer/Transformer.java | 5 +- .../dag/transformer/multi/UDFQueryTransformer.java | 3 +- .../transformer/ternary/TernaryTransformer.java | 4 +- .../transformer/unary/TransparentTransformer.java | 1 + .../mpp/transformation/dag/udf/UDTFExecutor.java | 12 +- .../mpp/transformation/dag/util/InputRowUtils.java | 5 + .../transformation/dag/util/LayerCacheUtils.java | 18 +- .../transformation/dag/util/TransformUtils.java | 112 ++--- .../db/mpp/transformation/datastructure/Cache.java | 21 + .../datastructure/SerializableList.java | 60 +-- .../row/ElasticSerializableRowRecordList.java | 14 +- .../row/SerializableRowRecordList.java | 3 + .../tv/ElasticSerializableTVList.java | 9 +- .../pipe/connector/v2/IoTDBThriftConnectorV2.java | 47 +- .../protocol/influxdb/util/QueryResultUtils.java | 2 +- .../iotdb/db/query/control/SessionManager.java | 4 +- .../java/org/apache/iotdb/db/service/DataNode.java | 1 - .../db/service/metrics/CompactionMetrics.java | 192 ++++--- .../iotdb/db/service/metrics/FileMetrics.java | 1 + .../metrics/IoTDBInternalLocalReporter.java | 6 +- .../service/thrift/impl/ClientRPCServiceImpl.java | 48 +- .../org/apache/iotdb/db/tools/DiskSpiller.java | 10 +- .../apache/iotdb/db/tools/FileSpillerReader.java | 8 +- .../apache/iotdb/db/tools/SortBufferManager.java | 20 +- .../java/org/apache/iotdb/db/tools/SortReader.java | 13 +- .../apache/iotdb/db/tools/TsFileSketchTool.java | 4 +- .../db/tools/schema/PBTreeFileSketchTool.java | 6 +- .../iotdb/db/trigger/executor/TriggerExecutor.java | 2 +- .../db/trigger/executor/TriggerFireVisitor.java | 6 +- .../trigger/service/TriggerClassLoaderManager.java | 8 +- .../trigger/service/TriggerManagementService.java | 36 +- .../apache/iotdb/db/utils/ErrorHandlingUtils.java | 24 +- .../SlidingTimeWindowEvaluationHandler.java | 4 +- .../runtime/WindowEvaluationTaskPoolManager.java | 1 + .../utils/windowing/window/EvictableBatchList.java | 6 +- .../java/org/apache/iotdb/db/wal/WALManager.java | 2 +- .../java/org/apache/iotdb/db/wal/node/WALNode.java | 12 +- .../FastCrossCompactionPerformerTest.java | 37 ++ .../db/engine/compaction/MemoryControlTest.java | 11 + .../cross/CrossSpaceCompactionSelectorTest.java | 2 + .../mtree/schemafile/AliasIndexPageTest.java | 2 +- .../mtree/schemafile/InternalPageTest.java | 2 +- .../mtree/schemafile/SchemaFileLogTest.java | 8 +- .../metadata/mtree/schemafile/SchemaFileTest.java | 2 +- .../mtree/schemafile/WrappedSegmentTest.java | 2 +- .../schemaRegion/AbstractSchemaRegionTest.java | 6 +- .../schemaRegion/SchemaRegionBasicTest.java | 4 +- .../schemaRegion/SchemaStatisticsTest.java | 2 +- .../iotdb/db/tools/PBTreeFileSketchTest.java | 4 +- .../iotdb/db/tools/TsFileSelfCheckToolTest.java | 2 +- .../src/test/resources/iotdb-datanode.properties | 4 +- site/src/main/.vuepress/components/IoTDB.vue | 4 +- site/src/main/.vuepress/components/IoTDBZH.vue | 4 +- .../docsearch/client/components/Docsearch.ts | 7 +- site/src/main/.vuepress/config.ts | 8 + site/src/main/.vuepress/navbar/en.ts | 4 +- site/src/main/.vuepress/navbar/zh.ts | 4 +- site/src/main/.vuepress/sidebar/en.ts | 552 ++++++++++---------- site/src/main/.vuepress/sidebar/zh.ts | 558 ++++++++++----------- site/src/main/.vuepress/utils/index.ts | 3 + site/src/main/package.json | 1 + .../exception/NotCompatibleTsFileException.java | 1 + .../tsfile/exception/NotImplementedException.java | 1 + .../iotdb/tsfile/exception/NullFieldException.java | 1 + .../iotdb/tsfile/exception/PathParseException.java | 1 + .../tsfile/exception/TsFileRuntimeException.java | 1 + .../TsFileStatisticsMistakesException.java | 1 + .../CompressionTypeNotSupportedException.java | 1 + .../compress/GZIPCompressOverflowException.java | 1 + .../filter/QueryFilterOptimizationException.java | 1 + .../exception/filter/StatisticsClassException.java | 1 + .../filter/UnSupportFilterDataTypeException.java | 1 + .../exception/write/NoMeasurementException.java | 1 + .../tsfile/exception/write/PageException.java | 1 + .../write/UnSupportedDataTypeException.java | 1 + .../write/UnknownColumnTypeException.java | 1 + .../exception/write/WriteProcessException.java | 1 + .../org/apache/iotdb/tsfile/file/MetaMarker.java | 8 +- .../iotdb/tsfile/file/header/ChunkGroupHeader.java | 20 +- .../iotdb/tsfile/file/header/ChunkHeader.java | 23 +- .../iotdb/tsfile/file/header/PageHeader.java | 4 +- .../tsfile/file/metadata/AlignedChunkMetadata.java | 1 + .../file/metadata/AlignedTimeSeriesMetadata.java | 3 +- .../tsfile/file/metadata/ChunkGroupMetadata.java | 3 +- .../iotdb/tsfile/file/metadata/ChunkMetadata.java | 12 +- .../tsfile/file/metadata/ITimeSeriesMetadata.java | 8 +- .../file/metadata/MetadataIndexConstructor.java | 4 +- .../tsfile/file/metadata/MetadataIndexNode.java | 2 +- .../tsfile/file/metadata/TimeseriesMetadata.java | 15 +- .../iotdb/tsfile/file/metadata/TsFileMetadata.java | 4 +- .../file/metadata/enums/CompressionType.java | 22 +- .../file/metadata/enums/MetadataIndexNodeType.java | 11 +- .../tsfile/file/metadata/enums/TSDataType.java | 37 +- .../tsfile/file/metadata/enums/TSEncoding.java | 1 + .../file/metadata/statistics/BinaryStatistics.java | 22 +- .../metadata/statistics/BooleanStatistics.java | 18 +- .../file/metadata/statistics/DoubleStatistics.java | 18 +- .../file/metadata/statistics/FloatStatistics.java | 17 +- .../metadata/statistics/IntegerStatistics.java | 18 +- .../file/metadata/statistics/LongStatistics.java | 92 ++-- .../file/metadata/statistics/Statistics.java | 60 ++- .../file/metadata/statistics/TimeStatistics.java | 13 +- .../iotdb/tsfile/read/TsFileDeviceIterator.java | 3 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 18 +- .../v2/file/metadata/TimeseriesMetadataV2.java | 4 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 30 +- .../tsfile/file/metadata/utils/TestHelper.java | 2 +- .../tsfile/write/TsFileIntegrityCheckingTool.java | 2 +- .../writer/TsFileIOWriterMemoryControlTest.java | 6 +- 329 files changed, 3360 insertions(+), 2279 deletions(-) diff --cc example/trigger/src/main/java/org/apache/iotdb/trigger/StatisticsUpdaterTrigger.java index 4e96c588f6d,8c3c0236824..8087ef1c03b --- a/example/trigger/src/main/java/org/apache/iotdb/trigger/StatisticsUpdaterTrigger.java +++ b/example/trigger/src/main/java/org/apache/iotdb/trigger/StatisticsUpdaterTrigger.java @@@ -61,9 -60,9 +61,9 @@@ public class StatisticsUpdaterTrigger i private final ScheduledExecutorService triggerInformationUpdateExecutor = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( - "Stateful-Trigger-Statistics-Updater"); + ThreadName.TRIGGER_STATISTIC_UPDATER.getName()); - private static final long UPDATE_INTERVAL = 1000 * 20; + private static final long UPDATE_INTERVAL = 1000 * 20L; @Override public void onCreate(TriggerAttributes attributes) throws Exception { diff --cc node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java index 8a9ef4a82b6,51783d4c281..cb2507078a7 --- a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java @@@ -335,7 -276,40 +335,39 @@@ public enum ThreadName return name; } - public static DataNodeThreadModule getModuleTheThreadBelongs(String givenThreadName) { + public static DataNodeThreadModule getDataNodeModuleTheThreadBelongs(String givenThreadName) { + Set<ThreadName>[] threadNameSetList = + new Set[] { + queryThreadNames, + mppThreadNames, + compactionThreadNames, + walThreadNames, + flushThreadNames, + schemaEngineThreadNames, + clientServiceThreadNames, + iotConsensusThrreadNames, + ratisThreadNames, + computeThreadNames, + jvmThreadNames, + metricsThreadNames, + otherThreadNames + }; + DataNodeThreadModule[] modules = + new DataNodeThreadModule[] { + DataNodeThreadModule.QUERY, + DataNodeThreadModule.MPP, + DataNodeThreadModule.COMPACTION, + DataNodeThreadModule.WAL, + DataNodeThreadModule.FLUSH, + DataNodeThreadModule.SCHEMA_ENGINE, + DataNodeThreadModule.CLIENT_SERVICE, + DataNodeThreadModule.IOT_CONSENSUS, + DataNodeThreadModule.RATIS_CONSENSUS, + DataNodeThreadModule.COMPUTE, + DataNodeThreadModule.JVM, + DataNodeThreadModule.METRICS, + DataNodeThreadModule.OTHER + }; - for (int i = 0, length = modules.length; i < length; ++i) { if (matchModuleWithThreadNames(threadNameSetList[i], modules[i], givenThreadName) != null) { return modules[i];
