This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/addMetricDoc in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8319a0b5b5aeef7e013ca8cc43ca710f8b092ba6 Author: Minghui Liu <[email protected]> AuthorDate: Tue Jan 10 10:08:08 2023 +0800 remove SubRawQuery --- docs/UserGuide/Monitor-Alert/Metric-Tool.md | 1 - docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 1 - .../iotdb/commons/concurrent/ThreadName.java | 1 - .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 24 ---------------------- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 15 -------------- 5 files changed, 42 deletions(-) diff --git a/docs/UserGuide/Monitor-Alert/Metric-Tool.md b/docs/UserGuide/Monitor-Alert/Metric-Tool.md index 1bce86a4bc..0f5aec4249 100644 --- a/docs/UserGuide/Monitor-Alert/Metric-Tool.md +++ b/docs/UserGuide/Monitor-Alert/Metric-Tool.md @@ -196,7 +196,6 @@ Core-level metrics are enabled by default during system operation. The addition | queue | name="compaction_cross", status="running/waiting" | Gauge | The number of cross compatcion tasks | | cost_task | name="inner_compaction/cross_compaction/flush" | Gauge | The time consumed of compaction tasks | | queue | name="flush",status="running/waiting" | AutoGauge | The number of flush tasks | -| queue | name="Sub_RawQuery",status="running/waiting" | AutoGauge | The number of Sub_RawQuery | #### 4.2.8. Compaction | Metric | Tags | Type | Description | diff --git a/docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md b/docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md index 92f3d0e32d..b32ade409f 100644 --- a/docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md +++ b/docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md @@ -192,7 +192,6 @@ Core 级别的监控指标在系统运行中默认开启，每一个 Core 级别 | queue | name="compaction_cross", status="running/waiting" | Gauge | 跨空间合并任务数 | | cost_task | name="inner_compaction/cross_compaction/flush" | Gauge | 任务耗时情况 | | queue | name="flush",status="running/waiting" | AutoGauge | 刷盘任务数 | -| queue | name="Sub_RawQuery",status="running/waiting" | AutoGauge | Sub_RawQuery任务数 | #### 4.2.8. 合并统计 | Metric | Tags | Type | Description | diff --git 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 index f0d3bac43a..9cdf23ae5a 100644 --- 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 @@ -45,7 +45,6 @@ public enum ThreadName { SYNC_CLIENT("Sync-Client"), SYNC_SERVER("Sync"), QUERY_SERVICE("Query"), - SUB_RAW_QUERY_SERVICE("Sub_RawQuery"), INSERTION_SERVICE("MultithreadingInsertionPool"), WINDOW_EVALUATION_SERVICE("WindowEvaluationTaskPoolManager"), TTL_CHECK_SERVICE("TTL-CHECK"), diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 0268ff12a5..4cbff4d50c 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -324,14 +324,6 @@ public class IoTDBConfig { /** How many queries can be concurrently executed. When <= 0, use 1000. */ private int maxAllowedConcurrentQueries = 1000; - /** - * How many threads can concurrently read data for raw data query. When <= 0, use CPU core number. - */ - private int subRawQueryThreadCount = 8; - - /** Blocking queue size for read task in raw data query. */ - private int rawQueryBlockingQueueCapacity = 5; - /** How many threads can concurrently evaluate windows. When <= 0, use CPU core number. */ private int windowEvaluationThreadCount = Runtime.getRuntime().availableProcessors(); @@ -1520,26 +1512,10 @@ public class IoTDBConfig { this.maxAllowedConcurrentQueries = maxAllowedConcurrentQueries; } - public int getSubRawQueryThreadCount() { - return subRawQueryThreadCount; - } - - void setSubRawQueryThreadCount(int subRawQueryThreadCount) { - this.subRawQueryThreadCount = subRawQueryThreadCount; - } - public long getMaxBytesPerFragmentInstance() { return allocateMemoryForDataExchange / queryThreadCount; } - public int getRawQueryBlockingQueueCapacity() { - return rawQueryBlockingQueueCapacity; - } - - public void setRawQueryBlockingQueueCapacity(int rawQueryBlockingQueueCapacity) { - this.rawQueryBlockingQueueCapacity = rawQueryBlockingQueueCapacity; - } - public int getWindowEvaluationThreadCount() { return windowEvaluationThreadCount; } diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index fd6513a688..d0a47ede9a 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -553,21 +553,6 @@ public class IoTDBDescriptor { conf.setMaxAllowedConcurrentQueries(1000); } - conf.setSubRawQueryThreadCount( - Integer.parseInt( - properties.getProperty( - "sub_rawQuery_thread_count", Integer.toString(conf.getSubRawQueryThreadCount())))); - - if (conf.getSubRawQueryThreadCount() <= 0) { - conf.setSubRawQueryThreadCount(Runtime.getRuntime().availableProcessors()); - } - - conf.setRawQueryBlockingQueueCapacity( - Integer.parseInt( - properties.getProperty( - "raw_query_blocking_queue_capacity", - Integer.toString(conf.getRawQueryBlockingQueueCapacity())))); - conf.setmRemoteSchemaCacheSize( Integer.parseInt( properties
