This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch compaction_worker_refactor_0928
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to
refs/heads/compaction_worker_refactor_0928 by this push:
new 2533167a40d remove currentTaskNum
2533167a40d is described below
commit 2533167a40d5aa46cc2901c2ff91855066e9ebbc
Author: Jinrui.Zhang <[email protected]>
AuthorDate: Sat Oct 7 10:42:49 2023 +0800
remove currentTaskNum
---
.../execute/task/AbstractCompactionTask.java | 14 +--
.../execute/task/CrossSpaceCompactionTask.java | 18 ---
.../execute/task/InnerSpaceCompactionTask.java | 15 ---
.../compaction/schedule/CompactionScheduler.java | 2 -
.../compaction/schedule/CompactionTaskManager.java | 4 -
.../compaction/CompactionTaskComparatorTest.java | 46 +++-----
.../compaction/CompactionTaskManagerTest.java | 26 ++---
.../CrossSpaceCompactionWithUnusualCasesTest.java | 9 --
.../FastCompactionPerformerWithEmptyPageTest.java | 2 -
...InconsistentCompressionTypeAndEncodingTest.java | 7 --
.../FastCrossCompactionPerformerTest.java | 2 -
.../FastInnerCompactionPerformerTest.java | 121 +++------------------
.../FastNonAlignedCrossCompactionTest.java | 47 --------
.../dataregion/compaction/MemoryControlTest.java | 17 +--
.../compaction/ReadChunkInnerCompactionTest.java | 19 +---
.../ReadPointAlignedCrossCompactionTest.java | 47 --------
16 files changed, 51 insertions(+), 345 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/AbstractCompactionTask.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/AbstractCompactionTask.java
index a864d915a2e..a3cee65a3b4 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/AbstractCompactionTask.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/AbstractCompactionTask.java
@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* AbstractCompactionTask is the base class for all compaction task, it
carries out the execution of
@@ -50,7 +49,6 @@ public abstract class AbstractCompactionTask {
protected String dataRegionId;
protected String storageGroupName;
protected long timePartition;
- protected final AtomicInteger currentTaskNum;
protected final TsFileManager tsFileManager;
protected ICompactionPerformer performer;
protected int hashCode = -1;
@@ -66,13 +64,11 @@ public abstract class AbstractCompactionTask {
String dataRegionId,
long timePartition,
TsFileManager tsFileManager,
- AtomicInteger currentTaskNum,
long serialId) {
this.storageGroupName = storageGroupName;
this.dataRegionId = dataRegionId;
this.timePartition = timePartition;
this.tsFileManager = tsFileManager;
- this.currentTaskNum = currentTaskNum;
this.serialId = serialId;
}
@@ -101,13 +97,11 @@ public abstract class AbstractCompactionTask {
protected abstract boolean doCompaction();
public boolean start() {
- currentTaskNum.incrementAndGet();
boolean isSuccess = false;
try {
summary.start();
isSuccess = doCompaction();
} finally {
- this.currentTaskNum.decrementAndGet();
summary.finish(isSuccess);
CompactionTaskManager.getInstance().removeRunningTaskFuture(this);
CompactionMetrics.getInstance()
@@ -138,7 +132,13 @@ public abstract class AbstractCompactionTask {
*/
public abstract boolean checkValidAndSetMerging();
- public abstract void transitSourceFilesToMerging() throws
FileCannotTransitToCompactingException;
+ public void transitSourceFilesToMerging() throws
FileCannotTransitToCompactingException {
+ for (TsFileResource f : getAllSourceTsFiles()) {
+ if (!f.setStatus(TsFileResourceStatus.COMPACTING)) {
+ throw new FileCannotTransitToCompactingException(f);
+ }
+ }
+ }
public abstract long getEstimatedMemoryCost() throws IOException;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java
index f9065dff6c7..db9a8192d5a 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CrossSpaceCompactionTask.java
@@ -26,7 +26,6 @@ import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionFileCountExceededException;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionMemoryNotEnoughException;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionValidationFailedException;
-import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.FileCannotTransitToCompactingException;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.ICrossCompactionPerformer;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl.FastCompactionPerformer;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.subtask.FastCompactionTaskSummary;
@@ -47,7 +46,6 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
public class CrossSpaceCompactionTask extends AbstractCompactionTask {
private static final Logger LOGGER =
@@ -70,7 +68,6 @@ public class CrossSpaceCompactionTask extends
AbstractCompactionTask {
List<TsFileResource> selectedSequenceFiles,
List<TsFileResource> selectedUnsequenceFiles,
ICrossCompactionPerformer performer,
- AtomicInteger currentTaskNum,
long memoryCost,
long serialId) {
super(
@@ -78,7 +75,6 @@ public class CrossSpaceCompactionTask extends
AbstractCompactionTask {
tsFileManager.getDataRegionId(),
timePartition,
tsFileManager,
- currentTaskNum,
serialId);
this.selectedSequenceFiles = selectedSequenceFiles;
this.selectedUnsequenceFiles = selectedUnsequenceFiles;
@@ -396,20 +392,6 @@ public class CrossSpaceCompactionTask extends
AbstractCompactionTask {
return addReadLockSuccess;
}
- @Override
- public void transitSourceFilesToMerging() throws
FileCannotTransitToCompactingException {
- for (TsFileResource f : selectedSequenceFiles) {
- if (!f.setStatus(TsFileResourceStatus.COMPACTING)) {
- throw new FileCannotTransitToCompactingException(f);
- }
- }
- for (TsFileResource f : selectedUnsequenceFiles) {
- if (!f.setStatus(TsFileResourceStatus.COMPACTING)) {
- throw new FileCannotTransitToCompactingException(f);
- }
- }
- }
-
@Override
public long getEstimatedMemoryCost() {
return memoryCost;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
index 3c70869eb0b..d4ed8be016b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
@@ -27,7 +27,6 @@ import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionFileCountExceededException;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionMemoryNotEnoughException;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionValidationFailedException;
-import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.FileCannotTransitToCompactingException;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.ICompactionPerformer;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl.FastCompactionPerformer;
import
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl.ReadChunkCompactionPerformer;
@@ -57,7 +56,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
public class InnerSpaceCompactionTask extends AbstractCompactionTask {
private static final Logger LOGGER =
@@ -87,14 +85,12 @@ public class InnerSpaceCompactionTask extends
AbstractCompactionTask {
List<TsFileResource> selectedTsFileResourceList,
boolean sequence,
ICompactionPerformer performer,
- AtomicInteger currentTaskNum,
long serialId) {
super(
tsFileManager.getStorageGroupName(),
tsFileManager.getDataRegionId(),
timePartition,
tsFileManager,
- currentTaskNum,
serialId);
this.selectedTsFileResourceList = selectedTsFileResourceList;
this.sequence = sequence;
@@ -328,8 +324,6 @@ public class InnerSpaceCompactionTask extends
AbstractCompactionTask {
isSequence());
}
} finally {
- SystemInfo.getInstance().resetCompactionMemoryCost(memoryCost);
-
SystemInfo.getInstance().decreaseCompactionFileNumCost(selectedTsFileResourceList.size());
releaseAllLocksAndResetStatus();
}
return isSuccess;
@@ -495,15 +489,6 @@ public class InnerSpaceCompactionTask extends
AbstractCompactionTask {
return true;
}
- @Override
- public void transitSourceFilesToMerging() throws
FileCannotTransitToCompactingException {
- for (TsFileResource f : selectedTsFileResourceList) {
- if (!f.setStatus(TsFileResourceStatus.COMPACTING)) {
- throw new FileCannotTransitToCompactingException(f);
- }
- }
- }
-
@Override
public long getEstimatedMemoryCost() throws IOException {
if (memoryCost == 0L) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionScheduler.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionScheduler.java
index 35667ceb622..2729fa051c4 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionScheduler.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionScheduler.java
@@ -129,7 +129,6 @@ public class CompactionScheduler {
task,
sequence,
performer,
- CompactionTaskManager.currentTaskNum,
tsFileManager.getNextCompactionTaskId()))) {
trySubmitCount++;
}
@@ -171,7 +170,6 @@ public class CompactionScheduler {
.getConfig()
.getCrossCompactionPerformer()
.createInstance(),
- CompactionTaskManager.currentTaskNum,
memoryCost.get(i),
tsFileManager.getNextCompactionTaskId()))) {
trySubmitCount++;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
index 74f3a99f483..d586bad38ca 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
@@ -71,8 +71,6 @@ public class CompactionTaskManager implements IService {
// The thread pool that executes the sub compaction task.
private WrappedThreadPoolExecutor subCompactionTaskExecutionPool;
- public static final AtomicInteger currentTaskNum = new AtomicInteger(0);
-
private final FixedPriorityBlockingQueue<AbstractCompactionTask>
candidateCompactionTaskQueue =
new FixedPriorityBlockingQueue<>(
config.getCandidateCompactionTaskQueueSize(), new
DefaultCompactionTaskComparatorImpl());
@@ -98,7 +96,6 @@ public class CompactionTaskManager implements IService {
|| config.isEnableUnseqSpaceCompaction()
|| config.isEnableCrossSpaceCompaction())) {
initThreadPool();
- currentTaskNum.set(0);
candidateCompactionTaskQueue.regsitPollLastHook(
AbstractCompactionTask::resetCompactionCandidateStatusForAllSourceFiles);
init = true;
@@ -424,7 +421,6 @@ public class CompactionTaskManager implements IService {
candidateCompactionTaskQueue.clear();
init = true;
}
- currentTaskNum.set(0);
init = true;
logger.info("Compaction task manager started.");
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionTaskComparatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionTaskComparatorTest.java
index 9582b15309b..bea68900384 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionTaskComparatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionTaskComparatorTest.java
@@ -57,7 +57,6 @@ import static org.junit.Assert.assertTrue;
public class CompactionTaskComparatorTest {
private final Logger LOGGER =
LoggerFactory.getLogger(CompactionTaskComparatorTest.class);
- private final AtomicInteger taskNum = new AtomicInteger(0);
private FixedPriorityBlockingQueue<AbstractCompactionTask>
compactionTaskQueue =
new FixedPriorityBlockingQueue<>(1024, new
DefaultCompactionTaskComparatorImpl());
private TsFileManager tsFileManager = new TsFileManager("fakeSg", "0", "/");
@@ -83,8 +82,7 @@ public class CompactionTaskComparatorTest {
new FakedTsFileResource(new File(String.format("%d-%d-0-0.tsfile",
i + j, i + j)), j));
}
compactionTasks[i] =
- new FakedInnerSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, true, resources, 0);
+ new FakedInnerSpaceCompactionTask("fakeSg", 0, tsFileManager, true,
resources, 0);
compactionTaskQueue.put(compactionTasks[i]);
}
@@ -106,8 +104,7 @@ public class CompactionTaskComparatorTest {
new File(String.format("%d-%d-0-0.tsfile", i + j, i + j)), j -
i + 101));
}
compactionTasks[i] =
- new FakedInnerSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, true, resources, 0);
+ new FakedInnerSpaceCompactionTask("fakeSg", 0, tsFileManager, true,
resources, 0);
compactionTaskQueue.put(compactionTasks[i]);
}
@@ -129,8 +126,7 @@ public class CompactionTaskComparatorTest {
new File(String.format("%d-%d-%d-0.tsfile", i + j, i + j, j -
i + 101)), 1));
}
compactionTasks[i] =
- new FakedInnerSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, true, resources, 0);
+ new FakedInnerSpaceCompactionTask("fakeSg", 0, tsFileManager, true,
resources, 0);
compactionTaskQueue.put(compactionTasks[i]);
}
@@ -155,8 +151,7 @@ public class CompactionTaskComparatorTest {
new File(String.format("%d-%d-%d-0.tsfile", i + j, i + j, j -
i + 101)), 1));
}
compactionTasks[i] =
- new FakedInnerSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, true, resources, 0);
+ new FakedInnerSpaceCompactionTask("fakeSg", 0, tsFileManager, true,
resources, 0);
limitQueue.add(compactionTasks[i]);
}
@@ -178,8 +173,7 @@ public class CompactionTaskComparatorTest {
new File(String.format("%d-%d-0-0.tsfile", i + j, i + j, j - i
+ 101)), 1));
}
compactionTasks[i] =
- new FakedInnerSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, true, resources, 0);
+ new FakedInnerSpaceCompactionTask("fakeSg", 0, tsFileManager, true,
resources, 0);
compactionTaskQueue.put(compactionTasks[i]);
}
@@ -202,8 +196,7 @@ public class CompactionTaskComparatorTest {
new FakedTsFileResource(new File(String.format("%d-%d-0-0.tsfile",
i + j, i + j)), j));
}
innerCompactionTasks[i] =
- new FakedInnerSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, true, resources, 0);
+ new FakedInnerSpaceCompactionTask("fakeSg", 0, tsFileManager, true,
resources, 0);
}
for (int i = 0; i < 100; ++i) {
@@ -219,7 +212,7 @@ public class CompactionTaskComparatorTest {
}
crossCompactionTasks[i] =
new FakeCrossSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, sequenceResources,
unsequenceResources, 0);
+ "fakeSg", 0, tsFileManager, sequenceResources,
unsequenceResources, 0);
}
for (int i = 0; i < 100; i++) {
@@ -256,7 +249,7 @@ public class CompactionTaskComparatorTest {
}
crossCompactionTasks[i] =
new FakeCrossSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, sequenceResources,
unsequenceResources, 0);
+ "fakeSg", 0, tsFileManager, sequenceResources,
unsequenceResources, 0);
compactionTaskQueue.put(crossCompactionTasks[i]);
}
for (int i = 100; i < 200; ++i) {
@@ -272,7 +265,7 @@ public class CompactionTaskComparatorTest {
}
crossCompactionTasks[i] =
new FakeCrossSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, sequenceResources,
unsequenceResources, 0);
+ "fakeSg", 0, tsFileManager, sequenceResources,
unsequenceResources, 0);
compactionTaskQueue.put(crossCompactionTasks[i]);
}
@@ -298,7 +291,7 @@ public class CompactionTaskComparatorTest {
}
compactionTaskQueue.put(
new FakedInnerSpaceCompactionTask(
- "fakeSg" + i, 0, tsFileManagers[i], taskNum, true, resources,
j));
+ "fakeSg" + i, 0, tsFileManagers[i], true, resources, j));
}
}
Map<String, AtomicInteger> taskCount = new HashMap<>();
@@ -331,8 +324,7 @@ public class CompactionTaskComparatorTest {
new FakedTsFileResource(new File(String.format("%d-%d-0-0.tsfile",
i + j, i + j)), j));
}
FakedInnerSpaceCompactionTask innerTask =
- new FakedInnerSpaceCompactionTask(
- "fakeSg", 0, tsFileManager, taskNum, true, resources, 0);
+ new FakedInnerSpaceCompactionTask("fakeSg", 0, tsFileManager, true,
resources, 0);
compactionTaskQueue.put(innerTask);
}
@@ -342,13 +334,7 @@ public class CompactionTaskComparatorTest {
fakedTsFileResource.getModFile().write(new Deletion(new
PartialPath("root.test.d1"), 1, 1));
compactionTaskQueue.put(
new FakedInnerSpaceCompactionTask(
- "fakeSg",
- 0,
- tsFileManager,
- taskNum,
- true,
- Collections.singletonList(fakedTsFileResource),
- 0));
+ "fakeSg", 0, tsFileManager, true,
Collections.singletonList(fakedTsFileResource), 0));
FakedInnerSpaceCompactionTask task = (FakedInnerSpaceCompactionTask)
compactionTaskQueue.take();
Assert.assertEquals(
targetFileName,
task.getSelectedTsFileResourceList().get(0).getTsFile().getName());
@@ -368,8 +354,7 @@ public class CompactionTaskComparatorTest {
new DefaultCompactionTaskComparatorImpl());
for (int i = 0; i < 10; i++) {
FakedInnerSpaceCompactionTask task =
- new FakedInnerSpaceCompactionTask(
- "fakeSg", i, tsFileManager, taskNum, true, resources1, 0);
+ new FakedInnerSpaceCompactionTask("fakeSg", i, tsFileManager, true,
resources1, 0);
candidateCompactionTaskQueue.put(task);
}
@@ -402,7 +387,6 @@ public class CompactionTaskComparatorTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- taskNum,
0,
0);
candidateCompactionTaskQueue.put(task);
@@ -419,7 +403,6 @@ public class CompactionTaskComparatorTest {
String storageGroupName,
long timePartition,
TsFileManager tsFileManager,
- AtomicInteger currentTaskNum,
boolean sequence,
List<TsFileResource> selectedTsFileResourceList,
long serialId) {
@@ -429,7 +412,6 @@ public class CompactionTaskComparatorTest {
selectedTsFileResourceList,
sequence,
new FastCompactionPerformer(false),
- currentTaskNum,
serialId);
}
@@ -455,7 +437,6 @@ public class CompactionTaskComparatorTest {
String fullStorageGroupName,
long timePartition,
TsFileManager tsFileManager,
- AtomicInteger currentTaskNum,
List<TsFileResource> selectedSequenceFiles,
List<TsFileResource> selectedUnsequenceFiles,
long serialId) {
@@ -465,7 +446,6 @@ public class CompactionTaskComparatorTest {
selectedSequenceFiles,
selectedUnsequenceFiles,
new ReadPointCompactionPerformer(),
- currentTaskNum,
0,
serialId);
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionTaskManagerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionTaskManagerTest.java
index 4013483d8e5..5781886f62e 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionTaskManagerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionTaskManagerTest.java
@@ -43,7 +43,6 @@ import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicInteger;
public class CompactionTaskManagerTest extends InnerCompactionTest {
static final Logger logger =
LoggerFactory.getLogger(CompactionTaskManagerTest.class);
@@ -78,11 +77,9 @@ public class CompactionTaskManagerTest extends
InnerCompactionTest {
new TsFileManager("root.compactionTest", "0",
tempSGDir.getAbsolutePath());
tsFileManager.addAll(seqResources, true);
InnerSpaceCompactionTask task1 =
- new InnerSpaceCompactionTask(
- 0, tsFileManager, seqResources, true, performer, new
AtomicInteger(0), 0);
+ new InnerSpaceCompactionTask(0, tsFileManager, seqResources, true,
performer, 0);
InnerSpaceCompactionTask task2 =
- new InnerSpaceCompactionTask(
- 0, tsFileManager, seqResources, true, performer, new
AtomicInteger(0), 0);
+ new InnerSpaceCompactionTask(0, tsFileManager, seqResources, true,
performer, 0);
seqResources.get(0).readLock();
CompactionTaskManager manager = CompactionTaskManager.getInstance();
Future<CompactionTaskSummary> summaryFuture = null;
@@ -122,11 +119,9 @@ public class CompactionTaskManagerTest extends
InnerCompactionTest {
new TsFileManager("root.compactionTest", "0",
tempSGDir.getAbsolutePath());
tsFileManager.addAll(seqResources, true);
InnerSpaceCompactionTask task1 =
- new InnerSpaceCompactionTask(
- 0, tsFileManager, seqResources, true, performer, new
AtomicInteger(0), 0);
+ new InnerSpaceCompactionTask(0, tsFileManager, seqResources, true,
performer, 0);
InnerSpaceCompactionTask task2 =
- new InnerSpaceCompactionTask(
- 0, tsFileManager, seqResources, true, performer, new
AtomicInteger(0), 0);
+ new InnerSpaceCompactionTask(0, tsFileManager, seqResources, true,
performer, 0);
seqResources.get(0).readLock();
Future<CompactionTaskSummary> summaryFuture = null;
try {
@@ -164,11 +159,9 @@ public class CompactionTaskManagerTest extends
InnerCompactionTest {
new TsFileManager("root.compactionTest", "0",
tempSGDir.getAbsolutePath());
tsFileManager.addAll(seqResources, true);
InnerSpaceCompactionTask task1 =
- new InnerSpaceCompactionTask(
- 0, tsFileManager, seqResources, true, performer, new
AtomicInteger(0), 0);
+ new InnerSpaceCompactionTask(0, tsFileManager, seqResources, true,
performer, 0);
InnerSpaceCompactionTask task2 =
- new InnerSpaceCompactionTask(
- 0, tsFileManager, seqResources, true, performer, new
AtomicInteger(0), 0);
+ new InnerSpaceCompactionTask(0, tsFileManager, seqResources, true,
performer, 0);
CompactionTaskManager manager = CompactionTaskManager.getInstance();
seqResources.get(0).readLock();
Assert.assertTrue(manager.addTaskToWaitingQueue(task1));
@@ -192,8 +185,7 @@ public class CompactionTaskManagerTest extends
InnerCompactionTest {
new TsFileManager("root.compactionTest", "0",
tempSGDir.getAbsolutePath());
tsFileManager.addAll(seqResources, true);
InnerSpaceCompactionTask task1 =
- new InnerSpaceCompactionTask(
- 0, tsFileManager, seqResources, true, performer, new
AtomicInteger(0), 0);
+ new InnerSpaceCompactionTask(0, tsFileManager, seqResources, true,
performer, 0);
CompactionTaskManager manager = CompactionTaskManager.getInstance();
manager.restart();
seqResources.get(0).readLock();
@@ -222,8 +214,7 @@ public class CompactionTaskManagerTest extends
InnerCompactionTest {
new TsFileManager("root.compactionTest", "0",
tempSGDir.getAbsolutePath());
tsFileManager.addAll(seqResources, true);
InnerSpaceCompactionTask task =
- new InnerSpaceCompactionTask(
- 0, tsFileManager, seqResources, true, performer, new
AtomicInteger(0), 0);
+ new InnerSpaceCompactionTask(0, tsFileManager, seqResources, true,
performer, 0);
seqResources.get(0).readLock();
CompactionTaskManager.getInstance().addTaskToWaitingQueue(task);
@@ -253,7 +244,6 @@ public class CompactionTaskManagerTest extends
InnerCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CrossSpaceCompactionWithUnusualCasesTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CrossSpaceCompactionWithUnusualCasesTest.java
index 6c981ea045f..5728e28b9fe 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CrossSpaceCompactionWithUnusualCasesTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CrossSpaceCompactionWithUnusualCasesTest.java
@@ -52,7 +52,6 @@ import org.junit.Test;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* If an unsequence file is generated by a load operation or some files in
sequence space is
@@ -135,7 +134,6 @@ public class CrossSpaceCompactionWithUnusualCasesTest
extends AbstractCompaction
result.get(0).getSeqFiles(),
result.get(0).getUnseqFiles(),
performer,
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -208,7 +206,6 @@ public class CrossSpaceCompactionWithUnusualCasesTest
extends AbstractCompaction
result.get(0).getSeqFiles(),
result.get(0).getUnseqFiles(),
performer,
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -292,7 +289,6 @@ public class CrossSpaceCompactionWithUnusualCasesTest
extends AbstractCompaction
result.get(0).getSeqFiles(),
result.get(0).getUnseqFiles(),
performer,
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -386,7 +382,6 @@ public class CrossSpaceCompactionWithUnusualCasesTest
extends AbstractCompaction
result.get(0).getSeqFiles(),
result.get(0).getUnseqFiles(),
performer,
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -482,7 +477,6 @@ public class CrossSpaceCompactionWithUnusualCasesTest
extends AbstractCompaction
result.get(0).getSeqFiles(),
result.get(0).getUnseqFiles(),
performer,
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -544,7 +538,6 @@ public class CrossSpaceCompactionWithUnusualCasesTest
extends AbstractCompaction
result.get(0).getSeqFiles(),
result.get(0).getUnseqFiles(),
performer,
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -648,7 +641,6 @@ public class CrossSpaceCompactionWithUnusualCasesTest
extends AbstractCompaction
result.get(0).getSeqFiles(),
result.get(0).getUnseqFiles(),
performer,
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -891,7 +883,6 @@ public class CrossSpaceCompactionWithUnusualCasesTest
extends AbstractCompaction
result.get(0).getSeqFiles(),
result.get(0).getUnseqFiles(),
performer,
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCompactionPerformerWithEmptyPageTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCompactionPerformerWithEmptyPageTest.java
index 815105aff1a..356cf458527 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCompactionPerformerWithEmptyPageTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCompactionPerformerWithEmptyPageTest.java
@@ -43,7 +43,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
public class FastCompactionPerformerWithEmptyPageTest extends
AbstractCompactionTest {
@@ -106,7 +105,6 @@ public class FastCompactionPerformerWithEmptyPageTest
extends AbstractCompaction
Arrays.asList(seqFile1),
Arrays.asList(unseqFile1),
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
try {
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTest.java
index ce2d95737d4..00249ca8095 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTest.java
@@ -54,7 +54,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
public class
FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTest
extends AbstractCompactionTest {
@@ -113,7 +112,6 @@ public class
FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTe
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
@@ -192,7 +190,6 @@ public class
FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTe
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
@@ -267,7 +264,6 @@ public class
FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTe
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
@@ -319,7 +315,6 @@ public class
FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTe
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
@@ -398,7 +393,6 @@ public class
FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTe
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
@@ -473,7 +467,6 @@ public class
FastCompactionPerformerWithInconsistentCompressionTypeAndEncodingTe
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCrossCompactionPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCrossCompactionPerformerTest.java
index 849b31790e3..6c5c336e6d9 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCrossCompactionPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCrossCompactionPerformerTest.java
@@ -60,7 +60,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_SEPARATOR;
import static org.apache.iotdb.db.utils.EnvironmentUtils.TEST_QUERY_JOB_ID;
@@ -4048,7 +4047,6 @@ public class FastCrossCompactionPerformerTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
1000,
0);
Assert.assertTrue(task.setSourceFilesToCompactionCandidate());
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastInnerCompactionPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastInnerCompactionPerformerTest.java
index e264b2cdc72..aafe6b52f56 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastInnerCompactionPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastInnerCompactionPerformerTest.java
@@ -55,7 +55,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_SEPARATOR;
import static org.junit.Assert.assertEquals;
@@ -121,13 +120,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- seqResources,
- true,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, seqResources, true, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -219,13 +212,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- seqResources,
- true,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, seqResources, true, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -360,13 +347,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- seqResources,
- true,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, seqResources, true, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -474,13 +455,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -589,13 +564,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -735,13 +704,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -870,13 +833,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -991,13 +948,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -1082,13 +1033,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- seqResources,
- true,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, seqResources, true, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -1202,13 +1147,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- seqResources,
- true,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, seqResources, true, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -1331,13 +1270,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- seqResources,
- true,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, seqResources, true, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -1465,13 +1398,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -1649,13 +1576,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -1813,13 +1734,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
@@ -1929,13 +1844,7 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
tsFileManager.addAll(unseqResources, false);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- unseqResources,
- false,
- new FastCompactionPerformer(false),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, unseqResources, false, new
FastCompactionPerformer(false), 0);
Assert.assertTrue(task.start());
Assert.assertEquals(0,
FileReaderManager.getInstance().getClosedFileReaderMap().size());
Assert.assertEquals(0,
FileReaderManager.getInstance().getUnclosedFileReaderMap().size());
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastNonAlignedCrossCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastNonAlignedCrossCompactionTest.java
index 3436efb614f..1f56106664e 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastNonAlignedCrossCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastNonAlignedCrossCompactionTest.java
@@ -51,7 +51,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
import static
org.apache.iotdb.db.storageengine.dataregion.compaction.utils.TsFileGeneratorUtils.createChunkWriter;
import static
org.apache.iotdb.db.storageengine.dataregion.compaction.utils.TsFileGeneratorUtils.createCompressionType;
@@ -279,7 +278,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -301,7 +299,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -548,7 +545,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -570,7 +566,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -816,7 +811,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -844,7 +838,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -1108,7 +1101,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -1130,7 +1122,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -1493,7 +1484,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -1515,7 +1505,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -1885,7 +1874,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -1907,7 +1895,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -2287,7 +2274,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -2309,7 +2295,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -2674,7 +2659,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -2696,7 +2680,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -3062,7 +3045,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -3084,7 +3066,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -3460,7 +3441,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -3482,7 +3462,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -3913,7 +3892,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -3935,7 +3913,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -4369,7 +4346,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -4391,7 +4367,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -4825,7 +4800,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -4847,7 +4821,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -5333,7 +5306,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -5355,7 +5327,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -5786,7 +5757,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -5808,7 +5778,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -6023,7 +5992,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -6045,7 +6013,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -6322,7 +6289,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -6344,7 +6310,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -6748,7 +6713,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -6770,7 +6734,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7136,7 +7099,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7158,7 +7120,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7409,7 +7370,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7431,7 +7391,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7568,7 +7527,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7590,7 +7548,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7778,7 +7735,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7800,7 +7756,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -8018,7 +7973,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
seqResources,
unseqResources,
new FastCompactionPerformer(true),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -8040,7 +7994,6 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
tsFileManager.getTsFileList(true),
true,
new FastCompactionPerformer(false),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/MemoryControlTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/MemoryControlTest.java
index 26ed3625919..2bcde7dae9c 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/MemoryControlTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/MemoryControlTest.java
@@ -37,7 +37,6 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
public class MemoryControlTest {
@Before
@@ -74,7 +73,6 @@ public class MemoryControlTest {
sequenceFiles,
unsequenceFiles,
null,
- new AtomicInteger(0),
1024L * 1024L * 1024L * 50L,
0);
boolean success = task.checkValidAndSetMerging();
@@ -117,14 +115,8 @@ public class MemoryControlTest {
tsFileManager.addAll(unsequenceFiles, false);
CrossSpaceCompactionTask task =
new CrossSpaceCompactionTask(
- 0L,
- tsFileManager,
- sequenceFiles,
- unsequenceFiles,
- null,
- new AtomicInteger(0),
- 1000,
- 0);
+ 0L, tsFileManager, sequenceFiles, unsequenceFiles, null, 1000,
0);
+
boolean success = task.checkValidAndSetMerging();
Assert.assertFalse(success);
Assert.assertEquals(0,
SystemInfo.getInstance().getCompactionMemoryCost().get());
@@ -170,7 +162,7 @@ public class MemoryControlTest {
// fail to check valid when tsfile manager is not allowed to compaction in
cross task
CrossSpaceCompactionTask task =
new CrossSpaceCompactionTask(
- 0L, tsFileManager, sequenceFiles, unsequenceFiles, null, new
AtomicInteger(0), 1000, 0);
+ 0L, tsFileManager, sequenceFiles, unsequenceFiles, null, 1000, 0);
boolean success = task.checkValidAndSetMerging();
Assert.assertFalse(success);
Assert.assertEquals(0,
SystemInfo.getInstance().getCompactionMemoryCost().get());
@@ -205,8 +197,7 @@ public class MemoryControlTest {
// fail to check valid when tsfile manager is not allowed to compaction in
inner task
InnerSpaceCompactionTask innerTask =
- new InnerSpaceCompactionTask(
- 0L, tsFileManager, sequenceFiles, true, null, new
AtomicInteger(0), 0L);
+ new InnerSpaceCompactionTask(0L, tsFileManager, sequenceFiles, true,
null, 0L);
boolean success = innerTask.checkValidAndSetMerging();
Assert.assertFalse(success);
Assert.assertEquals(0,
SystemInfo.getInstance().getCompactionMemoryCost().get());
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadChunkInnerCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadChunkInnerCompactionTest.java
index 40e14ea792b..fc9ce3a259c 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadChunkInnerCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadChunkInnerCompactionTest.java
@@ -47,7 +47,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
import static
org.apache.iotdb.db.storageengine.dataregion.compaction.utils.TsFileGeneratorUtils.createChunkWriter;
import static
org.apache.iotdb.db.storageengine.dataregion.compaction.utils.TsFileGeneratorUtils.createCompressionType;
@@ -183,13 +182,8 @@ public class ReadChunkInnerCompactionTest extends
AbstractCompactionTest {
readSourceFiles(createTimeseries(maxDeviceNum, maxMeasurementNum,
false), tsDataTypes);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- seqResources,
- true,
- new ReadChunkCompactionPerformer(),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, seqResources, true, new
ReadChunkCompactionPerformer(), 0);
+
task.start();
validateSeqFiles(true);
@@ -361,13 +355,8 @@ public class ReadChunkInnerCompactionTest extends
AbstractCompactionTest {
readSourceFiles(createTimeseries(maxDeviceNum, maxMeasurementNum,
true), tsDataTypes);
InnerSpaceCompactionTask task =
new InnerSpaceCompactionTask(
- 0,
- tsFileManager,
- seqResources,
- true,
- new ReadChunkCompactionPerformer(),
- new AtomicInteger(0),
- 0);
+ 0, tsFileManager, seqResources, true, new
ReadChunkCompactionPerformer(), 0);
+
task.start();
validateSeqFiles(true);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointAlignedCrossCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointAlignedCrossCompactionTest.java
index 80c2d95f1c9..6b6498f5372 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointAlignedCrossCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointAlignedCrossCompactionTest.java
@@ -49,7 +49,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
import static
org.apache.iotdb.db.storageengine.dataregion.compaction.utils.TsFileGeneratorUtils.createChunkWriter;
import static
org.apache.iotdb.db.storageengine.dataregion.compaction.utils.TsFileGeneratorUtils.createCompressionType;
@@ -259,7 +258,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -275,7 +273,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -526,7 +523,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -542,7 +538,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -792,7 +787,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -808,7 +802,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -1075,7 +1068,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -1091,7 +1083,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -1457,7 +1448,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -1473,7 +1463,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -1847,7 +1836,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -1863,7 +1851,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -2247,7 +2234,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -2263,7 +2249,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -2631,7 +2616,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -2647,7 +2631,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -3016,7 +2999,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -3032,7 +3014,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -3412,7 +3393,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -3428,7 +3408,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -3862,7 +3841,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -3878,7 +3856,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -4315,7 +4292,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -4331,7 +4307,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -4768,7 +4743,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -4784,7 +4758,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -5273,7 +5246,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -5289,7 +5261,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -5723,7 +5694,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -5739,7 +5709,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -5954,7 +5923,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -5970,7 +5938,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -6247,7 +6214,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -6263,7 +6229,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -6667,7 +6632,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -6683,7 +6647,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7052,7 +7015,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7068,7 +7030,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7319,7 +7280,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7335,7 +7295,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7472,7 +7431,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7488,7 +7446,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7676,7 +7633,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7692,7 +7648,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
@@ -7917,7 +7872,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
seqResources,
unseqResources,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0,
0);
Assert.assertTrue(task.start());
@@ -7933,7 +7887,6 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
tsFileManager.getTsFileList(true),
true,
new ReadPointCompactionPerformer(),
- new AtomicInteger(0),
0);
Assert.assertTrue(innerTask.start());
validateSeqFiles(true);
