You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2023/01/31 05:58:47 UTC
[iotdb] 01/01: fix conflit with cherry pick
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch IOTDB-5418
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 391584b8b6acbfd852611286940b1f66b8ef9e32
Author: Liu Xuxin <37...@users.noreply.github.com>
AuthorDate: Tue Jan 10 15:52:01 2023 +0800
fix conflit with cherry pick
---
.../db/engine/compaction/execute/task/CrossSpaceCompactionTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
index b7ec8741e4..b9888b7a5a 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
@@ -191,6 +191,7 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
long sequenceFileSize = deleteOldFiles(selectedSequenceFiles);
long unsequenceFileSize = deleteOldFiles(selectedUnsequenceFiles);
+
CompactionUtils.deleteCompactionModsFile(selectedSequenceFiles, selectedUnsequenceFiles);
if (logFile.exists()) {
@@ -209,13 +210,13 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
targetResource.remove();
}
}
+
TsFileMetricManager.getInstance()
.deleteFile(sequenceFileSize, true, selectedSequenceFiles.size());
TsFileMetricManager.getInstance()
.deleteFile(unsequenceFileSize, false, selectedUnsequenceFiles.size());
CompactionMetricsRecorder.updateSummary(summary);
-
long costTime = (System.currentTimeMillis() - startTime) / 1000;
LOGGER.info(