This is an automated email from the ASF dual-hosted git repository. spricoder pushed a commit to branch fix/file-metric in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 497beca124d7b168f34a50f4c1cd4469331c13f0 Author: spricoder <[email protected]> AuthorDate: Wed Oct 18 18:40:37 2023 +0800 Fix file metric tag --- .../apache/iotdb/db/service/metrics/file/ModsFileMetrics.java | 9 +++++---- .../org/apache/iotdb/db/service/metrics/file/TsFileMetrics.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/file/ModsFileMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/file/ModsFileMetrics.java index 6e181c3a33f..8ddefeddd24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/file/ModsFileMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/file/ModsFileMetrics.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; public class ModsFileMetrics implements IMetricSet { + private static final String MODS = "mods"; private final AtomicInteger modFileNum = new AtomicInteger(0); private final AtomicLong modFileSize = new AtomicLong(0); @@ -41,22 +42,22 @@ public class ModsFileMetrics implements IMetricSet { this, ModsFileMetrics::getModFileSize, Tag.NAME.toString(), - "mods"); + MODS); metricService.createAutoGauge( Metric.FILE_COUNT.toString(), MetricLevel.CORE, this, ModsFileMetrics::getModFileNum, Tag.NAME.toString(), - "mods"); + MODS); } @Override public void unbindFrom(AbstractMetricService metricService) { metricService.remove( - MetricType.AUTO_GAUGE, Metric.FILE_SIZE.toString(), Tag.NAME.toString(), "mods"); + MetricType.AUTO_GAUGE, Metric.FILE_SIZE.toString(), Tag.NAME.toString(), MODS); metricService.remove( - MetricType.AUTO_GAUGE, Metric.FILE_COUNT.toString(), Tag.NAME.toString(), "mods"); + MetricType.AUTO_GAUGE, Metric.FILE_COUNT.toString(), Tag.NAME.toString(), MODS); } private int getModFileNum() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/file/TsFileMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/file/TsFileMetrics.java index 032a0316c11..f7284c8e85b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/file/TsFileMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/file/TsFileMetrics.java @@ -44,8 +44,8 @@ public class TsFileMetrics implements IMetricSet { private static final Logger LOGGER = LoggerFactory.getLogger(TsFileMetrics.class); private final AtomicReference<AbstractMetricService> metricService = new AtomicReference<>(); private final AtomicBoolean hasRemainData = new AtomicBoolean(false); - private static final String SEQUENCE = "sequence"; - private static final String UNSEQUENCE = "unsequence"; + private static final String SEQUENCE = "seq"; + private static final String UNSEQUENCE = "unseq"; private static final String LEVEL = "level"; private static final String FILE_GLOBAL_COUNT = "file_global_count"; private static final String FILE_GLOBAL_SIZE = "file_global_size";
