fix compaction selector ut (#12442)
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java
index 3f86a18..8b43043 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java
@@ -26,7 +26,6 @@
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.AbstractCompactionTask;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.CrossSpaceCompactionTask;
import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionTaskQueue;
-import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionWorker;
import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.comparator.DefaultCompactionTaskComparatorImpl;
import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.impl.RewriteCrossSpaceCompactionSelector;
import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.utils.CrossCompactionTaskResource;
@@ -42,7 +41,6 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Mockito;
import java.io.IOException;
import java.util.List;
@@ -600,13 +598,8 @@
FileCannotTransitToCompactingException.class,
crossSpaceCompactionTask::transitSourceFilesToMerging);
- FixedPriorityBlockingQueue<AbstractCompactionTask> mockQueue =
- Mockito.mock(FixedPriorityBlockingQueue.class);
- Mockito.when(mockQueue.take())
- .thenReturn(crossSpaceCompactionTask)
- .thenThrow(new InterruptedException());
- CompactionWorker worker = new CompactionWorker(0, mockQueue);
- worker.run();
+ crossSpaceCompactionTask.resetCompactionCandidateStatusForAllSourceFiles();
+ crossSpaceCompactionTask.handleTaskCleanup();
for (int i = 0; i < seqResources.size(); i++) {
TsFileResource resource = seqResources.get(i);
@@ -951,13 +944,8 @@
FileCannotTransitToCompactingException.class,
crossSpaceCompactionTask::transitSourceFilesToMerging);
- FixedPriorityBlockingQueue<AbstractCompactionTask> mockQueue =
- Mockito.mock(FixedPriorityBlockingQueue.class);
- Mockito.when(mockQueue.take())
- .thenReturn(crossSpaceCompactionTask)
- .thenThrow(new InterruptedException());
- CompactionWorker worker = new CompactionWorker(0, mockQueue);
- worker.run();
+ crossSpaceCompactionTask.resetCompactionCandidateStatusForAllSourceFiles();
+ crossSpaceCompactionTask.handleTaskCleanup();
for (int i = 0; i < seqResources.size(); i++) {
TsFileResource resource = seqResources.get(i);
@@ -1436,13 +1424,8 @@
FileCannotTransitToCompactingException.class,
crossSpaceCompactionTask::transitSourceFilesToMerging);
- FixedPriorityBlockingQueue<AbstractCompactionTask> mockQueue =
- Mockito.mock(FixedPriorityBlockingQueue.class);
- Mockito.when(mockQueue.take())
- .thenReturn(crossSpaceCompactionTask)
- .thenThrow(new InterruptedException());
- CompactionWorker worker = new CompactionWorker(0, mockQueue);
- worker.run();
+ crossSpaceCompactionTask.resetCompactionCandidateStatusForAllSourceFiles();
+ crossSpaceCompactionTask.handleTaskCleanup();
for (int i = 0; i < unseqResources.size(); i++) {
TsFileResource resource = unseqResources.get(i);
@@ -1785,14 +1768,8 @@
"cross space compaction task should be invalid.",
FileCannotTransitToCompactingException.class,
crossSpaceCompactionTask::transitSourceFilesToMerging);
-
- FixedPriorityBlockingQueue<AbstractCompactionTask> mockQueue =
- Mockito.mock(FixedPriorityBlockingQueue.class);
- Mockito.when(mockQueue.take())
- .thenReturn(crossSpaceCompactionTask)
- .thenThrow(new InterruptedException());
- CompactionWorker worker = new CompactionWorker(0, mockQueue);
- worker.run();
+ crossSpaceCompactionTask.resetCompactionCandidateStatusForAllSourceFiles();
+ crossSpaceCompactionTask.handleTaskCleanup();
for (int i = 0; i < unseqResources.size(); i++) {
TsFileResource resource = unseqResources.get(i);
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSpaceCompactionSelectorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSpaceCompactionSelectorTest.java
index e13c220..8fc15df 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSpaceCompactionSelectorTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSpaceCompactionSelectorTest.java
@@ -25,23 +25,19 @@
import org.apache.iotdb.db.storageengine.dataregion.compaction.AbstractCompactionTest;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.FileCannotTransitToCompactingException;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl.FastCompactionPerformer;
-import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.AbstractCompactionTask;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.InnerSpaceCompactionTask;
-import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionWorker;
import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.impl.SizeTieredCompactionSelector;
import org.apache.iotdb.db.storageengine.dataregion.modification.Deletion;
import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile;
import org.apache.iotdb.db.storageengine.dataregion.read.control.FileReaderManager;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResourceStatus;
-import org.apache.iotdb.db.utils.datastructure.FixedPriorityBlockingQueue;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Mockito;
import java.io.File;
import java.io.IOException;
@@ -295,13 +291,8 @@
FileCannotTransitToCompactingException.class,
innerSpaceCompactionTask::transitSourceFilesToMerging);
- FixedPriorityBlockingQueue<AbstractCompactionTask> mockQueue =
- Mockito.mock(FixedPriorityBlockingQueue.class);
- Mockito.when(mockQueue.take())
- .thenReturn(innerSpaceCompactionTask)
- .thenThrow(new InterruptedException());
- CompactionWorker worker = new CompactionWorker(0, mockQueue);
- worker.run();
+ innerSpaceCompactionTask.resetCompactionCandidateStatusForAllSourceFiles();
+ innerSpaceCompactionTask.handleTaskCleanup();
for (int i = 0; i < task.size(); i++) {
TsFileResource resource = task.get(i);
@@ -600,13 +591,8 @@
FileCannotTransitToCompactingException.class,
innerSpaceCompactionTask::transitSourceFilesToMerging);
- FixedPriorityBlockingQueue<AbstractCompactionTask> mockQueue =
- Mockito.mock(FixedPriorityBlockingQueue.class);
- Mockito.when(mockQueue.take())
- .thenReturn(innerSpaceCompactionTask)
- .thenThrow(new InterruptedException());
- CompactionWorker worker = new CompactionWorker(0, mockQueue);
- worker.run();
+ innerSpaceCompactionTask.resetCompactionCandidateStatusForAllSourceFiles();
+ innerSpaceCompactionTask.handleTaskCleanup();
for (int i = 0; i < task.size(); i++) {
TsFileResource resource = task.get(i);
