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
commit 96c5111c45ab46e3be14a61494d8e07d5276be56 Author: Jinrui.Zhang <[email protected]> AuthorDate: Sat Oct 7 11:49:02 2023 +0800 fix compile error --- .../execute/task/AbstractCompactionTask.java | 6 +-- .../writer/AbstractCrossCompactionWriter.java | 2 +- .../compaction/settle/SettleRequestHandler.java | 1 - .../storageengine/dataregion/DataRegionTest.java | 2 - .../compaction/FastAlignedCrossCompactionTest.java | 47 -------------------- .../ReadPointNonAlignedCrossCompactionTest.java | 47 -------------------- .../cross/CrossSpaceCompactionSelectorTest.java | 14 ------ .../CrossSpaceCompactionWithFastPerformerTest.java | 4 -- ...eCompactionWithFastPerformerValidationTest.java | 51 +--------------------- ...sSpaceCompactionWithReadPointPerformerTest.java | 4 -- ...actionWithReadPointPerformerValidationTest.java | 48 -------------------- ...eCrossSpaceCompactionWithFastPerformerTest.java | 5 --- ...sSpaceCompactionWithReadPointPerformerTest.java | 5 --- .../inner/InnerCompactionEmptyTsFileTest.java | 2 - .../InnerSeqCompactionWithFastPerformerTest.java | 10 +---- ...nerSeqCompactionWithReadChunkPerformerTest.java | 2 - .../inner/InnerSpaceCompactionSelectorTest.java | 5 --- .../utils/CompactionUpdateFileCountTest.java | 18 +------- .../utils/MultiTsFileDeviceIteratorTest.java | 7 --- 19 files changed, 8 insertions(+), 272 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 564f0aac939..1db4553c92e 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 @@ -28,9 +28,6 @@ import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileManager; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResourceStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.util.List; @@ -111,7 +108,7 @@ public abstract class AbstractCompactionTask { protected abstract boolean doCompaction(); - public void start() { + public boolean start() { boolean isSuccess = false; summary.start(); try { @@ -122,6 +119,7 @@ public abstract class AbstractCompactionTask { CompactionMetrics.getInstance() .recordTaskFinishOrAbort(crossTask, innerSeqTask, summary.getTimeCost()); } + return isSuccess; } public String getStorageGroupName() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java index ef952d52c0c..b734e81d4a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java @@ -190,7 +190,7 @@ public abstract class AbstractCrossCompactionWriter extends AbstractCompactionWr throws IOException { if (timestamp <= lastTime[subTaskId]) { throw new RuntimeException( - "Timestamp of the current point of " + ".getUnseqFiles() of " + (deviceId + IoTDBConstant.PATH_SEPARATOR + measurementId[subTaskId]) + " is " + timestamp diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandler.java index dc95c5ed8cb..60652442dad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandler.java @@ -275,7 +275,6 @@ public class SettleRequestHandler { tsFileResources, hasSeqFiles, performer, - CompactionTaskManager.currentTaskNum, tsFileManager.getNextCompactionTaskId()); try { CompactionTaskManager.getInstance().addTaskToWaitingQueue(task); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java index 83a5fb700a0..4e7b678298c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java @@ -75,7 +75,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; public class DataRegionTest { private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); @@ -777,7 +776,6 @@ public class DataRegionTest { dataRegion.getSequenceFileList(), true, performer, - new AtomicInteger(0), 0); CompactionTaskManager.getInstance().addTaskToWaitingQueue(task); Thread.sleep(20); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastAlignedCrossCompactionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastAlignedCrossCompactionTest.java index c70f03454c5..6cd909c840f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastAlignedCrossCompactionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastAlignedCrossCompactionTest.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; @@ -256,7 +255,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -272,7 +270,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -523,7 +520,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -539,7 +535,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -789,7 +784,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -805,7 +799,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -1072,7 +1065,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -1088,7 +1080,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -1454,7 +1445,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -1470,7 +1460,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -1844,7 +1833,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -1860,7 +1848,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -2244,7 +2231,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -2260,7 +2246,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -2628,7 +2613,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -2644,7 +2628,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -3013,7 +2996,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -3029,7 +3011,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -3409,7 +3390,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -3425,7 +3405,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -3859,7 +3838,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -3875,7 +3853,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -4312,7 +4289,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -4328,7 +4304,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -4765,7 +4740,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -4781,7 +4755,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -5270,7 +5243,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -5286,7 +5258,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -5720,7 +5691,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -5736,7 +5706,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -5951,7 +5920,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -5967,7 +5935,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -6244,7 +6211,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -6260,7 +6226,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -6664,7 +6629,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -6680,7 +6644,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7049,7 +7012,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7065,7 +7027,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7316,7 +7277,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7332,7 +7292,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7469,7 +7428,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7485,7 +7443,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7673,7 +7630,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7689,7 +7645,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7914,7 +7869,6 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7930,7 +7884,6 @@ public class FastAlignedCrossCompactionTest 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/ReadPointNonAlignedCrossCompactionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointNonAlignedCrossCompactionTest.java index 14fb6ca01ea..0db27da3866 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointNonAlignedCrossCompactionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointNonAlignedCrossCompactionTest.java @@ -50,7 +50,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; @@ -281,7 +280,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -297,7 +295,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -544,7 +541,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -560,7 +556,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -806,7 +801,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -822,7 +816,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -1086,7 +1079,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -1102,7 +1094,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -1465,7 +1456,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -1481,7 +1471,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -1851,7 +1840,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -1867,7 +1855,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -2247,7 +2234,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -2263,7 +2249,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -2628,7 +2613,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -2644,7 +2628,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -3010,7 +2993,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -3026,7 +3008,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -3402,7 +3383,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -3418,7 +3398,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -3849,7 +3828,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -3865,7 +3843,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -4299,7 +4276,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -4315,7 +4291,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -4749,7 +4724,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -4765,7 +4739,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -5251,7 +5224,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -5267,7 +5239,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -5698,7 +5669,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -5714,7 +5684,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -5929,7 +5898,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -5945,7 +5913,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -6222,7 +6189,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -6238,7 +6204,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -6642,7 +6607,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -6658,7 +6622,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7024,7 +6987,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7040,7 +7002,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7291,7 +7252,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7307,7 +7267,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7444,7 +7403,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7460,7 +7418,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7648,7 +7605,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7664,7 +7620,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); Assert.assertTrue(innerTask.start()); validateSeqFiles(true); @@ -7882,7 +7837,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); Assert.assertTrue(task.start()); @@ -7898,7 +7852,6 @@ public class ReadPointNonAlignedCrossCompactionTest extends AbstractCompactionTe tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - 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/cross/CrossSpaceCompactionSelectorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java index 62f3a4b0ae3..ac4f8d4a939 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 @@ -23,7 +23,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.storageengine.dataregion.compaction.AbstractCompactionTest; import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.CrossSpaceCompactionTask; -import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionTaskManager; import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.impl.RewriteCrossSpaceCompactionSelector; import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.utils.CrossCompactionTaskResource; import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.utils.CrossSpaceCompactionCandidate; @@ -203,7 +202,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, 1000, tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -341,7 +339,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -455,7 +452,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -556,7 +552,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE and add into queue @@ -675,7 +670,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -793,7 +787,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -901,7 +894,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE and add into queue @@ -1161,7 +1153,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -1275,7 +1266,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -1380,7 +1370,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE and add into queue @@ -1498,7 +1487,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -1616,7 +1604,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE @@ -1724,7 +1711,6 @@ public class CrossSpaceCompactionSelectorTest extends AbstractCompactionTest { .getConfig() .getCrossCompactionPerformer() .createInstance(), - CompactionTaskManager.currentTaskNum, crossCompactionTaskResource.getTotalMemoryCost(), tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE and add into queue diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java index a3231e65607..90116dced7a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java @@ -60,7 +60,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; import static org.junit.Assert.fail; @@ -427,7 +426,6 @@ public class CrossSpaceCompactionWithFastPerformerTest { mergeResource.getSeqFiles(), mergeResource.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(compactionTask.start()); @@ -731,7 +729,6 @@ public class CrossSpaceCompactionWithFastPerformerTest { mergeResource.getSeqFiles(), mergeResource.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(compactionTask.start()); @@ -1034,7 +1031,6 @@ public class CrossSpaceCompactionWithFastPerformerTest { mergeResource.getSeqFiles(), mergeResource.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); Assert.assertTrue(compactionTask.start()); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java index e7010e8787d..8da3fd685e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java @@ -65,7 +65,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.tsfile.utils.TsFileGeneratorUtils.alignDeviceOffset; @@ -129,7 +128,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -174,7 +172,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -219,7 +216,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -272,7 +268,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -322,7 +317,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -370,7 +364,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -421,7 +414,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -471,7 +463,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -521,7 +512,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -572,7 +562,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -623,7 +612,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -674,7 +662,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -726,7 +713,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -779,7 +765,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -832,7 +817,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -886,7 +870,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -941,7 +924,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -996,7 +978,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1051,7 +1032,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1106,7 +1086,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1160,7 +1139,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1210,7 +1188,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1261,7 +1238,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1312,7 +1288,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1363,7 +1338,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1415,7 +1389,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1468,7 +1441,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1521,7 +1493,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1575,7 +1546,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1630,7 +1600,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1685,7 +1654,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1740,7 +1708,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1795,7 +1762,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1849,7 +1815,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1901,7 +1866,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1949,7 +1913,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -2002,7 +1965,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -2056,7 +2018,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -2110,7 +2071,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -2211,8 +2171,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac FastCompactionPerformer performer = new FastCompactionPerformer(false); performer.setSourceFiles(sourceFiles); InnerSpaceCompactionTask innerSpaceCompactionTask = - new InnerSpaceCompactionTask( - 0, tsFileManager, sourceFiles, true, performer, new AtomicInteger(0), 0); + new InnerSpaceCompactionTask(0, tsFileManager, sourceFiles, true, performer, 0); Assert.assertTrue( CompactionUtils.validateTsFileResources(tsFileManager, COMPACTION_TEST_SG, 0)); innerSpaceCompactionTask.start(); @@ -2376,7 +2335,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2448,7 +2406,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start(); @@ -2521,7 +2478,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start(); @@ -2596,7 +2552,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2676,7 +2631,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start(); @@ -2755,7 +2709,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start(); @@ -2835,7 +2788,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start(); @@ -2916,7 +2868,6 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new FastCompactionPerformer(true), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start(); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java index a6615a8f2ba..59a273d3f4d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java @@ -59,7 +59,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; import static org.junit.Assert.fail; @@ -426,7 +425,6 @@ public class CrossSpaceCompactionWithReadPointPerformerTest { mergeResource.getSeqFiles(), mergeResource.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); compactionTask.start(); @@ -730,7 +728,6 @@ public class CrossSpaceCompactionWithReadPointPerformerTest { mergeResource.getSeqFiles(), mergeResource.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); compactionTask.start(); @@ -1033,7 +1030,6 @@ public class CrossSpaceCompactionWithReadPointPerformerTest { mergeResource.getSeqFiles(), mergeResource.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); compactionTask.start(); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java index 7176e4771a6..67dfb9294cc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java @@ -64,7 +64,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.tsfile.utils.TsFileGeneratorUtils.alignDeviceOffset; @@ -129,7 +128,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -174,7 +172,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -219,7 +216,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -272,7 +268,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -322,7 +317,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -370,7 +364,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -421,7 +414,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -471,7 +463,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -521,7 +512,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -572,7 +562,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -623,7 +612,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -674,7 +662,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -726,7 +713,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -779,7 +765,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -832,7 +817,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -886,7 +870,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -941,7 +924,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -996,7 +978,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1051,7 +1032,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1106,7 +1086,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1160,7 +1139,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1210,7 +1188,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1261,7 +1238,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1312,7 +1288,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1363,7 +1338,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1415,7 +1389,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1468,7 +1441,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1521,7 +1493,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1575,7 +1546,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1630,7 +1600,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1685,7 +1654,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1740,7 +1708,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1795,7 +1762,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1849,7 +1815,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1901,7 +1866,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -1949,7 +1913,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -2002,7 +1965,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -2056,7 +2018,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -2110,7 +2071,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest selected.get(0).getSeqFiles(), selected.get(0).getUnseqFiles(), performer, - new AtomicInteger(0), 0, tsFileManager.getNextCompactionTaskId()) .doCompaction(); @@ -2228,7 +2188,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2301,7 +2260,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2375,7 +2333,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2450,7 +2407,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2531,7 +2487,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2611,7 +2566,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2692,7 +2646,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); @@ -2774,7 +2727,6 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest sourceFiles.getSeqFiles(), sourceFiles.getUnseqFiles(), new ReadPointCompactionPerformer(), - new AtomicInteger(0), sourceFiles.getTotalMemoryCost(), 0) .start()); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java index 6cb1bf85250..a0738f8f36b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java @@ -62,7 +62,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.CROSS_COMPACTION_TMP_FILE_SUFFIX; import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_SEPARATOR; @@ -226,7 +225,6 @@ public class RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); task.start(); @@ -454,7 +452,6 @@ public class RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); task.start(); @@ -596,7 +593,6 @@ public class RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); task.setSourceFilesToCompactionCandidate(); @@ -715,7 +711,6 @@ public class RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo seqResources, unseqResources, new FastCompactionPerformer(true), - new AtomicInteger(0), 0, 0); task.setSourceFilesToCompactionCandidate(); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java index b066cdbc935..89ac14094da 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java @@ -62,7 +62,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.CROSS_COMPACTION_TMP_FILE_SUFFIX; import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_SEPARATOR; @@ -226,7 +225,6 @@ public class RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); task.start(); @@ -454,7 +452,6 @@ public class RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); task.start(); @@ -596,7 +593,6 @@ public class RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); task.setSourceFilesToCompactionCandidate(); @@ -715,7 +711,6 @@ public class RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr seqResources, unseqResources, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0, 0); task.setSourceFilesToCompactionCandidate(); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionEmptyTsFileTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionEmptyTsFileTest.java index 647d6edc363..86dbeddf3a5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionEmptyTsFileTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerCompactionEmptyTsFileTest.java @@ -37,7 +37,6 @@ import org.junit.Test; import java.io.File; import java.io.IOException; import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicInteger; public class InnerCompactionEmptyTsFileTest extends InnerCompactionTest { @@ -84,7 +83,6 @@ public class InnerCompactionEmptyTsFileTest extends InnerCompactionTest { unseqResources.subList(0, 3), false, new ReadPointCompactionPerformer(), - new AtomicInteger(0), 0); unseqResources.get(0).readLock(); CompactionTaskManager.getInstance().addTaskToWaitingQueue(task); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java index dec41bd7848..b0ac91e2fed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java @@ -61,7 +61,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; public class InnerSeqCompactionWithFastPerformerTest { static final String COMPACTION_TEST_SG = "root.compactionTest"; @@ -1134,13 +1133,8 @@ public class InnerSeqCompactionWithFastPerformerTest { ICompactionPerformer performer = new FastCompactionPerformer(false); InnerSpaceCompactionTask task = new InnerSpaceCompactionTask( - 0, - vsgp.getTsFileResourceManager(), - sourceResources, - true, - performer, - new AtomicInteger(0), - 0); + 0, vsgp.getTsFileResourceManager(), sourceResources, true, performer, 0); + task.setSourceFilesToCompactionCandidate(); task.checkValidAndSetMerging(); // delete data during compaction diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java index d56b0946808..59537af962f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java @@ -60,7 +60,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicInteger; public class InnerSeqCompactionWithReadChunkPerformerTest { static final String COMPACTION_TEST_SG = "root.compactionTest"; @@ -1101,7 +1100,6 @@ public class InnerSeqCompactionWithReadChunkPerformerTest { sourceResources, true, new ReadChunkCompactionPerformer(), - new AtomicInteger(0), 0); task.setSourceFilesToCompactionCandidate(); task.checkValidAndSetMerging(); 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 0f286a3d4ec..1c347c7f67e 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,7 +25,6 @@ import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.storageengine.dataregion.compaction.AbstractCompactionTest; import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl.FastCompactionPerformer; import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.InnerSpaceCompactionTask; -import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionTaskManager; 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; @@ -174,7 +173,6 @@ public class InnerSpaceCompactionSelectorTest extends AbstractCompactionTest { task, true, new FastCompactionPerformer(false), - CompactionTaskManager.currentTaskNum, tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE if (idx == 0) { @@ -275,7 +273,6 @@ public class InnerSpaceCompactionSelectorTest extends AbstractCompactionTest { task, true, new FastCompactionPerformer(false), - CompactionTaskManager.currentTaskNum, tsFileManager.getNextCompactionTaskId()); if (!innerSpaceCompactionTask.setSourceFilesToCompactionCandidate()) { @@ -465,7 +462,6 @@ public class InnerSpaceCompactionSelectorTest extends AbstractCompactionTest { task, true, new FastCompactionPerformer(false), - CompactionTaskManager.currentTaskNum, tsFileManager.getNextCompactionTaskId()); // set file status to COMPACTION_CANDIDATE if (idx == 0) { @@ -570,7 +566,6 @@ public class InnerSpaceCompactionSelectorTest extends AbstractCompactionTest { task, true, new FastCompactionPerformer(false), - CompactionTaskManager.currentTaskNum, tsFileManager.getNextCompactionTaskId()); if (!innerSpaceCompactionTask.setSourceFilesToCompactionCandidate()) { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionUpdateFileCountTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionUpdateFileCountTest.java index 857313125b6..05f957b1e07 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionUpdateFileCountTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionUpdateFileCountTest.java @@ -35,7 +35,6 @@ import org.junit.Before; import org.junit.Test; import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; public class CompactionUpdateFileCountTest extends AbstractCompactionTest { @@ -61,13 +60,7 @@ public class CompactionUpdateFileCountTest extends AbstractCompactionTest { tsFileManager.addAll(seqResources, true); InnerSpaceCompactionTask task = new InnerSpaceCompactionTask( - 0, - tsFileManager, - seqResources, - true, - new ReadChunkCompactionPerformer(), - new AtomicInteger(), - 0); + 0, tsFileManager, seqResources, true, new ReadChunkCompactionPerformer(), 0); Assert.assertTrue(task.start()); Assert.assertEquals(initSeqFileNum - 1, FileMetrics.getInstance().getFileNum(true)); Assert.assertEquals(initUnSeqFileNum, FileMetrics.getInstance().getFileNum(false)); @@ -84,13 +77,7 @@ public class CompactionUpdateFileCountTest extends AbstractCompactionTest { tsFileManager.addAll(unseqResources, false); InnerSpaceCompactionTask task = new InnerSpaceCompactionTask( - 0, - tsFileManager, - unseqResources, - false, - new FastCompactionPerformer(false), - new AtomicInteger(), - 0); + 0, tsFileManager, unseqResources, false, new FastCompactionPerformer(false), 0); Assert.assertTrue(task.start()); Assert.assertEquals(initSeqFileNum, FileMetrics.getInstance().getFileNum(true)); Assert.assertEquals(initUnSeqFileNum - 1, FileMetrics.getInstance().getFileNum(false)); @@ -113,7 +100,6 @@ public class CompactionUpdateFileCountTest extends AbstractCompactionTest { seqResources, unseqResources, new FastCompactionPerformer(true), - 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/utils/MultiTsFileDeviceIteratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/MultiTsFileDeviceIteratorTest.java index 8d6f18375fe..4373ec85bde 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/MultiTsFileDeviceIteratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/MultiTsFileDeviceIteratorTest.java @@ -54,7 +54,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.commons.conf.IoTDBConstant.PATH_SEPARATOR; @@ -403,7 +402,6 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new ReadChunkCompactionPerformer(), - new AtomicInteger(), 0L); Assert.assertTrue(task.start()); @@ -549,7 +547,6 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new ReadChunkCompactionPerformer(), - new AtomicInteger(), 0L); Assert.assertTrue(task.start()); @@ -694,7 +691,6 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(), 0L); Assert.assertTrue(task.start()); @@ -839,7 +835,6 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new ReadPointCompactionPerformer(), - new AtomicInteger(), 0L); Assert.assertTrue(task.start()); @@ -992,7 +987,6 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(), 0L); Assert.assertTrue(task.start()); @@ -1137,7 +1131,6 @@ public class MultiTsFileDeviceIteratorTest extends AbstractCompactionTest { tsFileManager.getTsFileList(true), true, new FastCompactionPerformer(false), - new AtomicInteger(), 0L); Assert.assertTrue(task.start());
