You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2023/05/24 13:43:20 UTC
[iotdb] branch tiered_storage updated (5d835648c18 -> 35d70733c7b)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch tiered_storage
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 5d835648c18 delete duplicate TsFiles when recovering
new 5979837f715 refactor TsFile status
new 35d70733c7b refactor TsFile status with migration
The 2 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.
Summary of changes:
.../execute/task/AbstractCompactionTask.java | 25 +++++-
.../execute/task/CrossSpaceCompactionTask.java | 15 ++--
.../execute/task/InnerSpaceCompactionTask.java | 21 ++---
.../writer/AbstractCrossCompactionWriter.java | 3 +-
.../writer/AbstractInnerCompactionWriter.java | 4 +-
.../compaction/schedule/CompactionTaskManager.java | 5 +-
.../impl/SizeTieredCompactionSelector.java | 4 +-
.../utils/CrossSpaceCompactionCandidate.java | 11 +--
.../db/engine/migration/LocalMigrationTask.java | 3 +
.../iotdb/db/engine/migration/MigrationTask.java | 13 ++-
.../db/engine/migration/MigrationTaskManager.java | 22 +----
.../db/engine/migration/RemoteMigrationTask.java | 3 +
.../iotdb/db/engine/storagegroup/DataRegion.java | 4 +
.../db/engine/storagegroup/TsFileResource.java | 98 ++++++++++++----------
.../engine/storagegroup/TsFileResourceStatus.java | 2 +
.../iotdb/db/engine/cache/ChunkCacheTest.java | 4 +-
.../engine/compaction/AbstractCompactionTest.java | 6 +-
.../cross/CrossSpaceCompactionSelectorTest.java | 12 +--
.../CrossSpaceCompactionWithFastPerformerTest.java | 6 +-
...eCompactionWithFastPerformerValidationTest.java | 16 ++--
...sSpaceCompactionWithReadPointPerformerTest.java | 6 +-
...actionWithReadPointPerformerValidationTest.java | 12 +--
.../db/engine/compaction/cross/MergeTest.java | 6 +-
.../cross/RewriteCompactionFileSelectorTest.java | 42 +++++-----
.../inner/AbstractInnerSpaceCompactionTest.java | 4 +-
.../inner/InnerCompactionMoreDataTest.java | 2 +-
.../inner/InnerCompactionSchedulerTest.java | 6 +-
.../compaction/inner/InnerCompactionTest.java | 4 +-
.../inner/sizetiered/SizeTieredCompactionTest.java | 10 +--
.../utils/MultiTsFileDeviceIteratorTest.java | 12 +--
.../db/engine/snapshot/IoTDBSnapshotTest.java | 4 +-
.../db/engine/storagegroup/TsFileResourceTest.java | 2 +-
.../execution/operator/AlignedSeriesTestUtil.java | 6 +-
.../AlignedSeriesScanLimitOffsetPushDownTest.java | 10 +--
.../query/reader/series/SeriesReaderTestUtil.java | 6 +-
.../series/SeriesScanLimitOffsetPushDownTest.java | 8 +-
.../iotdb/db/rescon/ResourceManagerTest.java | 12 +--
37 files changed, 213 insertions(+), 216 deletions(-)
[iotdb] 02/02: refactor TsFile status with migration
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch tiered_storage
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 35d70733c7bc33c53f91074dd7e27cc5013cf441
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 24 21:43:06 2023 +0800
refactor TsFile status with migration
---
.../execute/task/AbstractCompactionTask.java | 2 +-
.../impl/SizeTieredCompactionSelector.java | 4 +---
.../utils/CrossSpaceCompactionCandidate.java | 11 ++---------
.../db/engine/migration/LocalMigrationTask.java | 3 +++
.../iotdb/db/engine/migration/MigrationTask.java | 13 ++++++-------
.../db/engine/migration/MigrationTaskManager.java | 22 +---------------------
.../db/engine/migration/RemoteMigrationTask.java | 3 +++
.../db/engine/storagegroup/TsFileResource.java | 21 ++++++++++-----------
.../engine/storagegroup/TsFileResourceStatus.java | 2 ++
9 files changed, 29 insertions(+), 52 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/AbstractCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/AbstractCompactionTask.java
index 8c91acbf556..3246a133866 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/AbstractCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/AbstractCompactionTask.java
@@ -23,9 +23,9 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.engine.compaction.execute.performer.ICompactionPerformer;
import org.apache.iotdb.db.engine.compaction.schedule.CompactionTaskManager;
import org.apache.iotdb.db.engine.storagegroup.TsFileManager;
-import org.apache.iotdb.db.service.metrics.recorder.CompactionMetricsManager;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
+import org.apache.iotdb.db.service.metrics.recorder.CompactionMetricsManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/SizeTieredCompactionSelector.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/SizeTieredCompactionSelector.java
index c3dddf47402..805abe2f1d8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/SizeTieredCompactionSelector.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/SizeTieredCompactionSelector.java
@@ -114,9 +114,7 @@ public class SizeTieredCompactionSelector
selectedFileSize = 0L;
continue;
}
- if (currentFile.getStatus() != TsFileResourceStatus.NORMAL
- || currentFile.onRemote()
- || currentFile.isMigrating()) {
+ if (currentFile.getStatus() != TsFileResourceStatus.NORMAL) {
selectedFileList.clear();
selectedFileSize = 0L;
continue;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/utils/CrossSpaceCompactionCandidate.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/utils/CrossSpaceCompactionCandidate.java
index b70cf0f0b0b..26d0ee0b1ab 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/utils/CrossSpaceCompactionCandidate.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/utils/CrossSpaceCompactionCandidate.java
@@ -142,10 +142,7 @@ public class CrossSpaceCompactionCandidate {
private List<TsFileResourceCandidate> filterUnseqResource(List<TsFileResource> unseqResources) {
List<TsFileResourceCandidate> ret = new ArrayList<>();
for (TsFileResource resource : unseqResources) {
- if (resource.getStatus() != TsFileResourceStatus.NORMAL
- || resource.onRemote()
- || resource.isMigrating()
- || !resource.getTsFile().exists()) {
+ if (resource.getStatus() != TsFileResourceStatus.NORMAL) {
break;
} else if (resource.stillLives(ttlLowerBound)) {
ret.add(new TsFileResourceCandidate(resource));
@@ -200,11 +197,7 @@ public class CrossSpaceCompactionCandidate {
this.selected = false;
// although we do the judgement here, the task should be validated before executing because
// the status of file may be changed after the task is submitted to queue
- this.isValidCandidate =
- tsFileResource.getStatus() == TsFileResourceStatus.NORMAL
- && !tsFileResource.onRemote()
- && !tsFileResource.isMigrating()
- && tsFileResource.getTsFile().exists();
+ this.isValidCandidate = tsFileResource.getStatus() == TsFileResourceStatus.NORMAL;
}
/**
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/migration/LocalMigrationTask.java b/server/src/main/java/org/apache/iotdb/db/engine/migration/LocalMigrationTask.java
index 93fcd99f82c..99b0a78c8d7 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/migration/LocalMigrationTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/migration/LocalMigrationTask.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.engine.migration;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
+import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,6 +59,8 @@ public class LocalMigrationTask extends MigrationTask {
fsFactory.copyFile(srcModsFile, destModsFile);
}
tsFileResource.setFile(destTsFile);
+ tsFileResource.increaseTierLevel();
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
} catch (Exception e) {
logger.error("Fail to copy mods file from local {} to local {}", srcModsFile, destModsFile);
destTsFile.delete();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java b/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java
index a894334a84c..e84a5074803 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTask.java
@@ -76,13 +76,12 @@ public abstract class MigrationTask implements Runnable {
@Override
public void run() {
- migrate();
- tsFileResource.increaseTierLevel();
- tsFileResource.setIsMigrating(false);
- }
-
- protected boolean canMigrate() {
- return tsFileResource.getStatus() == TsFileResourceStatus.NORMAL;
+ try {
+ migrate();
+ } finally {
+ // try to set the final status to NORMAL to avoid migrate failure
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ }
}
public abstract void migrate();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTaskManager.java b/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTaskManager.java
index ede3ecce410..53ea1a5ad4f 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTaskManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/migration/MigrationTaskManager.java
@@ -144,7 +144,7 @@ public class MigrationTaskManager implements IService {
private void submitMigrationTask(
int tierLevel, MigrationCause cause, TsFileResource sourceTsFile, String targetDir)
throws IOException {
- if (!checkAndMarkMigrate(sourceTsFile)) {
+ if (!sourceTsFile.setStatus(TsFileResourceStatus.MIGRATING)) {
return;
}
MigrationTask task = MigrationTask.newTask(cause, sourceTsFile, targetDir);
@@ -158,26 +158,6 @@ public class MigrationTaskManager implements IService {
}
}
- private boolean checkAndMarkMigrate(TsFileResource tsFile) {
- if (canMigrate(tsFile)) {
- tsFile.setIsMigrating(true);
- if (occupiedByCompaction(tsFile)) {
- tsFile.setIsMigrating(false);
- return false;
- }
- return true;
- }
- return false;
- }
-
- private boolean canMigrate(TsFileResource tsFile) {
- return tsFile.getStatus() == TsFileResourceStatus.NORMAL && !tsFile.isMigrating();
- }
-
- private boolean occupiedByCompaction(TsFileResource tsFile) {
- return tsFile.getStatus() != TsFileResourceStatus.NORMAL;
- }
-
private int compareMigrationPriority(TsFileResource f1, TsFileResource f2) {
// old time partitions first
int res = Long.compare(f1.getTimePartition(), f2.getTimePartition());
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/migration/RemoteMigrationTask.java b/server/src/main/java/org/apache/iotdb/db/engine/migration/RemoteMigrationTask.java
index fa4bbe51cd6..ee209234019 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/migration/RemoteMigrationTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/migration/RemoteMigrationTask.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.engine.migration;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
+import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,6 +61,8 @@ public class RemoteMigrationTask extends MigrationTask {
tsFileResource.writeLock();
try {
srcFile.delete();
+ tsFileResource.increaseTierLevel();
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL_ON_REMOTE);
} catch (Exception e) {
logger.error("Fail to delete local TsFile {}", srcFile);
} finally {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index 1e627629c26..4dc2e1bede7 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -135,8 +135,6 @@ public class TsFileResource {
private volatile int tierLevel = 0;
- private volatile boolean isMigrating = false;
-
private volatile long tsFileSize = -1L;
private TsFileProcessor processor;
@@ -190,6 +188,9 @@ public class TsFileResource {
// This method is invoked when DataNode recovers, so the tierLevel should be calculated when
// restarting
this.tierLevel = TierManager.getInstance().getFileTierLevel(file);
+ if (onRemote()) {
+ this.setAtomicStatus(TsFileResourceStatus.NORMAL_ON_REMOTE);
+ }
}
/** Used for compaction to create target files. */
@@ -652,16 +653,8 @@ public class TsFileResource {
return getStatus() == TsFileResourceStatus.COMPACTION_CANDIDATE;
}
- public boolean isMigrating() {
- return isMigrating;
- }
-
- public void setIsMigrating(boolean isMigrating) {
- this.isMigrating = isMigrating;
- }
-
public boolean onRemote() {
- return !file.exists();
+ return !isDeleted() && !file.exists();
}
private boolean compareAndSetStatus(
@@ -682,9 +675,13 @@ public class TsFileResource {
switch (status) {
case NORMAL:
return compareAndSetStatus(TsFileResourceStatus.UNCLOSED, TsFileResourceStatus.NORMAL)
+ || compareAndSetStatus(TsFileResourceStatus.MIGRATING, TsFileResourceStatus.NORMAL)
|| compareAndSetStatus(TsFileResourceStatus.COMPACTING, TsFileResourceStatus.NORMAL)
|| compareAndSetStatus(
TsFileResourceStatus.COMPACTION_CANDIDATE, TsFileResourceStatus.NORMAL);
+ case NORMAL_ON_REMOTE:
+ return compareAndSetStatus(
+ TsFileResourceStatus.MIGRATING, TsFileResourceStatus.NORMAL_ON_REMOTE);
case UNCLOSED:
// TsFile cannot be set back to UNCLOSED so false is always returned
return false;
@@ -698,6 +695,8 @@ public class TsFileResource {
case COMPACTION_CANDIDATE:
return compareAndSetStatus(
TsFileResourceStatus.NORMAL, TsFileResourceStatus.COMPACTION_CANDIDATE);
+ case MIGRATING:
+ return compareAndSetStatus(TsFileResourceStatus.NORMAL, TsFileResourceStatus.COMPACTING);
default:
return false;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceStatus.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceStatus.java
index 4c1c95ca7e6..f389492553e 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceStatus.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceStatus.java
@@ -22,7 +22,9 @@ public enum TsFileResourceStatus {
UNCLOSED,
/** The resource in status NORMAL, COMPACTION_CANDIDATE, COMPACTING, DELETED is all CLOSED. */
NORMAL,
+ NORMAL_ON_REMOTE,
COMPACTION_CANDIDATE,
COMPACTING,
+ MIGRATING,
DELETED
}
[iotdb] 01/02: refactor TsFile status
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch tiered_storage
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5979837f71596c7567e01ef947a6c5075e23b303
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 24 21:11:07 2023 +0800
refactor TsFile status
---
.../execute/task/AbstractCompactionTask.java | 25 ++++++-
.../execute/task/CrossSpaceCompactionTask.java | 15 ++--
.../execute/task/InnerSpaceCompactionTask.java | 21 ++----
.../writer/AbstractCrossCompactionWriter.java | 3 +-
.../writer/AbstractInnerCompactionWriter.java | 4 +-
.../compaction/schedule/CompactionTaskManager.java | 5 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 4 ++
.../db/engine/storagegroup/TsFileResource.java | 83 ++++++++++++----------
.../iotdb/db/engine/cache/ChunkCacheTest.java | 4 +-
.../engine/compaction/AbstractCompactionTest.java | 6 +-
.../cross/CrossSpaceCompactionSelectorTest.java | 12 ++--
.../CrossSpaceCompactionWithFastPerformerTest.java | 6 +-
...eCompactionWithFastPerformerValidationTest.java | 16 ++---
...sSpaceCompactionWithReadPointPerformerTest.java | 6 +-
...actionWithReadPointPerformerValidationTest.java | 12 ++--
.../db/engine/compaction/cross/MergeTest.java | 6 +-
.../cross/RewriteCompactionFileSelectorTest.java | 42 +++++------
.../inner/AbstractInnerSpaceCompactionTest.java | 4 +-
.../inner/InnerCompactionMoreDataTest.java | 2 +-
.../inner/InnerCompactionSchedulerTest.java | 6 +-
.../compaction/inner/InnerCompactionTest.java | 4 +-
.../inner/sizetiered/SizeTieredCompactionTest.java | 10 +--
.../utils/MultiTsFileDeviceIteratorTest.java | 12 ++--
.../db/engine/snapshot/IoTDBSnapshotTest.java | 4 +-
.../db/engine/storagegroup/TsFileResourceTest.java | 2 +-
.../execution/operator/AlignedSeriesTestUtil.java | 6 +-
.../AlignedSeriesScanLimitOffsetPushDownTest.java | 10 +--
.../query/reader/series/SeriesReaderTestUtil.java | 6 +-
.../series/SeriesScanLimitOffsetPushDownTest.java | 8 +--
.../iotdb/db/rescon/ResourceManagerTest.java | 12 ++--
30 files changed, 188 insertions(+), 168 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/AbstractCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/AbstractCompactionTask.java
index ea389b47df2..8c91acbf556 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/AbstractCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/AbstractCompactionTask.java
@@ -24,10 +24,13 @@ import org.apache.iotdb.db.engine.compaction.execute.performer.ICompactionPerfor
import org.apache.iotdb.db.engine.compaction.schedule.CompactionTaskManager;
import org.apache.iotdb.db.engine.storagegroup.TsFileManager;
import org.apache.iotdb.db.service.metrics.recorder.CompactionMetricsManager;
+import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
+import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -67,7 +70,27 @@ public abstract class AbstractCompactionTask {
this.serialId = serialId;
}
- public abstract void setSourceFilesToCompactionCandidate();
+ protected abstract List<TsFileResource> getAllSourceTsFiles();
+
+ /**
+ * This method will try to set the files to COMPACTION_CANDIDATE. If failed, it should roll back
+ * all status to original value
+ *
+ * @return set status successfully or not
+ */
+ public boolean setSourceFilesToCompactionCandidate() {
+ List<TsFileResource> files = getAllSourceTsFiles();
+ for (int i = 0; i < files.size(); i++) {
+ if (!files.get(i).setStatus(TsFileResourceStatus.COMPACTION_CANDIDATE)) {
+ // rollback status to NORMAL
+ for (int j = 0; j < i; j++) {
+ files.get(j).setStatus(TsFileResourceStatus.NORMAL);
+ }
+ return false;
+ }
+ }
+ return true;
+ }
protected abstract boolean doCompaction();
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 705942b12f5..12f3d6b50e3 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
@@ -305,10 +305,11 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
}
@Override
- public void setSourceFilesToCompactionCandidate() {
- this.selectedSequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.COMPACTION_CANDIDATE));
- this.selectedUnsequenceFiles.forEach(
- x -> x.setStatus(TsFileResourceStatus.COMPACTION_CANDIDATE));
+ protected List<TsFileResource> getAllSourceTsFiles() {
+ List<TsFileResource> allRelatedFiles = new ArrayList<>();
+ allRelatedFiles.addAll(selectedSequenceFiles);
+ allRelatedFiles.addAll(selectedUnsequenceFiles);
+ return allRelatedFiles;
}
public List<TsFileResource> getSelectedUnsequenceFiles() {
@@ -396,14 +397,10 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
for (TsFileResource tsFileResource : tsFileResourceList) {
tsFileResource.readLock();
holdReadLockList.add(tsFileResource);
- if (tsFileResource.isCompacting()
- || !tsFileResource.isClosed()
- || !tsFileResource.getTsFile().exists()
- || tsFileResource.isDeleted()) {
+ if (!tsFileResource.setStatus(TsFileResourceStatus.COMPACTING)) {
releaseAllLock();
return false;
}
- tsFileResource.setStatus(TsFileResourceStatus.COMPACTING);
}
} catch (Throwable e) {
releaseAllLock();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
index f04c389b280..510498120bd 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
@@ -320,8 +320,8 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
}
@Override
- public void setSourceFilesToCompactionCandidate() {
- selectedTsFileResourceList.forEach(x -> x.setStatus(TsFileResourceStatus.COMPACTION_CANDIDATE));
+ protected List<TsFileResource> getAllSourceTsFiles() {
+ return this.selectedTsFileResourceList;
}
private void collectSelectedFilesInfo() {
@@ -417,9 +417,9 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
resource.writeUnlock();
}
try {
- if (!resource.isDeleted()) {
- selectedTsFileResourceList.get(i).setStatus(TsFileResourceStatus.NORMAL);
- }
+ // try to set the file's status back to NORMAL. If the status is Deleted, its status won't
+ // be changed
+ selectedTsFileResourceList.get(i).setStatus(TsFileResourceStatus.NORMAL);
} catch (Throwable e) {
LOGGER.error("Exception occurs when resetting resource status", e);
}
@@ -436,20 +436,11 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
TsFileResource resource = selectedTsFileResourceList.get(i);
resource.readLock();
isHoldingReadLock[i] = true;
- if (resource.isCompacting()
- || !resource.isClosed()
- || !resource.getTsFile().exists()
- || resource.isDeleted()) {
- // this source file cannot be compacted
- // release the lock of locked files, and return
+ if (!resource.setStatus(TsFileResourceStatus.COMPACTING)) {
releaseFileLocksAndResetMergingStatus();
return false;
}
}
-
- for (TsFileResource resource : selectedTsFileResourceList) {
- resource.setStatus(TsFileResourceStatus.COMPACTING);
- }
} catch (Throwable e) {
releaseFileLocksAndResetMergingStatus();
throw e;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java
index e1d29296af6..44409808daf 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java
@@ -22,7 +22,6 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.compaction.execute.utils.CompactionUtils;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
-import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.apache.iotdb.db.rescon.SystemInfo;
import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata;
import org.apache.iotdb.tsfile.read.TimeValuePair;
@@ -147,7 +146,7 @@ public abstract class AbstractCrossCompactionWriter extends AbstractCompactionWr
targetFileWriters.get(i).endFile();
// set empty target file to DELETED
if (isEmptyFile[i]) {
- targetResources.get(i).setStatus(TsFileResourceStatus.DELETED);
+ targetResources.get(i).forceMarkDeleted();
}
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractInnerCompactionWriter.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractInnerCompactionWriter.java
index 37f3f996a0d..6404730d0e4 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractInnerCompactionWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractInnerCompactionWriter.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.engine.compaction.execute.utils.writer;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.compaction.execute.utils.CompactionUtils;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
-import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.apache.iotdb.db.rescon.SystemInfo;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.read.TimeValuePair;
@@ -90,8 +89,7 @@ public abstract class AbstractInnerCompactionWriter extends AbstractCompactionWr
public void endFile() throws IOException {
fileWriter.endFile();
if (isEmptyFile) {
- // set target file to DELETED
- targetResource.setStatus(TsFileResourceStatus.DELETED);
+ targetResource.forceMarkDeleted();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionTaskManager.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionTaskManager.java
index 024b02fc9bf..a7b8280637d 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionTaskManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionTaskManager.java
@@ -221,10 +221,9 @@ public class CompactionTaskManager implements IService {
throws InterruptedException {
if (init
&& !candidateCompactionTaskQueue.contains(compactionTask)
- && !isTaskRunning(compactionTask)) {
- compactionTask.setSourceFilesToCompactionCandidate();
+ && !isTaskRunning(compactionTask)
+ && compactionTask.setSourceFilesToCompactionCandidate()) {
candidateCompactionTaskQueue.put(compactionTask);
-
return true;
}
return false;
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 f358c88d927..e302ea4e2f7 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
@@ -1657,6 +1657,10 @@ public class DataRegion implements IDataRegionForQuery {
// ensure that the file is not used by any queries
if (resource.tryWriteLock()) {
try {
+ // Try to set the resource to DELETED status and return if it failed
+ if (!resource.setStatus(TsFileResourceStatus.DELETED)) {
+ return;
+ }
// try to delete physical data file
resource.remove();
tsFileManager.remove(resource, isSeq);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index 859d6b201ff..1e627629c26 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -66,6 +66,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Random;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
import static org.apache.iotdb.commons.conf.IoTDBConstant.FILE_NAME_SEPARATOR;
import static org.apache.iotdb.db.engine.storagegroup.TsFileNameGenerator.getTsFileName;
@@ -101,7 +102,8 @@ public class TsFileResource {
private volatile ModificationFile compactionModFile;
- protected volatile TsFileResourceStatus status = TsFileResourceStatus.UNCLOSED;
+ protected AtomicReference<TsFileResourceStatus> atomicStatus =
+ new AtomicReference<>(TsFileResourceStatus.UNCLOSED);
private TsFileLock tsFileLock = new TsFileLock();
@@ -165,7 +167,7 @@ public class TsFileResource {
this.processor = other.processor;
this.timeIndex = other.timeIndex;
this.modFile = other.modFile;
- this.status = other.status;
+ this.setAtomicStatus(other.getStatus());
this.pathToChunkMetadataListMap = other.pathToChunkMetadataListMap;
this.pathToReadOnlyMemChunkMap = other.pathToReadOnlyMemChunkMap;
this.pathToTimeSeriesMetadataMap = other.pathToTimeSeriesMetadataMap;
@@ -193,7 +195,7 @@ public class TsFileResource {
/** Used for compaction to create target files. */
public TsFileResource(File file, TsFileResourceStatus status) {
this(file);
- this.status = status;
+ this.setAtomicStatus(status);
}
/** unsealed TsFile, for writter */
@@ -484,7 +486,7 @@ public class TsFileResource {
}
public boolean isClosed() {
- return this.status != TsFileResourceStatus.UNCLOSED;
+ return getStatus() != TsFileResourceStatus.UNCLOSED;
}
public void close() throws IOException {
@@ -571,7 +573,7 @@ public class TsFileResource {
* file physically.
*/
public boolean remove() {
- setStatus(TsFileResourceStatus.DELETED);
+ forceMarkDeleted();
try {
fsFactory.deleteIfExists(file);
fsFactory.deleteIfExists(
@@ -618,7 +620,7 @@ public class TsFileResource {
@Override
public String toString() {
- return String.format("file is %s, status: %s", file.toString(), status);
+ return String.format("file is %s, status: %s", file.toString(), getStatus());
}
@Override
@@ -639,15 +641,15 @@ public class TsFileResource {
}
public boolean isDeleted() {
- return this.status == TsFileResourceStatus.DELETED;
+ return getStatus() == TsFileResourceStatus.DELETED;
}
public boolean isCompacting() {
- return this.status == TsFileResourceStatus.COMPACTING;
+ return getStatus() == TsFileResourceStatus.COMPACTING;
}
public boolean isCompactionCandidate() {
- return this.status == TsFileResourceStatus.COMPACTION_CANDIDATE;
+ return getStatus() == TsFileResourceStatus.COMPACTION_CANDIDATE;
}
public boolean isMigrating() {
@@ -662,44 +664,51 @@ public class TsFileResource {
return !file.exists();
}
- public void setStatus(TsFileResourceStatus status) {
+ private boolean compareAndSetStatus(
+ TsFileResourceStatus expectedValue, TsFileResourceStatus newValue) {
+ return atomicStatus.compareAndSet(expectedValue, newValue);
+ }
+
+ private void setAtomicStatus(TsFileResourceStatus status) {
+ atomicStatus.set(status);
+ }
+
+ @TestOnly
+ public void setStatusForTest(TsFileResourceStatus status) {
+ setAtomicStatus(status);
+ }
+
+ public boolean setStatus(TsFileResourceStatus status) {
switch (status) {
case NORMAL:
- this.status = TsFileResourceStatus.NORMAL;
- break;
+ return compareAndSetStatus(TsFileResourceStatus.UNCLOSED, TsFileResourceStatus.NORMAL)
+ || compareAndSetStatus(TsFileResourceStatus.COMPACTING, TsFileResourceStatus.NORMAL)
+ || compareAndSetStatus(
+ TsFileResourceStatus.COMPACTION_CANDIDATE, TsFileResourceStatus.NORMAL);
case UNCLOSED:
- this.status = TsFileResourceStatus.UNCLOSED;
- break;
+ // TsFile cannot be set back to UNCLOSED so false is always returned
+ return false;
case DELETED:
- this.status = TsFileResourceStatus.DELETED;
- break;
+ return compareAndSetStatus(TsFileResourceStatus.NORMAL, TsFileResourceStatus.DELETED)
+ || compareAndSetStatus(
+ TsFileResourceStatus.COMPACTION_CANDIDATE, TsFileResourceStatus.DELETED);
case COMPACTING:
- if (this.status == TsFileResourceStatus.COMPACTION_CANDIDATE) {
- this.status = TsFileResourceStatus.COMPACTING;
- } else {
- throw new RuntimeException(
- this.file.getAbsolutePath()
- + " Cannot set the status of TsFileResource to COMPACTING while its status is "
- + this.status);
- }
- break;
+ return compareAndSetStatus(
+ TsFileResourceStatus.COMPACTION_CANDIDATE, TsFileResourceStatus.COMPACTING);
case COMPACTION_CANDIDATE:
- if (this.status == TsFileResourceStatus.NORMAL) {
- this.status = TsFileResourceStatus.COMPACTION_CANDIDATE;
- } else {
- throw new RuntimeException(
- this.file.getAbsolutePath()
- + " Cannot set the status of TsFileResource to COMPACTION_CANDIDATE while its status is "
- + this.status);
- }
- break;
+ return compareAndSetStatus(
+ TsFileResourceStatus.NORMAL, TsFileResourceStatus.COMPACTION_CANDIDATE);
default:
- break;
+ return false;
}
}
+ public void forceMarkDeleted() {
+ atomicStatus.set(TsFileResourceStatus.DELETED);
+ }
+
public TsFileResourceStatus getStatus() {
- return this.status;
+ return this.atomicStatus.get();
}
/**
@@ -923,6 +932,7 @@ public class TsFileResource {
}
public void delete() throws IOException {
+ forceMarkDeleted();
if (file.exists()) {
Files.delete(file.toPath());
Files.delete(
@@ -930,7 +940,6 @@ public class TsFileResource {
.getFile(file.toPath() + TsFileResource.RESOURCE_SUFFIX)
.toPath());
}
- setStatus(TsFileResourceStatus.DELETED);
}
public long getMaxPlanIndex() {
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkCacheTest.java b/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkCacheTest.java
index 8afb2d52070..ca63960d488 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkCacheTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkCacheTest.java
@@ -150,7 +150,7 @@ public class ChunkCacheTest {
Assert.assertTrue(file.getParentFile().mkdirs());
}
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
@@ -161,7 +161,7 @@ public class ChunkCacheTest {
Assert.assertTrue(file.getParentFile().mkdirs());
}
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(i + seqFileNum);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
index 49420837986..71f7820dd6f 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
@@ -325,7 +325,7 @@ public class AbstractCompactionTest {
startTime + pointNum * i + timeInterval * i + pointNum - 1);
}
resource.updatePlanIndexes(fileVersion);
- resource.setStatus(TsFileResourceStatus.NORMAL);
+ resource.setStatusForTest(TsFileResourceStatus.NORMAL);
resource.serialize();
if (isSeq) {
seqResources.add(resource);
@@ -353,7 +353,7 @@ public class AbstractCompactionTest {
}
resource.updatePlanIndexes(fileVersion);
- resource.setStatus(TsFileResourceStatus.NORMAL);
+ resource.setStatusForTest(TsFileResourceStatus.NORMAL);
resource.serialize();
if (isSeq) {
seqResources.add(resource);
@@ -595,7 +595,7 @@ public class AbstractCompactionTest {
}
TsFileResource resource = new TsFileResource(new File(filePath));
resource.updatePlanIndexes(fileVersion);
- resource.setStatus(TsFileResourceStatus.NORMAL);
+ resource.setStatusForTest(TsFileResourceStatus.NORMAL);
return resource;
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionSelectorTest.java
index 42a19850f01..b5b289bea46 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionSelectorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionSelectorTest.java
@@ -73,7 +73,7 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest {
throws IOException, MetadataException, WriteProcessException {
createFiles(1, 2, 3, 50, 0, 10000, 50, 50, false, true);
createFiles(5, 2, 3, 50, 0, 10000, 50, 50, false, false);
- seqResources.get(0).setStatus(TsFileResourceStatus.UNCLOSED);
+ seqResources.get(0).setStatusForTest(TsFileResourceStatus.UNCLOSED);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
List<CrossCompactionTaskResource> selected =
@@ -106,7 +106,7 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest {
throws IOException, MetadataException, WriteProcessException {
createFiles(2, 2, 3, 50, 0, 10000, 50, 50, false, true);
createFiles(5, 2, 3, 50, 0, 10000, 50, 50, false, false);
- seqResources.get(1).setStatus(TsFileResourceStatus.UNCLOSED);
+ seqResources.get(1).setStatusForTest(TsFileResourceStatus.UNCLOSED);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
List<CrossCompactionTaskResource> selected =
@@ -116,8 +116,8 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest {
Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
createFiles(1, 2, 3, 200, 200, 10000, 50, 50, false, true);
- seqResources.get(1).setStatus(TsFileResourceStatus.NORMAL);
- seqResources.get(2).setStatus(TsFileResourceStatus.UNCLOSED);
+ seqResources.get(1).setStatusForTest(TsFileResourceStatus.NORMAL);
+ seqResources.get(2).setStatusForTest(TsFileResourceStatus.UNCLOSED);
selected = selector.selectCrossSpaceTask(seqResources, unseqResources);
Assert.assertEquals(1, selected.size());
Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
@@ -125,8 +125,8 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest {
createFiles(1, 2, 3, 200, 1000, 10000, 50, 50, false, true);
createFiles(1, 2, 3, 200, 2000, 10000, 50, 50, false, true);
- seqResources.get(2).setStatus(TsFileResourceStatus.NORMAL);
- seqResources.get(4).setStatus(TsFileResourceStatus.UNCLOSED);
+ seqResources.get(2).setStatusForTest(TsFileResourceStatus.NORMAL);
+ seqResources.get(4).setStatusForTest(TsFileResourceStatus.UNCLOSED);
selected = selector.selectCrossSpaceTask(seqResources, unseqResources);
Assert.assertEquals(1, selected.size());
Assert.assertEquals(4, selected.get(0).getSeqFiles().size());
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java
index 2f7b7ed4d36..2918850e42d 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java
@@ -437,7 +437,7 @@ public class CrossSpaceCompactionWithFastPerformerTest {
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.NORMAL);
+ targetResource.setStatusForTest(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
@@ -741,7 +741,7 @@ public class CrossSpaceCompactionWithFastPerformerTest {
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.NORMAL);
+ targetResource.setStatusForTest(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
@@ -1044,7 +1044,7 @@ public class CrossSpaceCompactionWithFastPerformerTest {
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.NORMAL);
+ targetResource.setStatusForTest(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
index fd470fb0e15..b2b1279cee3 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
@@ -245,7 +245,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
createFiles(2, 5, 10, 1000, 4200, 4200, 100, 100, true, true);
createFiles(1, 5, 10, 1000, 6500, 6500, 100, 100, true, true);
createFiles(1, 5, 10, 1000, 6301, 6301, 100, 100, true, false);
- seqResources.get(4).setStatus(TsFileResourceStatus.UNCLOSED);
+ seqResources.get(4).setStatusForTest(TsFileResourceStatus.UNCLOSED);
tsFileManager.addAll(seqResources, true);
tsFileManager.addAll(unseqResources, false);
@@ -1871,7 +1871,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
createFiles(1, 10, 10, 1000, 2500, 2500, 100, 100, false, false);
TsFileResource unclosedSeqResource = new TsFileResource(seqResources.get(4).getTsFile());
- unclosedSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastSeqResource = seqResources.get(4);
for (String deviceID : lastSeqResource.getDevices()) {
unclosedSeqResource.updateStartTime(deviceID, lastSeqResource.getStartTime(deviceID));
@@ -1925,7 +1925,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
createFiles(1, 10, 10, 1000, 2500, 2500, 100, 100, false, false);
TsFileResource unclosedSeqResource = new TsFileResource(seqResources.get(4).getTsFile());
- unclosedSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastSeqResource = seqResources.get(4);
for (String deviceID : lastSeqResource.getDevices()) {
unclosedSeqResource.updateStartTime(deviceID, lastSeqResource.getStartTime(deviceID));
@@ -1972,7 +1972,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
createFiles(1, 5, 5, 3000, 1500, 1500, 100, 100, false, false);
TsFileResource unclosedSeqResource = new TsFileResource(seqResources.get(4).getTsFile());
- unclosedSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastSeqResource = seqResources.get(4);
for (String deviceID : lastSeqResource.getDevices()) {
unclosedSeqResource.updateStartTime(deviceID, lastSeqResource.getStartTime(deviceID));
@@ -2025,7 +2025,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
createFiles(1, 5, 5, 50, 4310, 4310, 100, 100, false, false);
TsFileResource unclosedSeqResource = new TsFileResource(seqResources.get(4).getTsFile());
- unclosedSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastSeqResource = seqResources.get(4);
for (String deviceID : lastSeqResource.getDevices()) {
unclosedSeqResource.updateStartTime(deviceID, lastSeqResource.getStartTime(deviceID));
@@ -2079,7 +2079,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
createFiles(1, 5, 5, 3000, 1500, 1500, 100, 100, false, false);
TsFileResource unclosedUnSeqResource = new TsFileResource(unseqResources.get(1).getTsFile());
- unclosedUnSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedUnSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastUnSeqResource = unseqResources.get(1);
for (String deviceID : lastUnSeqResource.getDevices()) {
unclosedUnSeqResource.updateStartTime(deviceID, lastUnSeqResource.getStartTime(deviceID));
@@ -2149,7 +2149,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
CompactionUtils.combineModsInInnerCompaction(sourceFiles, targetResources.get(0));
tsFileManager.replace(sourceFiles, Collections.emptyList(), targetResources, 0, true);
CompactionUtils.deleteTsFilesInDisk(sourceFiles, COMPACTION_TEST_SG + "-" + "0");
- targetResources.forEach(x -> x.setStatus(TsFileResourceStatus.NORMAL));
+ targetResources.forEach(x -> x.setStatusForTest(TsFileResourceStatus.NORMAL));
// start selecting files and then start a cross space compaction task
ICrossSpaceSelector selector =
@@ -2289,7 +2289,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
Assert.assertEquals(0, innerSelector.selectInnerSpaceTask(targetResources).size());
// first compaction task finishes successfully
- targetResources.forEach(x -> x.setStatus(TsFileResourceStatus.NORMAL));
+ targetResources.forEach(x -> x.setStatusForTest(TsFileResourceStatus.NORMAL));
// target file of first compaction task can be selected to participate in another cross
// compaction task
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java
index 6f4e440ab2b..13ffa1cdad1 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java
@@ -436,7 +436,7 @@ public class CrossSpaceCompactionWithReadPointPerformerTest {
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.NORMAL);
+ targetResource.setStatusForTest(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
@@ -740,7 +740,7 @@ public class CrossSpaceCompactionWithReadPointPerformerTest {
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.NORMAL);
+ targetResource.setStatusForTest(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
@@ -1043,7 +1043,7 @@ public class CrossSpaceCompactionWithReadPointPerformerTest {
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.NORMAL);
+ targetResource.setStatusForTest(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
index 6fdf681fa2f..2b82c6894e1 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
@@ -245,7 +245,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
createFiles(2, 5, 10, 1000, 4200, 4200, 100, 100, true, true);
createFiles(1, 5, 10, 1000, 6500, 6500, 100, 100, true, true);
createFiles(1, 5, 10, 1000, 6301, 6301, 100, 100, true, false);
- seqResources.get(4).setStatus(TsFileResourceStatus.UNCLOSED);
+ seqResources.get(4).setStatusForTest(TsFileResourceStatus.UNCLOSED);
tsFileManager.addAll(seqResources, true);
tsFileManager.addAll(unseqResources, false);
@@ -1871,7 +1871,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
createFiles(1, 10, 10, 1000, 2500, 2500, 100, 100, false, false);
TsFileResource unclosedSeqResource = new TsFileResource(seqResources.get(4).getTsFile());
- unclosedSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastSeqResource = seqResources.get(4);
for (String deviceID : lastSeqResource.getDevices()) {
unclosedSeqResource.updateStartTime(deviceID, lastSeqResource.getStartTime(deviceID));
@@ -1925,7 +1925,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
createFiles(1, 10, 10, 1000, 2500, 2500, 100, 100, false, false);
TsFileResource unclosedSeqResource = new TsFileResource(seqResources.get(4).getTsFile());
- unclosedSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastSeqResource = seqResources.get(4);
for (String deviceID : lastSeqResource.getDevices()) {
unclosedSeqResource.updateStartTime(deviceID, lastSeqResource.getStartTime(deviceID));
@@ -1972,7 +1972,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
createFiles(1, 5, 5, 3000, 1500, 1500, 100, 100, false, false);
TsFileResource unclosedSeqResource = new TsFileResource(seqResources.get(4).getTsFile());
- unclosedSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastSeqResource = seqResources.get(4);
for (String deviceID : lastSeqResource.getDevices()) {
unclosedSeqResource.updateStartTime(deviceID, lastSeqResource.getStartTime(deviceID));
@@ -2025,7 +2025,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
createFiles(1, 5, 5, 50, 4310, 4310, 100, 100, false, false);
TsFileResource unclosedSeqResource = new TsFileResource(seqResources.get(4).getTsFile());
- unclosedSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastSeqResource = seqResources.get(4);
for (String deviceID : lastSeqResource.getDevices()) {
unclosedSeqResource.updateStartTime(deviceID, lastSeqResource.getStartTime(deviceID));
@@ -2079,7 +2079,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
createFiles(1, 5, 5, 3000, 1500, 1500, 100, 100, false, false);
TsFileResource unclosedUnSeqResource = new TsFileResource(unseqResources.get(1).getTsFile());
- unclosedUnSeqResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ unclosedUnSeqResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileResource lastUnSeqResource = unseqResources.get(1);
for (String deviceID : lastUnSeqResource.getDevices()) {
unclosedUnSeqResource.updateStartTime(deviceID, lastUnSeqResource.getStartTime(deviceID));
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTest.java
index fb3b7d65494..dc4759f969e 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTest.java
@@ -104,7 +104,7 @@ abstract class MergeTest {
File file = new File(TestConstant.getTestTsFilePath("root.sg1", 0, 0, i));
mkdirs(file);
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i);
tsFileResource.setMaxPlanIndex(i);
tsFileResource.setVersion(i);
@@ -115,7 +115,7 @@ abstract class MergeTest {
File file = new File(TestConstant.getTestTsFilePath("root.sg1", 0, 0, i + seqFileNum));
mkdirs(file);
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i + seqFileNum);
tsFileResource.setMaxPlanIndex(i + seqFileNum);
tsFileResource.setVersion(i + seqFileNum);
@@ -127,7 +127,7 @@ abstract class MergeTest {
new File(TestConstant.getTestTsFilePath("root.sg1", 0, 0, seqFileNum + unseqFileNum));
mkdirs(file);
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(seqFileNum + unseqFileNum);
tsFileResource.setMaxPlanIndex(seqFileNum + unseqFileNum);
tsFileResource.setVersion(seqFileNum + unseqFileNum);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
index 2d036ece092..fcc2f8bfc67 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
@@ -149,7 +149,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ ".tsfile"));
TsFileResource largeUnseqTsFileResource = new TsFileResource(file);
unseqResources.add(largeUnseqTsFileResource);
- largeUnseqTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ largeUnseqTsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
largeUnseqTsFileResource.setMinPlanIndex(10);
largeUnseqTsFileResource.setMaxPlanIndex(10);
largeUnseqTsFileResource.setVersion(10);
@@ -157,7 +157,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
// update the second file's status to open
TsFileResource secondTsFileResource = seqResources.get(1);
- secondTsFileResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ secondTsFileResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
Set<String> devices = secondTsFileResource.getDevices();
// update the end time of the file to Long.MIN_VALUE, so we can simulate a real open file
Field timeIndexField = TsFileResource.class.getDeclaredField("timeIndex");
@@ -200,7 +200,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ ".tsfile"));
TsFileResource largeUnseqTsFileResource = new TsFileResource(file);
unseqResources.add(largeUnseqTsFileResource);
- largeUnseqTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ largeUnseqTsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
largeUnseqTsFileResource.setMinPlanIndex(10);
largeUnseqTsFileResource.setMaxPlanIndex(10);
largeUnseqTsFileResource.setVersion(10);
@@ -208,7 +208,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
// update the second file's status to open
TsFileResource secondTsFileResource = seqResources.get(1);
- secondTsFileResource.setStatus(TsFileResourceStatus.UNCLOSED);
+ secondTsFileResource.setStatusForTest(TsFileResourceStatus.UNCLOSED);
Set<String> devices = secondTsFileResource.getDevices();
// update the end time of the file to Long.MIN_VALUE, so we can simulate a real open file
Field timeIndexField = TsFileResource.class.getDeclaredField("timeIndex");
@@ -250,7 +250,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource largeUnseqTsFileResource = new TsFileResource(file);
- largeUnseqTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ largeUnseqTsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
largeUnseqTsFileResource.setMinPlanIndex(10);
largeUnseqTsFileResource.setMaxPlanIndex(10);
largeUnseqTsFileResource.setVersion(10);
@@ -289,7 +289,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, 0);
seqList.add(fileResource);
}
@@ -308,7 +308,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
unseqList.add(fileResource);
}
prepareFile(unseqList.get(0), 0, 1, 10);
@@ -372,7 +372,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
}
@@ -391,7 +391,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
unseqList.add(fileResource);
}
@@ -445,7 +445,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
}
@@ -464,7 +464,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 10, i);
unseqList.add(fileResource);
}
@@ -517,7 +517,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
}
@@ -536,7 +536,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
unseqList.add(fileResource);
}
prepareFile(unseqList.get(0), 7, 3, 7);
@@ -591,7 +591,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
}
@@ -610,7 +610,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
unseqList.add(fileResource);
}
prepareFile(unseqList.get(0), 7, 3, 7);
@@ -669,7 +669,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
if (i - 11 != 3) {
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
}
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
@@ -689,7 +689,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
unseqList.add(fileResource);
}
prepareFile(unseqList.get(0), 7, 3, 7);
@@ -740,7 +740,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource firstTsFileResource = new TsFileResource(firstFile);
- firstTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ firstTsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
firstTsFileResource.setMinPlanIndex(1);
firstTsFileResource.setMaxPlanIndex(1);
firstTsFileResource.setVersion(1);
@@ -793,7 +793,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource secondTsFileResource = new TsFileResource(secondFile);
- secondTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ secondTsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
secondTsFileResource.setMinPlanIndex(2);
secondTsFileResource.setMaxPlanIndex(2);
secondTsFileResource.setVersion(2);
@@ -839,7 +839,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource thirdTsFileResource = new TsFileResource(thirdFile);
- thirdTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ thirdTsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
thirdTsFileResource.setMinPlanIndex(3);
thirdTsFileResource.setMaxPlanIndex(3);
thirdTsFileResource.setVersion(3);
@@ -885,7 +885,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
+ 0
+ ".tsfile"));
TsFileResource fourthTsFileResource = new TsFileResource(fourthFile);
- fourthTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ fourthTsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
fourthTsFileResource.setMinPlanIndex(4);
fourthTsFileResource.setMaxPlanIndex(4);
fourthTsFileResource.setVersion(4);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/AbstractInnerSpaceCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/AbstractInnerSpaceCompactionTest.java
index 91d329476d4..9424812b97f 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/AbstractInnerSpaceCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/AbstractInnerSpaceCompactionTest.java
@@ -160,7 +160,7 @@ public abstract class AbstractInnerSpaceCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
@@ -179,7 +179,7 @@ public abstract class AbstractInnerSpaceCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(i + seqFileNum);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, i * 2 * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
index 0fc1823d362..08431428bf0 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
@@ -93,7 +93,7 @@ public class InnerCompactionMoreDataTest extends InnerCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
index d1f907fa342..42eb8c6d1bd 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
@@ -111,8 +111,8 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
TsFileResourceList tsFileResources = new TsFileResourceList();
createFiles(2, 2, 3, 100, 0, 0, 50, 50, false, true);
createFiles(2, 3, 5, 50, 250, 250, 50, 50, false, true);
- seqResources.get(0).setStatus(TsFileResourceStatus.COMPACTION_CANDIDATE);
- seqResources.get(0).setStatus(TsFileResourceStatus.COMPACTING);
+ seqResources.get(0).setStatusForTest(TsFileResourceStatus.COMPACTION_CANDIDATE);
+ seqResources.get(0).setStatusForTest(TsFileResourceStatus.COMPACTING);
TsFileManager tsFileManager = new TsFileManager("testSG", "0", "tmp");
tsFileManager.addAll(seqResources, true);
CompactionScheduler.tryToSubmitInnerSpaceCompactionTask(tsFileManager, 0L, true);
@@ -141,7 +141,7 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
TsFileResourceList tsFileResources = new TsFileResourceList();
createFiles(2, 2, 3, 100, 0, 0, 50, 50, false, true);
createFiles(2, 3, 5, 50, 250, 250, 50, 50, false, true);
- seqResources.get(3).setStatus(TsFileResourceStatus.UNCLOSED);
+ seqResources.get(3).setStatusForTest(TsFileResourceStatus.UNCLOSED);
TsFileManager tsFileManager = new TsFileManager("testSG", "0", "tmp");
tsFileManager.addAll(seqResources, true);
CompactionScheduler.tryToSubmitInnerSpaceCompactionTask(tsFileManager, 0L, true);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
index b32bb02355c..498a57deb16 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
@@ -116,7 +116,7 @@ public abstract class InnerCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
@@ -135,7 +135,7 @@ public abstract class InnerCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(i + seqFileNum);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionTest.java
index 8f5f993e9cc..e233008435c 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionTest.java
@@ -114,7 +114,7 @@ public class SizeTieredCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
@@ -133,7 +133,7 @@ public class SizeTieredCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(i + seqFileNum);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
@@ -152,7 +152,7 @@ public class SizeTieredCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(seqFileNum + unseqFileNum);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, 0, ptNum * unseqFileNum, 20000);
@@ -227,7 +227,7 @@ public class SizeTieredCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource1 = new TsFileResource(file1);
- tsFileResource1.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource1.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource1.updatePlanIndexes((long) 0);
TsFileWriter fileWriter1 = new TsFileWriter(tsFileResource1.getTsFile());
fileWriter1.registerTimeseries(
@@ -255,7 +255,7 @@ public class SizeTieredCompactionTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource2 = new TsFileResource(file2);
- tsFileResource2.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource2.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource2.updatePlanIndexes((long) 1);
TsFileWriter fileWriter2 = new TsFileWriter(tsFileResource2.getTsFile());
fileWriter2.registerTimeseries(
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/MultiTsFileDeviceIteratorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/MultiTsFileDeviceIteratorTest.java
index d6da1af858b..440ec5a3296 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/MultiTsFileDeviceIteratorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/MultiTsFileDeviceIteratorTest.java
@@ -460,7 +460,7 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest {
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
+ tsFileManager.getTsFileList(true).get(0).setStatusForTest(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -607,7 +607,7 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest {
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
+ tsFileManager.getTsFileList(true).get(0).setStatusForTest(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -752,7 +752,7 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest {
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
+ tsFileManager.getTsFileList(true).get(0).setStatusForTest(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -905,7 +905,7 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest {
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
+ tsFileManager.getTsFileList(true).get(0).setStatusForTest(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -1052,7 +1052,7 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest {
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
+ tsFileManager.getTsFileList(true).get(0).setStatusForTest(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -1207,7 +1207,7 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest {
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
+ tsFileManager.getTsFileList(true).get(0).setStatusForTest(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/snapshot/IoTDBSnapshotTest.java b/server/src/test/java/org/apache/iotdb/db/engine/snapshot/IoTDBSnapshotTest.java
index da2c1dde12e..1bb3b22913a 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/snapshot/IoTDBSnapshotTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/snapshot/IoTDBSnapshotTest.java
@@ -85,7 +85,7 @@ public class IoTDBSnapshotTest {
resource.updateEndTime(testSgName + PATH_SEPARATOR + "d" + i, (i + 1) * 100);
}
resource.updatePlanIndexes(i);
- resource.setStatus(TsFileResourceStatus.NORMAL);
+ resource.setStatusForTest(TsFileResourceStatus.NORMAL);
resource.serialize();
}
return resources;
@@ -133,7 +133,7 @@ public class IoTDBSnapshotTest {
TierManager.getInstance().resetFolders();
try {
List<TsFileResource> resources = writeTsFiles();
- resources.subList(50, 100).forEach(x -> x.setStatus(TsFileResourceStatus.UNCLOSED));
+ resources.subList(50, 100).forEach(x -> x.setStatusForTest(TsFileResourceStatus.UNCLOSED));
DataRegion region = new DataRegion(testSgName, "0");
region.getTsFileManager().addAll(resources, true);
File snapshotDir = new File("target" + File.separator + "snapshot");
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceTest.java
index 76cb6cff9ac..5a229e51d27 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceTest.java
@@ -55,7 +55,7 @@ public class TsFileResourceTest {
deviceTimeIndex.updateEndTime("root.sg.d" + i, i + 1);
});
tsFileResource.setTimeIndex(deviceTimeIndex);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
}
@After
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AlignedSeriesTestUtil.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AlignedSeriesTestUtil.java
index a563f727c57..7b0f902ba27 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AlignedSeriesTestUtil.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/AlignedSeriesTestUtil.java
@@ -87,7 +87,7 @@ public class AlignedSeriesTestUtil {
for (int i = 0; i < seqFileNum; i++) {
File file = new File(TestConstant.getTestTsFilePath(sgName, 0, 0, i));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i);
tsFileResource.setMaxPlanIndex(i);
tsFileResource.setVersion(i);
@@ -98,7 +98,7 @@ public class AlignedSeriesTestUtil {
for (int i = 0; i < unseqFileNum; i++) {
File file = new File(TestConstant.getTestTsFilePath(sgName, 0, 0, i + seqFileNum));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i + seqFileNum);
tsFileResource.setMaxPlanIndex(i + seqFileNum);
tsFileResource.setVersion(i + seqFileNum);
@@ -114,7 +114,7 @@ public class AlignedSeriesTestUtil {
File file = new File(TestConstant.getTestTsFilePath(sgName, 0, 0, seqFileNum + unseqFileNum));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(seqFileNum + unseqFileNum);
tsFileResource.setMaxPlanIndex(seqFileNum + unseqFileNum);
tsFileResource.setVersion(seqFileNum + unseqFileNum);
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java
index 180962b0c50..47e1ebeacae 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesScanLimitOffsetPushDownTest.java
@@ -137,7 +137,7 @@ public class AlignedSeriesScanLimitOffsetPushDownTest {
seqFileResource1.updateEndTime(TEST_DEVICE, 9);
tsFileIOWriter.endFile();
}
- seqFileResource1.setStatus(TsFileResourceStatus.NORMAL);
+ seqFileResource1.setStatusForTest(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource1);
// prepare file 2
@@ -205,7 +205,7 @@ public class AlignedSeriesScanLimitOffsetPushDownTest {
seqFileResource2.updateEndTime(TEST_DEVICE, 19);
tsFileIOWriter.endFile();
}
- seqFileResource2.setStatus(TsFileResourceStatus.NORMAL);
+ seqFileResource2.setStatusForTest(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource2);
// prepare file 3
@@ -285,7 +285,7 @@ public class AlignedSeriesScanLimitOffsetPushDownTest {
seqFileResource3.updateEndTime(TEST_DEVICE, 39);
tsFileIOWriter.endFile();
}
- seqFileResource3.setStatus(TsFileResourceStatus.NORMAL);
+ seqFileResource3.setStatusForTest(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource3);
// prepare file 4
@@ -380,7 +380,7 @@ public class AlignedSeriesScanLimitOffsetPushDownTest {
seqFileResource4.updateEndTime(TEST_DEVICE, 79);
tsFileIOWriter.endFile();
}
- seqFileResource4.setStatus(TsFileResourceStatus.NORMAL);
+ seqFileResource4.setStatusForTest(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource4);
// prepare file 5
@@ -404,7 +404,7 @@ public class AlignedSeriesScanLimitOffsetPushDownTest {
unseqFileResource5.updateEndTime(TEST_DEVICE, 89);
tsFileIOWriter.endFile();
}
- unseqFileResource5.setStatus(TsFileResourceStatus.NORMAL);
+ unseqFileResource5.setStatusForTest(TsFileResourceStatus.NORMAL);
unSeqResources.add(unseqFileResource5);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
index 58f0afbfc46..4b6a8b36c56 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
@@ -113,7 +113,7 @@ public class SeriesReaderTestUtil {
for (int i = 0; i < seqFileNum; i++) {
File file = new File(TestConstant.getTestTsFilePath(sgName, 0, 0, i));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i);
tsFileResource.setMaxPlanIndex(i);
tsFileResource.setVersion(i);
@@ -123,7 +123,7 @@ public class SeriesReaderTestUtil {
for (int i = 0; i < unseqFileNum; i++) {
File file = new File(TestConstant.getTestTsFilePath(sgName, 0, 0, i + seqFileNum));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i + seqFileNum);
tsFileResource.setMaxPlanIndex(i + seqFileNum);
tsFileResource.setVersion(i + seqFileNum);
@@ -139,7 +139,7 @@ public class SeriesReaderTestUtil {
File file = new File(TestConstant.getTestTsFilePath(sgName, 0, 0, seqFileNum + unseqFileNum));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(seqFileNum + unseqFileNum);
tsFileResource.setMaxPlanIndex(seqFileNum + unseqFileNum);
tsFileResource.setVersion(seqFileNum + unseqFileNum);
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesScanLimitOffsetPushDownTest.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesScanLimitOffsetPushDownTest.java
index 07d998aed2f..90d5d55c29e 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesScanLimitOffsetPushDownTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesScanLimitOffsetPushDownTest.java
@@ -118,7 +118,7 @@ public class SeriesScanLimitOffsetPushDownTest {
seqFileResource1.updateEndTime(TEST_DEVICE, 9);
tsFileIOWriter.endFile();
}
- seqFileResource1.setStatus(TsFileResourceStatus.NORMAL);
+ seqFileResource1.setStatusForTest(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource1);
// prepare file 2
@@ -151,7 +151,7 @@ public class SeriesScanLimitOffsetPushDownTest {
seqFileResource2.updateEndTime(TEST_DEVICE, 29);
tsFileIOWriter.endFile();
}
- seqFileResource2.setStatus(TsFileResourceStatus.NORMAL);
+ seqFileResource2.setStatusForTest(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource2);
// prepare file 3
@@ -186,7 +186,7 @@ public class SeriesScanLimitOffsetPushDownTest {
seqFileResource3.updateEndTime(TEST_DEVICE, 59);
tsFileIOWriter.endFile();
}
- seqFileResource3.setStatus(TsFileResourceStatus.NORMAL);
+ seqFileResource3.setStatusForTest(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource3);
// prepare file 4
@@ -210,7 +210,7 @@ public class SeriesScanLimitOffsetPushDownTest {
unseqFileResource4.updateEndTime(TEST_DEVICE, 69);
tsFileIOWriter.endFile();
}
- unseqFileResource4.setStatus(TsFileResourceStatus.NORMAL);
+ unseqFileResource4.setStatusForTest(TsFileResourceStatus.NORMAL);
unSeqResources.add(unseqFileResource4);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/rescon/ResourceManagerTest.java b/server/src/test/java/org/apache/iotdb/db/rescon/ResourceManagerTest.java
index da5a493d56e..068274977db 100644
--- a/server/src/test/java/org/apache/iotdb/db/rescon/ResourceManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/rescon/ResourceManagerTest.java
@@ -174,7 +174,7 @@ public class ResourceManagerTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) 0);
prepareFile(tsFileResource, 0, ptNum, 0);
long previousRamSize = tsFileResource.calculateRamSize();
@@ -201,7 +201,7 @@ public class ResourceManagerTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) 0);
prepareFile(tsFileResource, 0, ptNum, 0);
assertEquals(
@@ -228,7 +228,7 @@ public class ResourceManagerTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) 0);
prepareFile(tsFileResource, 0, ptNum, 0);
assertEquals(
@@ -258,7 +258,7 @@ public class ResourceManagerTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource1 = new TsFileResource(file1);
- tsFileResource1.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource1.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource1.updatePlanIndexes((long) 0);
prepareFile(tsFileResource1, 0, ptNum, 0);
assertEquals(
@@ -282,7 +282,7 @@ public class ResourceManagerTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource2 = new TsFileResource(file2);
- tsFileResource2.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource2.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource2.updatePlanIndexes((long) 1);
prepareFile(tsFileResource2, ptNum, ptNum, 0);
assertEquals(
@@ -313,7 +313,7 @@ public class ResourceManagerTest {
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
+ tsFileResource.setStatusForTest(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
assertEquals(
TimeIndexLevel.DEVICE_TIME_INDEX,