You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/09/18 01:54:08 UTC
[iotdb] branch rel/1.2 updated: [To rel/1.2] Delete unused recover code (#11148)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 908b5486ac5 [To rel/1.2] Delete unused recover code (#11148)
908b5486ac5 is described below
commit 908b5486ac5d05e3d5d5e32c5f78f9191af2674c
Author: shuwenwei <55...@users.noreply.github.com>
AuthorDate: Mon Sep 18 09:54:00 2023 +0800
[To rel/1.2] Delete unused recover code (#11148)
---
.../apache/iotdb/db/storageengine/dataregion/DataRegion.java | 11 -----------
.../db/storageengine/dataregion/tsfile/TsFileManager.java | 11 -----------
.../inner/sizetiered/SizeTieredCompactionRecoverTest.java | 2 --
3 files changed, 24 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index 75609c20f93..0b8ad3e5a3f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -757,17 +757,6 @@ public class DataRegion implements IDataRegionForQuery {
try (SealedTsFileRecoverPerformer recoverPerformer =
new SealedTsFileRecoverPerformer(sealedTsFile)) {
recoverPerformer.recover();
- // pick up crashed compaction target files
- if (recoverPerformer.hasCrashed()) {
- if (TsFileResource.getInnerCompactionCount(sealedTsFile.getTsFile().getName()) > 0) {
- tsFileManager.addForRecover(sealedTsFile, isSeq);
- return;
- } else {
- logger.warn(
- "Sealed TsFile {} has crashed at zero level, truncate and recover it.",
- sealedTsFile.getTsFilePath());
- }
- }
sealedTsFile.close();
tsFileManager.add(sealedTsFile, isSeq);
tsFileResourceManager.registerSealedTsFileResource(sealedTsFile);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileManager.java
index 77ea57a4096..fbc24dce403 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileManager.java
@@ -46,9 +46,6 @@ public class TsFileManager {
private TreeMap<Long, TsFileResourceList> sequenceFiles = new TreeMap<>();
private TreeMap<Long, TsFileResourceList> unsequenceFiles = new TreeMap<>();
- private List<TsFileResource> sequenceRecoverTsFileResources = new ArrayList<>();
- private List<TsFileResource> unsequenceRecoverTsFileResources = new ArrayList<>();
-
private boolean allowCompaction = true;
private AtomicLong currentCompactionTaskSerialId = new AtomicLong(0);
@@ -187,14 +184,6 @@ public class TsFileManager {
}
}
- public void addForRecover(TsFileResource tsFileResource, boolean sequence) {
- if (sequence) {
- sequenceRecoverTsFileResources.add(tsFileResource);
- } else {
- unsequenceRecoverTsFileResources.add(tsFileResource);
- }
- }
-
public void addAll(List<TsFileResource> tsFileResourceList, boolean sequence) {
writeLock("add");
try {
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/sizetiered/SizeTieredCompactionRecoverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/sizetiered/SizeTieredCompactionRecoverTest.java
index 7203c56f99a..eedd7870bcd 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/sizetiered/SizeTieredCompactionRecoverTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/sizetiered/SizeTieredCompactionRecoverTest.java
@@ -182,7 +182,6 @@ public class SizeTieredCompactionRecoverTest extends AbstractInnerSpaceCompactio
out.truncate(((long) (targetTsFileResource.getTsFileSize() * 0.9)));
out.close();
- tsFileManager.addForRecover(targetTsFileResource, true);
new CompactionRecoverTask(COMPACTION_TEST_SG, "0", tsFileManager, compactionLogFile, true)
.doCompaction();
path =
@@ -1141,7 +1140,6 @@ public class SizeTieredCompactionRecoverTest extends AbstractInnerSpaceCompactio
+ IoTDBConstant.INNER_COMPACTION_TMP_FILE_SUFFIX)));
sizeTieredCompactionLogger.logFiles(
Collections.singletonList(targetTsFileResource), STR_TARGET_FILES);
- tsFileManager.addForRecover(targetTsFileResource, true);
sizeTieredCompactionLogger.close();
MeasurementPath path =
SchemaTestUtils.getMeasurementPath(