You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/01/02 08:59:18 UTC
[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-5253] Fix chunkMetadata mem metric (#8663)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 108cbffacb [To rel/0.13][IOTDB-5253] Fix chunkMetadata mem metric (#8663)
108cbffacb is described below
commit 108cbffacba912267fece22b96f631368fc4bbe5
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Mon Jan 2 16:59:13 2023 +0800
[To rel/0.13][IOTDB-5253] Fix chunkMetadata mem metric (#8663)
* 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 32e0543fbd..f4f4f5c5d4 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
@@ -37,7 +37,7 @@ public class TsFileProcessorInfo {
.addMetricSet(
new TsFileProcessorInfoMetrics(
storageGroupInfo.getVirtualStorageGroupProcessor().getLogicalStorageGroupName(),
- memCost));
+ this));
}
}
@@ -58,4 +58,9 @@ public class TsFileProcessorInfo {
storageGroupInfo.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 553e59d65f..f7cc88057c 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
@@ -27,15 +27,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
@@ -44,8 +43,8 @@ public class TsFileProcessorInfoMetrics implements IMetricSet {
.getOrCreateAutoGauge(
Metric.MEM.toString(),
MetricLevel.IMPORTANT,
- memCost,
- o -> o,
+ tsFileProcessorInfo,
+ TsFileProcessorInfo::getMemCost,
Tag.NAME.toString(),
"chunkMetaData_" + storageGroupName);
}
@@ -59,17 +58,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);
- }
}