[iotdb] branch master updated: [IOTDB-5908] Fix some query metrics not effect

[jackietien]

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 17eb9d3b424 [IOTDB-5908] Fix some query metrics not effect
17eb9d3b424 is described below

commit 17eb9d3b424f06f0fa6e9f064d2759b536ddc5e4
Author: Weihao Li <60659567+wei-hao...@users.noreply.github.com>
AuthorDate: Wed May 24 19:16:10 2023 +0800

    [IOTDB-5908] Fix some query metrics not effect
---
 .../org/apache/iotdb/commons/service/metric/enums/Metric.java     | 1 +
 .../apache/iotdb/db/mpp/metric/DataExchangeCountMetricSet.java    | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
 
b/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
index cb51331c261..ae8fef76ec5 100644
--- 
a/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
+++ 
b/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/enums/Metric.java
@@ -80,6 +80,7 @@ public enum Metric {
   QUERY_RESOURCE("query_resource"),
   DATA_EXCHANGE_COST("data_exchange_cost"),
   DATA_EXCHANGE_COUNT("data_exchange_count"),
+  DATA_EXCHANGE_SIZE("data_exchange_size"),
   DRIVER_SCHEDULER("driver_scheduler"),
   COORDINATOR("coordinator"),
   FRAGMENT_INSTANCE_MANAGER("fragment_instance_manager"),
diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/metric/DataExchangeCountMetricSet.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/metric/DataExchangeCountMetricSet.java
index 90d1a6a6abf..0ef55781abc 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/metric/DataExchangeCountMetricSet.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/metric/DataExchangeCountMetricSet.java
@@ -123,14 +123,14 @@ public class DataExchangeCountMetricSet implements 
IMetricSet {
             Tag.TYPE.toString(),
             SERVER);
     metricService.createAutoGauge(
-        Metric.DATA_EXCHANGE_COUNT.toString(),
+        Metric.DATA_EXCHANGE_SIZE.toString(),
         MetricLevel.IMPORTANT,
         dataExchangeManager,
         MPPDataExchangeManager::getShuffleSinkHandleSize,
         Tag.NAME.toString(),
         SHUFFLE_SINK_HANDLE_SIZE);
     metricService.createAutoGauge(
-        Metric.DATA_EXCHANGE_COUNT.toString(),
+        Metric.DATA_EXCHANGE_SIZE.toString(),
         MetricLevel.IMPORTANT,
         dataExchangeManager,
         MPPDataExchangeManager::getSourceHandleSize,
@@ -161,12 +161,12 @@ public class DataExchangeCountMetricSet implements 
IMetricSet {
                                 caller)));
     metricService.remove(
         MetricType.AUTO_GAUGE,
-        Metric.DATA_EXCHANGE_COUNT.toString(),
+        Metric.DATA_EXCHANGE_SIZE.toString(),
         Tag.NAME.toString(),
         SHUFFLE_SINK_HANDLE_SIZE);
     metricService.remove(
         MetricType.AUTO_GAUGE,
-        Metric.DATA_EXCHANGE_COUNT.toString(),
+        Metric.DATA_EXCHANGE_SIZE.toString(),
         Tag.NAME.toString(),
         SOURCE_HANDLE_SIZE);
   }