fix not releasing read lock when fail to allocate memory for compaction task (#9872)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/exception/CompactionExceptionHandler.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/exception/CompactionExceptionHandler.java
index a510a77..49a9cd0 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/exception/CompactionExceptionHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/exception/CompactionExceptionHandler.java
@@ -240,7 +240,7 @@
continue;
} else {
// set target resources to CLOSED, so that they can be selected to compact
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetResource.setStatus(TsFileResourceStatus.NORMAL);
}
if (!TsFileUtils.isTsFileComplete(targetResource.getTsFile())) {
LOGGER.error(
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 1eddd86..705942b 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
@@ -98,15 +98,6 @@
@Override
public boolean doCompaction() {
- try {
- SystemInfo.getInstance().addCompactionMemoryCost(memoryCost, 60);
- } catch (InterruptedException e) {
- LOGGER.error("Interrupted when allocating memory for compaction", e);
- return false;
- } catch (CompactionMemoryNotEnoughException e) {
- LOGGER.error("No enough memory for current compaction task {}", this, e);
- return false;
- }
boolean isSuccess = true;
try {
if (!tsFileManager.isAllowCompaction()) {
@@ -224,7 +215,7 @@
TsFileMetricManager.getInstance().addFile(targetResource.getTsFileSize(), true);
// set target resources to CLOSED, so that they can be selected to compact
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetResource.setStatus(TsFileResourceStatus.NORMAL);
} else {
// target resource is empty after compaction, then delete it
targetResource.remove();
@@ -295,15 +286,15 @@
}
private void releaseAllLock() {
- selectedSequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.CLOSED));
- selectedUnsequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.CLOSED));
+ selectedSequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.NORMAL));
+ selectedUnsequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.NORMAL));
for (TsFileResource tsFileResource : holdReadLockList) {
tsFileResource.readUnlock();
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
}
for (TsFileResource tsFileResource : holdWriteLockList) {
tsFileResource.writeUnlock();
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
}
holdReadLockList.clear();
holdWriteLockList.clear();
@@ -353,8 +344,8 @@
@Override
public void resetCompactionCandidateStatusForAllSourceFiles() {
- selectedSequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.CLOSED));
- selectedUnsequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.CLOSED));
+ selectedSequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.NORMAL));
+ selectedUnsequenceFiles.forEach(x -> x.setStatus(TsFileResourceStatus.NORMAL));
}
private long deleteOldFiles(List<TsFileResource> tsFileResourceList) throws IOException {
@@ -380,7 +371,21 @@
@Override
public boolean checkValidAndSetMerging() {
- return addReadLock(selectedSequenceFiles) && addReadLock(selectedUnsequenceFiles);
+ try {
+ SystemInfo.getInstance().addCompactionMemoryCost(memoryCost, 60);
+ } catch (InterruptedException e) {
+ LOGGER.error("Interrupted when allocating memory for compaction", e);
+ return false;
+ } catch (CompactionMemoryNotEnoughException e) {
+ LOGGER.error("No enough memory for current compaction task {}", this, e);
+ return false;
+ }
+ boolean addReadLockSuccess =
+ addReadLock(selectedSequenceFiles) && addReadLock(selectedUnsequenceFiles);
+ if (!addReadLockSuccess) {
+ SystemInfo.getInstance().resetCompactionMemoryCost(memoryCost);
+ }
+ return addReadLockSuccess;
}
private boolean addReadLock(List<TsFileResource> tsFileResourceList) {
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 d5a99e5..f04c389 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
@@ -239,7 +239,7 @@
.addFile(targetTsFileResource.getTsFile().length(), sequence);
// set target resource to CLOSED, so that it can be selected to compact
- targetTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
} else {
// target resource is empty after compaction, then delete it
targetTsFileResource.remove();
@@ -400,7 +400,7 @@
@Override
public void resetCompactionCandidateStatusForAllSourceFiles() {
- selectedTsFileResourceList.forEach(x -> x.setStatus(TsFileResourceStatus.CLOSED));
+ selectedTsFileResourceList.forEach(x -> x.setStatus(TsFileResourceStatus.NORMAL));
}
/**
@@ -418,7 +418,7 @@
}
try {
if (!resource.isDeleted()) {
- selectedTsFileResourceList.get(i).setStatus(TsFileResourceStatus.CLOSED);
+ selectedTsFileResourceList.get(i).setStatus(TsFileResourceStatus.NORMAL);
}
} catch (Throwable e) {
LOGGER.error("Exception occurs when resetting resource status", e);
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 df88248..805abe2 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,7 +114,7 @@
selectedFileSize = 0L;
continue;
}
- if (currentFile.getStatus() != TsFileResourceStatus.CLOSED) {
+ 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 bedf2e2..04da986 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,7 +142,7 @@
private List<TsFileResourceCandidate> filterUnseqResource(List<TsFileResource> unseqResources) {
List<TsFileResourceCandidate> ret = new ArrayList<>();
for (TsFileResource resource : unseqResources) {
- if (resource.getStatus() != TsFileResourceStatus.CLOSED || !resource.getTsFile().exists()) {
+ if (resource.getStatus() != TsFileResourceStatus.NORMAL || !resource.getTsFile().exists()) {
break;
} else if (resource.stillLives(ttlLowerBound)) {
ret.add(new TsFileResourceCandidate(resource));
@@ -198,7 +198,7 @@
// 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.CLOSED
+ tsFileResource.getStatus() == TsFileResourceStatus.NORMAL
&& tsFileResource.getTsFile().exists();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleRequestHandler.java b/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleRequestHandler.java
index 5701820..fa84d42 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleRequestHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleRequestHandler.java
@@ -229,7 +229,7 @@
for (TsFileResource tsFileResource : allTsFileResourceList) {
File tsFile = tsFileResource.getTsFile();
if (tsFileNames.contains(tsFile.getName())) {
- if (tsFileResource.getStatus() != TsFileResourceStatus.CLOSED) {
+ if (tsFileResource.getStatus() != TsFileResourceStatus.NORMAL) {
return RpcUtils.getStatus(
TSStatusCode.ILLEGAL_PARAMETER,
"The TsFile is not valid: " + tsFile.getAbsolutePath());
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 b82fc12..e609ddc 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
@@ -732,7 +732,7 @@
List<TsFileResource> upgradeRet = new ArrayList<>();
for (File f : upgradeFiles) {
TsFileResource fileResource = new TsFileResource(f);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
// make sure the flush command is called before IoTDB is down.
fileResource.deserializeFromOldFile();
upgradeRet.add(fileResource);
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 f9d5671..e91fe3f 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
@@ -461,7 +461,7 @@
}
public void close() throws IOException {
- this.setStatus(TsFileResourceStatus.CLOSED);
+ this.setStatus(TsFileResourceStatus.NORMAL);
closeWithoutSettingStatus();
}
@@ -625,8 +625,8 @@
public void setStatus(TsFileResourceStatus status) {
switch (status) {
- case CLOSED:
- this.status = TsFileResourceStatus.CLOSED;
+ case NORMAL:
+ this.status = TsFileResourceStatus.NORMAL;
break;
case UNCLOSED:
this.status = TsFileResourceStatus.UNCLOSED;
@@ -645,7 +645,7 @@
}
break;
case COMPACTION_CANDIDATE:
- if (this.status == TsFileResourceStatus.CLOSED) {
+ if (this.status == TsFileResourceStatus.NORMAL) {
this.status = TsFileResourceStatus.COMPACTION_CANDIDATE;
} else {
throw new RuntimeException(
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 42eaf48..4c1c95c 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
@@ -20,7 +20,8 @@
public enum TsFileResourceStatus {
UNCLOSED,
- CLOSED,
+ /** The resource in status NORMAL, COMPACTION_CANDIDATE, COMPACTING, DELETED is all CLOSED. */
+ NORMAL,
COMPACTION_CANDIDATE,
COMPACTING,
DELETED
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 4b4a89ff4..a5c7baf 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -2272,7 +2272,7 @@
resource.deserialize();
}
- resource.setStatus(TsFileResourceStatus.CLOSED);
+ resource.setStatus(TsFileResourceStatus.NORMAL);
return resource;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitByPartitionTool.java b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitByPartitionTool.java
index cee707e..e86f568 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitByPartitionTool.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitByPartitionTool.java
@@ -505,7 +505,7 @@
}
tsFileResource.setMinPlanIndex(minPlanIndex);
tsFileResource.setMaxPlanIndex(maxPlanIndex);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.serialize();
return tsFileResource;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitTool.java b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitTool.java
index 336a568..2752bdb 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitTool.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitTool.java
@@ -279,7 +279,7 @@
}
tsFileResource.setMinPlanIndex(minPlanIndex);
tsFileResource.setMaxPlanIndex(maxPlanIndex);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.serialize();
return tsFileResource;
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java b/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java
index 7eb65d9..abaa47e 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java
@@ -67,7 +67,7 @@
for (Map.Entry<String, Integer> entry : getInstance().recoverSettleFileMap.entrySet()) {
String path = entry.getKey();
TsFileResource resource = new TsFileResource(new File(path));
- resource.setStatus(TsFileResourceStatus.CLOSED);
+ resource.setStatus(TsFileResourceStatus.NORMAL);
oldTsFileResources.put(resource.getTsFile().getName(), resource);
}
List<File> tsFiles = checkArgs(args);
@@ -75,7 +75,7 @@
if (!oldTsFileResources.containsKey(file.getName())) {
if (new File(file + TsFileResource.RESOURCE_SUFFIX).exists()) {
TsFileResource resource = new TsFileResource(file);
- resource.setStatus(TsFileResourceStatus.CLOSED);
+ resource.setStatus(TsFileResourceStatus.NORMAL);
oldTsFileResources.put(file.getName(), resource);
}
}
@@ -335,7 +335,7 @@
// move .resource File
newTsFileResource.setFile(fsFactory.getFile(oldTsFile.getParent(), newTsFile.getName()));
- newTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ newTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
try {
newTsFileResource.serialize();
} catch (IOException e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
index 1dc6500..8cc7a6f 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
@@ -101,7 +101,7 @@
resource.updateEndTime(device, chunkMetadata.getEndTime());
}
}
- resource.setStatus(TsFileResourceStatus.CLOSED);
+ resource.setStatus(TsFileResourceStatus.NORMAL);
return resource;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java
index d31cc94..47e9b65 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/UpgradeUtils.java
@@ -119,7 +119,7 @@
if (fsFactory.getFile(partitionDir, newModsFile.getName()).exists()) {
upgradedResource.getModFile();
}
- upgradedResource.setStatus(TsFileResourceStatus.CLOSED);
+ upgradedResource.setStatus(TsFileResourceStatus.NORMAL);
upgradedResource.serialize();
// delete generated temp resource file
Files.delete(tempResourceFile.toPath());
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 aa5f113..8afb2d5 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 @@
Assert.assertTrue(file.getParentFile().mkdirs());
}
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
@@ -161,7 +161,7 @@
Assert.assertTrue(file.getParentFile().mkdirs());
}
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(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 4c5f2ae..483670a 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
@@ -316,7 +316,7 @@
startTime + pointNum * i + timeInterval * i + pointNum - 1);
}
resource.updatePlanIndexes(fileVersion);
- resource.setStatus(TsFileResourceStatus.CLOSED);
+ resource.setStatus(TsFileResourceStatus.NORMAL);
resource.serialize();
if (isSeq) {
seqResources.add(resource);
@@ -344,7 +344,7 @@
}
resource.updatePlanIndexes(fileVersion);
- resource.setStatus(TsFileResourceStatus.CLOSED);
+ resource.setStatus(TsFileResourceStatus.NORMAL);
resource.serialize();
if (isSeq) {
seqResources.add(resource);
@@ -588,7 +588,7 @@
}
TsFileResource resource = new TsFileResource(new File(filePath));
resource.updatePlanIndexes(fileVersion++);
- resource.setStatus(TsFileResourceStatus.CLOSED);
+ resource.setStatus(TsFileResourceStatus.NORMAL);
return resource;
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/MemoryControlTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/MemoryControlTest.java
new file mode 100644
index 0000000..c71356c
--- /dev/null
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/MemoryControlTest.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.engine.compaction;
+
+import org.apache.iotdb.db.engine.compaction.execute.task.CrossSpaceCompactionTask;
+import org.apache.iotdb.db.engine.storagegroup.TsFileManager;
+import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
+import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class MemoryControlTest {
+ @Test
+ public void testFailedToAllocateMemoryInCrossTask() throws Exception {
+ List<TsFileResource> sequenceFiles = new ArrayList<>();
+ for (int i = 1; i <= 10; i++) {
+ sequenceFiles.add(
+ new TsFileResource(
+ new File(String.format("%d-%d-0-0.tsfile", i, i)), TsFileResourceStatus.NORMAL));
+ }
+ List<TsFileResource> unsequenceFiles = new ArrayList<>();
+ for (int i = 11; i <= 20; i++) {
+ unsequenceFiles.add(
+ new TsFileResource(
+ new File(String.format("%d-%d-0-0.tsfile", i, i)), TsFileResourceStatus.NORMAL));
+ }
+ TsFileManager tsFileManager = Mockito.mock(TsFileManager.class);
+ Mockito.when(tsFileManager.getStorageGroupName()).thenReturn("root.sg");
+ Mockito.when(tsFileManager.getDataRegionId()).thenReturn("1");
+ CrossSpaceCompactionTask task =
+ new CrossSpaceCompactionTask(
+ 0L,
+ tsFileManager,
+ sequenceFiles,
+ unsequenceFiles,
+ null,
+ new AtomicInteger(0),
+ 1024L * 1024L * 1024L * 50L,
+ 0);
+ boolean success = task.checkValidAndSetMerging();
+ Assert.assertFalse(success);
+ for (TsFileResource tsFileResource : sequenceFiles) {
+ Assert.assertEquals(TsFileResourceStatus.NORMAL, tsFileResource.getStatus());
+ Assert.assertTrue(tsFileResource.tryWriteLock());
+ }
+ for (TsFileResource tsFileResource : unsequenceFiles) {
+ Assert.assertEquals(TsFileResourceStatus.NORMAL, tsFileResource.getStatus());
+ Assert.assertTrue(tsFileResource.tryWriteLock());
+ }
+ }
+}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
index 6bbaa0a..c9eeb45 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
@@ -626,7 +626,7 @@
} else {
Assert.assertTrue(resource.getTsFile().exists());
Assert.assertTrue(resource.resourceFileExists());
- Assert.assertEquals(TsFileResourceStatus.CLOSED, resource.getStatus());
+ Assert.assertEquals(TsFileResourceStatus.NORMAL, resource.getStatus());
}
}
}
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 2a9d89c..2f7b7ed 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 @@
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetResource.setStatus(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
@@ -741,7 +741,7 @@
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetResource.setStatus(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
@@ -1044,7 +1044,7 @@
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetResource.setStatus(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 2f7c1bd..fd470fb 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
@@ -2149,7 +2149,7 @@
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.CLOSED));
+ targetResources.forEach(x -> x.setStatus(TsFileResourceStatus.NORMAL));
// start selecting files and then start a cross space compaction task
ICrossSpaceSelector selector =
@@ -2289,7 +2289,7 @@
Assert.assertEquals(0, innerSelector.selectInnerSpaceTask(targetResources).size());
// first compaction task finishes successfully
- targetResources.forEach(x -> x.setStatus(TsFileResourceStatus.CLOSED));
+ targetResources.forEach(x -> x.setStatus(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 27ecf3f..6f4e440 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 @@
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetResource.setStatus(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
@@ -740,7 +740,7 @@
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetResource.setStatus(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
@@ -1043,7 +1043,7 @@
new TsFileResource(
TsFileNameGenerator.increaseCrossCompactionCnt(seqResource).getTsFile());
targetResource.deserialize();
- targetResource.setStatus(TsFileResourceStatus.CLOSED);
+ targetResource.setStatus(TsFileResourceStatus.NORMAL);
targetTsfileResourceList.add(targetResource);
}
CompactionCheckerUtils.checkDataAndResource(sourceData, targetTsfileResourceList);
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 9d2c4e4..fb3b7d6 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 @@
File file = new File(TestConstant.getTestTsFilePath("root.sg1", 0, 0, i));
mkdirs(file);
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i);
tsFileResource.setMaxPlanIndex(i);
tsFileResource.setVersion(i);
@@ -115,7 +115,7 @@
File file = new File(TestConstant.getTestTsFilePath("root.sg1", 0, 0, i + seqFileNum));
mkdirs(file);
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i + seqFileNum);
tsFileResource.setMaxPlanIndex(i + seqFileNum);
tsFileResource.setVersion(i + seqFileNum);
@@ -127,7 +127,7 @@
new File(TestConstant.getTestTsFilePath("root.sg1", 0, 0, seqFileNum + unseqFileNum));
mkdirs(file);
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(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 eb41d9a..c216d52 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 @@
+ ".tsfile"));
TsFileResource largeUnseqTsFileResource = new TsFileResource(file);
unseqResources.add(largeUnseqTsFileResource);
- largeUnseqTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ largeUnseqTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
largeUnseqTsFileResource.setMinPlanIndex(10);
largeUnseqTsFileResource.setMaxPlanIndex(10);
largeUnseqTsFileResource.setVersion(10);
@@ -200,7 +200,7 @@
+ ".tsfile"));
TsFileResource largeUnseqTsFileResource = new TsFileResource(file);
unseqResources.add(largeUnseqTsFileResource);
- largeUnseqTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ largeUnseqTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
largeUnseqTsFileResource.setMinPlanIndex(10);
largeUnseqTsFileResource.setMaxPlanIndex(10);
largeUnseqTsFileResource.setVersion(10);
@@ -250,7 +250,7 @@
+ 0
+ ".tsfile"));
TsFileResource largeUnseqTsFileResource = new TsFileResource(file);
- largeUnseqTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ largeUnseqTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
largeUnseqTsFileResource.setMinPlanIndex(10);
largeUnseqTsFileResource.setMaxPlanIndex(10);
largeUnseqTsFileResource.setVersion(10);
@@ -289,7 +289,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, 0);
seqList.add(fileResource);
}
@@ -308,7 +308,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
unseqList.add(fileResource);
}
prepareFile(unseqList.get(0), 0, 1, 10);
@@ -372,7 +372,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
}
@@ -391,7 +391,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
unseqList.add(fileResource);
}
@@ -445,7 +445,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
}
@@ -464,7 +464,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 10, i);
unseqList.add(fileResource);
}
@@ -517,7 +517,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
}
@@ -536,7 +536,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
unseqList.add(fileResource);
}
prepareFile(unseqList.get(0), 7, 3, 7);
@@ -591,7 +591,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
}
@@ -610,7 +610,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
unseqList.add(fileResource);
}
prepareFile(unseqList.get(0), 7, 3, 7);
@@ -669,7 +669,7 @@
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
if (i - 11 != 3) {
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
}
prepareFile(fileResource, i, 1, i);
seqList.add(fileResource);
@@ -689,7 +689,7 @@
+ 0
+ ".tsfile"));
TsFileResource fileResource = new TsFileResource(file);
- fileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fileResource.setStatus(TsFileResourceStatus.NORMAL);
unseqList.add(fileResource);
}
prepareFile(unseqList.get(0), 7, 3, 7);
@@ -740,7 +740,7 @@
+ 0
+ ".tsfile"));
TsFileResource firstTsFileResource = new TsFileResource(firstFile);
- firstTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ firstTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
firstTsFileResource.setMinPlanIndex(1);
firstTsFileResource.setMaxPlanIndex(1);
firstTsFileResource.setVersion(1);
@@ -793,7 +793,7 @@
+ 0
+ ".tsfile"));
TsFileResource secondTsFileResource = new TsFileResource(secondFile);
- secondTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ secondTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
secondTsFileResource.setMinPlanIndex(2);
secondTsFileResource.setMaxPlanIndex(2);
secondTsFileResource.setVersion(2);
@@ -839,7 +839,7 @@
+ 0
+ ".tsfile"));
TsFileResource thirdTsFileResource = new TsFileResource(thirdFile);
- thirdTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ thirdTsFileResource.setStatus(TsFileResourceStatus.NORMAL);
thirdTsFileResource.setMinPlanIndex(3);
thirdTsFileResource.setMaxPlanIndex(3);
thirdTsFileResource.setVersion(3);
@@ -885,7 +885,7 @@
+ 0
+ ".tsfile"));
TsFileResource fourthTsFileResource = new TsFileResource(fourthFile);
- fourthTsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ fourthTsFileResource.setStatus(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 686858a..91d3294 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 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
@@ -179,7 +179,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(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 2aafe30..0fc1823 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 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(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/InnerCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
index 22a5825..b32bb02 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 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
@@ -135,7 +135,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(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 8211c71..8f5f993 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 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
@@ -133,7 +133,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(i + seqFileNum);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
@@ -152,7 +152,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes(seqFileNum + unseqFileNum);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, 0, ptNum * unseqFileNum, 20000);
@@ -227,7 +227,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource1 = new TsFileResource(file1);
- tsFileResource1.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource1.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource1.updatePlanIndexes((long) 0);
TsFileWriter fileWriter1 = new TsFileWriter(tsFileResource1.getTsFile());
fileWriter1.registerTimeseries(
@@ -255,7 +255,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource2 = new TsFileResource(file2);
- tsFileResource2.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource2.setStatus(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 3160f03..adeb64d 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
@@ -456,7 +456,7 @@
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.CLOSED);
+ tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -601,7 +601,7 @@
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.CLOSED);
+ tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -744,7 +744,7 @@
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.CLOSED);
+ tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -895,7 +895,7 @@
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.CLOSED);
+ tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -1040,7 +1040,7 @@
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.CLOSED);
+ tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.NORMAL);
validateSeqFiles(true);
validateTargetDatas(sourceData, Collections.emptyList());
@@ -1193,7 +1193,7 @@
CompactionUtils.moveTargetFile(targetResources, true, COMPACTION_TEST_SG);
tsFileManager.replace(
tsFileManager.getTsFileList(true), Collections.emptyList(), targetResources, 0, true);
- tsFileManager.getTsFileList(true).get(0).setStatus(TsFileResourceStatus.CLOSED);
+ tsFileManager.getTsFileList(true).get(0).setStatus(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 8c9f5f8..3a8b0e8 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 @@
resource.updateEndTime(testSgName + PATH_SEPARATOR + "d" + i, (i + 1) * 100);
}
resource.updatePlanIndexes(i);
- resource.setStatus(TsFileResourceStatus.CLOSED);
+ resource.setStatus(TsFileResourceStatus.NORMAL);
resource.serialize();
}
return resources;
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FakedTsFileResource.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FakedTsFileResource.java
index 178c02a..085c127 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FakedTsFileResource.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FakedTsFileResource.java
@@ -35,7 +35,7 @@
public FakedTsFileResource(long tsFileSize, String name) {
this.timeIndex = new FileTimeIndex();
this.tsFileSize = tsFileSize;
- super.status = TsFileResourceStatus.CLOSED;
+ super.status = TsFileResourceStatus.NORMAL;
fakeTsfileName = name;
}
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 06f3af6..76cb6cf 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 @@
deviceTimeIndex.updateEndTime("root.sg.d" + i, i + 1);
});
tsFileResource.setTimeIndex(deviceTimeIndex);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(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 c6be93d..a563f72 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 @@
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.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i);
tsFileResource.setMaxPlanIndex(i);
tsFileResource.setVersion(i);
@@ -98,7 +98,7 @@
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.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i + seqFileNum);
tsFileResource.setMaxPlanIndex(i + seqFileNum);
tsFileResource.setVersion(i + seqFileNum);
@@ -114,7 +114,7 @@
File file = new File(TestConstant.getTestTsFilePath(sgName, 0, 0, seqFileNum + unseqFileNum));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(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 de86d59..180962b 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 @@
seqFileResource1.updateEndTime(TEST_DEVICE, 9);
tsFileIOWriter.endFile();
}
- seqFileResource1.setStatus(TsFileResourceStatus.CLOSED);
+ seqFileResource1.setStatus(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource1);
// prepare file 2
@@ -205,7 +205,7 @@
seqFileResource2.updateEndTime(TEST_DEVICE, 19);
tsFileIOWriter.endFile();
}
- seqFileResource2.setStatus(TsFileResourceStatus.CLOSED);
+ seqFileResource2.setStatus(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource2);
// prepare file 3
@@ -285,7 +285,7 @@
seqFileResource3.updateEndTime(TEST_DEVICE, 39);
tsFileIOWriter.endFile();
}
- seqFileResource3.setStatus(TsFileResourceStatus.CLOSED);
+ seqFileResource3.setStatus(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource3);
// prepare file 4
@@ -380,7 +380,7 @@
seqFileResource4.updateEndTime(TEST_DEVICE, 79);
tsFileIOWriter.endFile();
}
- seqFileResource4.setStatus(TsFileResourceStatus.CLOSED);
+ seqFileResource4.setStatus(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource4);
// prepare file 5
@@ -404,7 +404,7 @@
unseqFileResource5.updateEndTime(TEST_DEVICE, 89);
tsFileIOWriter.endFile();
}
- unseqFileResource5.setStatus(TsFileResourceStatus.CLOSED);
+ unseqFileResource5.setStatus(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 b331966..58f0afb 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 @@
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.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i);
tsFileResource.setMaxPlanIndex(i);
tsFileResource.setVersion(i);
@@ -123,7 +123,7 @@
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.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.setMinPlanIndex(i + seqFileNum);
tsFileResource.setMaxPlanIndex(i + seqFileNum);
tsFileResource.setVersion(i + seqFileNum);
@@ -139,7 +139,7 @@
File file = new File(TestConstant.getTestTsFilePath(sgName, 0, 0, seqFileNum + unseqFileNum));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(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 dced673..07d998a 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 @@
seqFileResource1.updateEndTime(TEST_DEVICE, 9);
tsFileIOWriter.endFile();
}
- seqFileResource1.setStatus(TsFileResourceStatus.CLOSED);
+ seqFileResource1.setStatus(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource1);
// prepare file 2
@@ -151,7 +151,7 @@
seqFileResource2.updateEndTime(TEST_DEVICE, 29);
tsFileIOWriter.endFile();
}
- seqFileResource2.setStatus(TsFileResourceStatus.CLOSED);
+ seqFileResource2.setStatus(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource2);
// prepare file 3
@@ -186,7 +186,7 @@
seqFileResource3.updateEndTime(TEST_DEVICE, 59);
tsFileIOWriter.endFile();
}
- seqFileResource3.setStatus(TsFileResourceStatus.CLOSED);
+ seqFileResource3.setStatus(TsFileResourceStatus.NORMAL);
seqResources.add(seqFileResource3);
// prepare file 4
@@ -210,7 +210,7 @@
unseqFileResource4.updateEndTime(TEST_DEVICE, 69);
tsFileIOWriter.endFile();
}
- unseqFileResource4.setStatus(TsFileResourceStatus.CLOSED);
+ unseqFileResource4.setStatus(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 2bc98aa..da5a493 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 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) 0);
prepareFile(tsFileResource, 0, ptNum, 0);
long previousRamSize = tsFileResource.calculateRamSize();
@@ -201,7 +201,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) 0);
prepareFile(tsFileResource, 0, ptNum, 0);
assertEquals(
@@ -228,7 +228,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) 0);
prepareFile(tsFileResource, 0, ptNum, 0);
assertEquals(
@@ -258,7 +258,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource1 = new TsFileResource(file1);
- tsFileResource1.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource1.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource1.updatePlanIndexes((long) 0);
prepareFile(tsFileResource1, 0, ptNum, 0);
assertEquals(
@@ -282,7 +282,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource2 = new TsFileResource(file2);
- tsFileResource2.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource2.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource2.updatePlanIndexes((long) 1);
prepareFile(tsFileResource2, ptNum, ptNum, 0);
assertEquals(
@@ -313,7 +313,7 @@
+ 0
+ ".tsfile"));
TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
+ tsFileResource.setStatus(TsFileResourceStatus.NORMAL);
tsFileResource.updatePlanIndexes((long) i);
assertEquals(
TimeIndexLevel.DEVICE_TIME_INDEX,
