This is an automated email from the ASF dual-hosted git repository. spricoder pushed a commit to branch feature/disk-metric-1.2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5a27d54a2fc399e22dd17ebf5a8014cd300e9752 Author: spricoder <[email protected]> AuthorDate: Wed Oct 11 14:25:05 2023 +0800 Add database and region tag into tsfile metrics (#11228) (cherry picked from commit f36af625129f0d8d7003ceaeea96d7835784ae6c) --- .../java/org/apache/iotdb/db/service/metrics/FileMetrics.java | 6 ------ .../compaction/execute/task/CrossSpaceCompactionTask.java | 11 ++--------- .../compaction/execute/task/InnerSpaceCompactionTask.java | 6 +----- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/FileMetrics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/FileMetrics.java index 34fae0f3bec..7884f33bf84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/FileMetrics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/FileMetrics.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.service.metrics; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.service.metrics.file.CompactionFileMetrics; import org.apache.iotdb.db.service.metrics.file.ModsFileMetrics; import org.apache.iotdb.db.service.metrics.file.SystemRelatedFileMetrics; @@ -104,9 +103,4 @@ public class FileMetrics implements IMetricSet { public static FileMetrics getInstance() { return FileMetricsInstanceHolder.INSTANCE; } - - @TestOnly - public long getFileCount(boolean seq) { - return TS_FILE_METRICS.getFileCount(seq); - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java index 50f1287b52c..8e395d217aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java @@ -211,15 +211,8 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask { .decreaseModFileSize(unsequenceResource.getModFile().getSize()); } } - - long[] sequenceFileSize = deleteOldFiles(selectedSequenceFiles); - List<String> fileNames = new ArrayList<>(selectedSequenceFiles.size()); - selectedSequenceFiles.forEach(x -> fileNames.add(x.getTsFile().getName())); - FileMetrics.getInstance().deleteFile(sequenceFileSize, true, fileNames); - fileNames.clear(); - selectedUnsequenceFiles.forEach(x -> fileNames.add(x.getTsFile().getName())); - long[] unsequenceFileSize = deleteOldFiles(selectedUnsequenceFiles); - FileMetrics.getInstance().deleteFile(unsequenceFileSize, false, fileNames); + FileMetrics.getInstance().deleteTsFile(true, selectedSequenceFiles); + FileMetrics.getInstance().deleteTsFile(false, selectedUnsequenceFiles); CompactionUtils.deleteCompactionModsFile(selectedSequenceFiles, selectedUnsequenceFiles); for (TsFileResource targetResource : targetTsfileResourceList) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java index 1499efa265a..ba2fe18980e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java @@ -275,11 +275,7 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask { // target resource is empty after compaction, then delete it targetTsFileResource.remove(); } - List<String> fileNames = new ArrayList<>(); - for (TsFileResource resource : selectedTsFileResourceList) { - fileNames.add(resource.getTsFile().getName()); - } - FileMetrics.getInstance().deleteFile(sizeList, sequence, fileNames); + FileMetrics.getInstance().deleteTsFile(sequence, selectedTsFileResourceList); CompactionMetrics.getInstance().recordSummaryInfo(summary);
