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/02/28 06:22:46 UTC
[iotdb] branch jira5595 created (now 0dbd5546f6)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a change to branch jira5595
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 0dbd5546f6 finish
This branch includes the following new commits:
new 0dbd5546f6 finish
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: finish
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch jira5595
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0dbd5546f6ae34906964ef5deffa0a25dc205f8c
Author: OneSizeFitQuorum <ta...@apache.org>
AuthorDate: Tue Feb 28 14:22:31 2023 +0800
finish
Signed-off-by: OneSizeFitQuorum <ta...@apache.org>
---
.../apache/iotdb/db/engine/storagegroup/DataRegion.java | 2 +-
.../iotdb/db/engine/storagegroup/TsFileProcessorInfo.java | 14 +++++++-------
.../db/engine/storagegroup/TsFileProcessorInfoMetrics.java | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
index 87cac75994..7f2a19a410 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
@@ -251,7 +251,7 @@ public class DataRegion implements IDataRegionForQuery {
*/
private Map<Long, Long> partitionMaxFileVersions = new HashMap<>();
/** database info for mem control */
- private DataRegionInfo dataRegionInfo = new DataRegionInfo(this);
+ private final DataRegionInfo dataRegionInfo = new DataRegionInfo(this);
/** whether it's ready from recovery */
private boolean isReady = false;
/** close file listeners */
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 da886d0d6f..d6cbcc7fdc 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
@@ -24,20 +24,19 @@ import org.apache.iotdb.commons.service.metric.MetricService;
public class TsFileProcessorInfo {
/** Once tspInfo updated, report to storageGroupInfo that this TSP belongs to. */
- private DataRegionInfo dataRegionInfo;
+ private final DataRegionInfo dataRegionInfo;
/** memory occupation of unsealed TsFileResource, ChunkMetadata, WAL */
private long memCost;
+ private final TsFileProcessorInfoMetrics metrics;
+
public TsFileProcessorInfo(DataRegionInfo dataRegionInfo) {
this.dataRegionInfo = dataRegionInfo;
this.memCost = 0L;
- if (null != dataRegionInfo.getDataRegion()) {
- MetricService.getInstance()
- .addMetricSet(
- new TsFileProcessorInfoMetrics(
- dataRegionInfo.getDataRegion().getDatabaseName(), this));
- }
+ this.metrics =
+ new TsFileProcessorInfoMetrics(dataRegionInfo.getDataRegion().getDatabaseName(), this);
+ MetricService.getInstance().addMetricSet(metrics);
}
/** called in each insert */
@@ -56,6 +55,7 @@ public class TsFileProcessorInfo {
public void clear() {
dataRegionInfo.releaseStorageGroupMemCost(memCost);
memCost = 0L;
+ MetricService.getInstance().removeMetricSet(metrics);
}
/** get 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 c771166047..67235911df 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,8 +27,8 @@ import org.apache.iotdb.metrics.utils.MetricLevel;
import org.apache.iotdb.metrics.utils.MetricType;
public class TsFileProcessorInfoMetrics implements IMetricSet {
- private String storageGroupName;
- private TsFileProcessorInfo tsFileProcessorInfo;
+ private final String storageGroupName;
+ private final TsFileProcessorInfo tsFileProcessorInfo;
public TsFileProcessorInfoMetrics(
String storageGroupName, TsFileProcessorInfo tsFileProcessorInfo) {