[iotdb] branch master updated: [IOTDB-5253] Fix chunkMetadata mem metric (#8661)

[ta...@apache.org]

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

tanxinyu 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 da559fb09b [IOTDB-5253] Fix chunkMetadata mem metric (#8661)
da559fb09b is described below

commit da559fb09ba139b4c5290268c5a48bb23a5ab98b
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Mon Jan 2 16:58:19 2023 +0800

    [IOTDB-5253] Fix chunkMetadata mem metric (#8661)
    
    * Fix chunkMetadata mem metric
    
    * remove equal and hashcode override
---
 .../engine/storagegroup/TsFileProcessorInfo.java   |  7 +++++-
 .../storagegroup/TsFileProcessorInfoMetrics.java   | 26 +++++-----------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorInfo.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorInfo.java
index 93fa8035e7..da886d0d6f 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorInfo.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorInfo.java
@@ -36,7 +36,7 @@ public class TsFileProcessorInfo {
       MetricService.getInstance()
           .addMetricSet(
               new TsFileProcessorInfoMetrics(
-                  dataRegionInfo.getDataRegion().getDatabaseName(), memCost));
+                  dataRegionInfo.getDataRegion().getDatabaseName(), this));
     }
   }
 
@@ -57,4 +57,9 @@ public class TsFileProcessorInfo {
     dataRegionInfo.releaseStorageGroupMemCost(memCost);
     memCost = 0L;
   }
+
+  /** get memCost */
+  public long getMemCost() {
+    return memCost;
+  }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorInfoMetrics.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorInfoMetrics.java
index b0a15dab7f..c771166047 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorInfoMetrics.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorInfoMetrics.java
@@ -26,15 +26,14 @@ import org.apache.iotdb.metrics.metricsets.IMetricSet;
 import org.apache.iotdb.metrics.utils.MetricLevel;
 import org.apache.iotdb.metrics.utils.MetricType;
 
-import java.util.Objects;
-
 public class TsFileProcessorInfoMetrics implements IMetricSet {
   private String storageGroupName;
-  private long memCost;
+  private TsFileProcessorInfo tsFileProcessorInfo;
 
-  public TsFileProcessorInfoMetrics(String storageGroupName, long memCost) {
+  public TsFileProcessorInfoMetrics(
+      String storageGroupName, TsFileProcessorInfo tsFileProcessorInfo) {
     this.storageGroupName = storageGroupName;
-    this.memCost = memCost;
+    this.tsFileProcessorInfo = tsFileProcessorInfo;
   }
 
   @Override
@@ -43,8 +42,8 @@ public class TsFileProcessorInfoMetrics implements IMetricSet {
         .createAutoGauge(
             Metric.MEM.toString(),
             MetricLevel.IMPORTANT,
-            memCost,
-            o -> o,
+            tsFileProcessorInfo,
+            TsFileProcessorInfo::getMemCost,
             Tag.NAME.toString(),
             "chunkMetaData_" + storageGroupName);
   }
@@ -58,17 +57,4 @@ public class TsFileProcessorInfoMetrics implements IMetricSet {
             Tag.NAME.toString(),
             "chunkMetaData_" + storageGroupName);
   }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    TsFileProcessorInfoMetrics that = (TsFileProcessorInfoMetrics) o;
-    return memCost == that.memCost && Objects.equals(storageGroupName, that.storageGroupName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(storageGroupName, memCost);
-  }
 }