You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/12/22 04:48:41 UTC
[iotdb] branch xingtanzjr/refine_cross_selection updated: fix test compile error
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/refine_cross_selection
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/xingtanzjr/refine_cross_selection by this push:
new 748b1c71b9 fix test compile error
748b1c71b9 is described below
commit 748b1c71b9694ed67473aa01433bbe4c70ba492e
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Thu Dec 22 12:48:31 2022 +0800
fix test compile error
---
.../CrossSpaceCompactionWithFastPerformerTest.java | 7 +-
...eCompactionWithFastPerformerValidationTest.java | 752 ++++++++++-----------
...sSpaceCompactionWithReadPointPerformerTest.java | 7 +-
...actionWithReadPointPerformerValidationTest.java | 752 ++++++++++-----------
.../engine/compaction/cross/MergeUpgradeTest.java | 4 +-
.../cross/RewriteCompactionFileSelectorTest.java | 90 +--
6 files changed, 807 insertions(+), 805 deletions(-)
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java
index 8de6fd3118..571d3167ee 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerTest.java
@@ -24,6 +24,7 @@ import org.apache.iotdb.db.engine.cache.BloomFilterCache;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.compaction.CompactionTaskManager;
+import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossCompactionTaskResource;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossSpaceCompactionCandidate;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.RewriteCrossSpaceCompactionSelector;
import org.apache.iotdb.db.engine.compaction.performer.impl.FastCompactionPerformer;
@@ -408,7 +409,7 @@ public class CrossSpaceCompactionWithFastPerformerTest {
seqTsFileResourceList, unseqTsFileResourceList, timeLowerBound);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqTsFileResourceList, unseqTsFileResourceList);
index++;
if (selected.size() > 0) {
@@ -713,7 +714,7 @@ public class CrossSpaceCompactionWithFastPerformerTest {
seqTsFileResourceList, unseqTsFileResourceList, timeLowerBound);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqTsFileResourceList, unseqTsFileResourceList);
if (selected.size() > 0) {
AbstractCompactionTask compactionTask =
@@ -1016,7 +1017,7 @@ public class CrossSpaceCompactionWithFastPerformerTest {
seqTsFileResourceList, unseqTsFileResourceList, timeLowerBound);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqTsFileResourceList, unseqTsFileResourceList);
if (selected.size() > 0) {
AbstractCompactionTask compactionTask =
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
index d1171d86e4..aa135f9677 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.compaction.AbstractCompactionTest;
import org.apache.iotdb.db.engine.compaction.CompactionUtils;
+import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossCompactionTaskResource;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossSpaceCompactionCandidate;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.RewriteCrossSpaceCompactionSelector;
import org.apache.iotdb.db.engine.compaction.inner.InnerSpaceCompactionTask;
@@ -39,7 +40,6 @@ import org.apache.iotdb.db.query.control.FileReaderManager;
import org.apache.iotdb.db.tools.validate.TsFileValidationTool;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
-import org.apache.iotdb.tsfile.utils.Pair;
import org.junit.After;
import org.junit.Assert;
@@ -97,20 +97,20 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(1, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
+ Assert.assertEquals(1, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -140,22 +140,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(1, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(1, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -185,22 +185,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -236,24 +236,24 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(4, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(4, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
- Assert.assertEquals(selected.get(0).right.get(2), unseqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(3), unseqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(2), unseqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(3), unseqResources.get(3));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -285,25 +285,25 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(5));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(5));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -335,23 +335,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(1, selected.get(0).left.size());
- Assert.assertEquals(3, selected.get(0).right.size());
- for (TsFileResource selectedResource : (List<TsFileResource>) selected.get(0).left) {
+ Assert.assertEquals(1, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(3, selected.get(0).getUnseqFiles().size());
+ for (TsFileResource selectedResource : (List<TsFileResource>) selected.get(0).getSeqFiles()) {
Assert.assertEquals(selectedResource, seqResources.get(1));
}
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
- Assert.assertEquals(selected.get(0).right.get(2), unseqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(2), unseqResources.get(2));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -384,25 +384,25 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(4, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(4, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
- Assert.assertEquals(selected.get(0).right.get(2), unseqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(3), unseqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(2), unseqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(3), unseqResources.get(3));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -434,25 +434,25 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(4, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(4, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
- Assert.assertEquals(selected.get(0).right.get(2), unseqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(3), unseqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(2), unseqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(3), unseqResources.get(3));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -487,22 +487,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -538,22 +538,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -590,21 +590,21 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -640,22 +640,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -692,22 +692,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -745,22 +745,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -797,23 +797,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -851,23 +851,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -906,23 +906,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -960,24 +960,24 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1015,24 +1015,24 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1070,24 +1070,24 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(6, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).left.get(5), seqResources.get(7));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(6, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(5), seqResources.get(7));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1125,23 +1125,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(7));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(7));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1176,22 +1176,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1227,22 +1227,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1279,21 +1279,21 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1329,22 +1329,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1381,22 +1381,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1434,22 +1434,22 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1486,23 +1486,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1540,23 +1540,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1595,23 +1595,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1649,24 +1649,24 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1704,24 +1704,24 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1759,24 +1759,24 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(6, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).left.get(5), seqResources.get(7));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(6, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(5), seqResources.get(7));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1814,23 +1814,23 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(7));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(7));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1869,20 +1869,20 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1923,14 +1923,14 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
// Assert.assertEquals(0, result.length);
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1970,20 +1970,20 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -2023,21 +2023,21 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -2078,20 +2078,20 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -2141,7 +2141,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
.createInstance(COMPACTION_TEST_SG, "0", 0, tsFileManager);
// In the process of getting the file list and starting to select files, the file list is
// updated (the file is deleted or the status is updated)
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
Assert.assertEquals(0, selected.size());
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java
index 846484f7d9..603ad2250e 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerTest.java
@@ -24,6 +24,7 @@ import org.apache.iotdb.db.engine.cache.BloomFilterCache;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.compaction.CompactionTaskManager;
+import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossCompactionTaskResource;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossSpaceCompactionCandidate;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.RewriteCrossSpaceCompactionSelector;
import org.apache.iotdb.db.engine.compaction.performer.impl.ReadPointCompactionPerformer;
@@ -408,7 +409,7 @@ public class CrossSpaceCompactionWithReadPointPerformerTest {
seqTsFileResourceList, unseqTsFileResourceList, timeLowerBound);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqTsFileResourceList, unseqTsFileResourceList);
index++;
if (selected.size() > 0) {
@@ -713,7 +714,7 @@ public class CrossSpaceCompactionWithReadPointPerformerTest {
seqTsFileResourceList, unseqTsFileResourceList, timeLowerBound);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqTsFileResourceList, unseqTsFileResourceList);
if (selected.size() > 0) {
AbstractCompactionTask compactionTask =
@@ -1016,7 +1017,7 @@ public class CrossSpaceCompactionWithReadPointPerformerTest {
seqTsFileResourceList, unseqTsFileResourceList, timeLowerBound);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqTsFileResourceList, unseqTsFileResourceList);
if (selected.size() > 0) {
AbstractCompactionTask compactionTask =
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
index 93ed0ddbe3..d4d15657e6 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.compaction.AbstractCompactionTest;
import org.apache.iotdb.db.engine.compaction.CompactionUtils;
+import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossCompactionTaskResource;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossSpaceCompactionCandidate;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.RewriteCrossSpaceCompactionSelector;
import org.apache.iotdb.db.engine.compaction.performer.ICrossCompactionPerformer;
@@ -39,7 +40,6 @@ import org.apache.iotdb.db.query.control.FileReaderManager;
import org.apache.iotdb.db.tools.validate.TsFileValidationTool;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
-import org.apache.iotdb.tsfile.utils.Pair;
import org.junit.After;
import org.junit.Assert;
@@ -96,20 +96,20 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(1, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
+ Assert.assertEquals(1, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -139,22 +139,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(1, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(1, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -184,22 +184,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -235,24 +235,24 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(4, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(4, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
- Assert.assertEquals(selected.get(0).right.get(2), unseqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(3), unseqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(2), unseqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(3), unseqResources.get(3));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -284,25 +284,25 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(5));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(5));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -334,23 +334,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(1, selected.get(0).left.size());
- Assert.assertEquals(3, selected.get(0).right.size());
- for (TsFileResource selectedResource : (List<TsFileResource>) selected.get(0).left) {
+ Assert.assertEquals(1, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(3, selected.get(0).getUnseqFiles().size());
+ for (TsFileResource selectedResource : (List<TsFileResource>) selected.get(0).getSeqFiles()) {
Assert.assertEquals(selectedResource, seqResources.get(1));
}
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
- Assert.assertEquals(selected.get(0).right.get(2), unseqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(2), unseqResources.get(2));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -383,25 +383,25 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(4, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(4, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
- Assert.assertEquals(selected.get(0).right.get(2), unseqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(3), unseqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(2), unseqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(3), unseqResources.get(3));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -433,25 +433,25 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(4, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(4, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
- Assert.assertEquals(selected.get(0).right.get(2), unseqResources.get(2));
- Assert.assertEquals(selected.get(0).right.get(3), unseqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(2), unseqResources.get(2));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(3), unseqResources.get(3));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -486,22 +486,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -537,22 +537,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -589,21 +589,21 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -639,22 +639,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -691,22 +691,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -744,22 +744,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -796,23 +796,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -850,23 +850,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -905,23 +905,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -959,24 +959,24 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1014,24 +1014,24 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1069,24 +1069,24 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(6, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).left.get(5), seqResources.get(7));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(6, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(5), seqResources.get(7));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1124,23 +1124,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(7));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(7));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1175,22 +1175,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1226,22 +1226,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1278,21 +1278,21 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1328,22 +1328,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1380,22 +1380,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1433,22 +1433,22 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1485,23 +1485,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1539,23 +1539,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1594,23 +1594,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(1));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(1));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1648,24 +1648,24 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1703,24 +1703,24 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1758,24 +1758,24 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(6, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(6));
- Assert.assertEquals(selected.get(0).left.get(5), seqResources.get(7));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(6, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(6));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(5), seqResources.get(7));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1813,23 +1813,23 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).left.get(2), seqResources.get(4));
- Assert.assertEquals(selected.get(0).left.get(3), seqResources.get(5));
- Assert.assertEquals(selected.get(0).left.get(4), seqResources.get(7));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(2), seqResources.get(4));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(3), seqResources.get(5));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(4), seqResources.get(7));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1868,20 +1868,20 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1922,14 +1922,14 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
// Assert.assertEquals(0, result.length);
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -1969,20 +1969,20 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -2022,21 +2022,21 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
- Assert.assertEquals(selected.get(0).right.get(1), unseqResources.get(1));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(1), unseqResources.get(1));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -2077,20 +2077,20 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
- Assert.assertEquals(selected.get(0).left.get(0), seqResources.get(2));
- Assert.assertEquals(selected.get(0).left.get(1), seqResources.get(3));
- Assert.assertEquals(selected.get(0).right.get(0), unseqResources.get(0));
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(0), seqResources.get(2));
+ Assert.assertEquals(selected.get(0).getSeqFiles().get(1), seqResources.get(3));
+ Assert.assertEquals(selected.get(0).getUnseqFiles().get(0), unseqResources.get(0));
new CrossSpaceCompactionTask(
0,
tsFileManager,
- selected.get(0).left,
- selected.get(0).right,
+ selected.get(0).getSeqFiles(),
+ selected.get(0).getUnseqFiles(),
performer,
new AtomicInteger(0),
0,
@@ -2139,7 +2139,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
.createInstance(COMPACTION_TEST_SG, "0", 0, tsFileManager);
// In the process of getting the file list and starting to select files, the file list is
// updated (the file is deleted or the status is updated)
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
Assert.assertEquals(0, selected.size());
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeUpgradeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeUpgradeTest.java
index 559abd7a12..8a4ea7bc48 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeUpgradeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeUpgradeTest.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.db.engine.compaction.cross;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.constant.TestConstant;
+import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossCompactionTaskResource;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.RewriteCrossSpaceCompactionSelector;
import org.apache.iotdb.db.engine.compaction.utils.CompactionConfigRestorer;
import org.apache.iotdb.db.engine.storagegroup.TsFileManager;
@@ -33,7 +34,6 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
import org.apache.iotdb.tsfile.read.common.Path;
-import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
@@ -85,7 +85,7 @@ public class MergeUpgradeTest {
tsFileManager.addAll(unseqResources, true);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, tsFileManager);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
assertEquals(0, selected.size());
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
index 3bed15c076..6d58b093a2 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.db.engine.compaction.cross;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.TestConstant;
+import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossCompactionTaskResource;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.CrossSpaceCompactionCandidate;
import org.apache.iotdb.db.engine.compaction.cross.rewrite.RewriteCrossSpaceCompactionSelector;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
@@ -31,7 +32,6 @@ import org.apache.iotdb.db.exception.MergeException;
import org.apache.iotdb.db.rescon.SystemInfo;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.read.common.Path;
-import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
@@ -61,24 +61,24 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
public void testFullSelection() throws MergeException, IOException {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- List<TsFileResource> seqSelected = selected.get(0).left;
- List<TsFileResource> unseqSelected = selected.get(0).right;
+ List<TsFileResource> seqSelected = selected.get(0).getSeqFiles();
+ List<TsFileResource> unseqSelected = selected.get(0).getUnseqFiles();
assertEquals(seqResources, seqSelected);
assertEquals(unseqResources, unseqSelected);
selector = new RewriteCrossSpaceCompactionSelector("", "", 0, null);
selected = selector.selectCrossSpaceTask(seqResources.subList(0, 1), unseqResources);
- seqSelected = selected.get(0).left;
- unseqSelected = selected.get(0).right;
+ seqSelected = selected.get(0).getSeqFiles();
+ unseqSelected = selected.get(0).getUnseqFiles();
assertEquals(seqResources.subList(0, 1), seqSelected);
assertEquals(unseqResources, unseqSelected);
selector = new RewriteCrossSpaceCompactionSelector("", "", 0, null);
selected = selector.selectCrossSpaceTask(seqResources, unseqResources.subList(0, 1));
- seqSelected = selected.get(0).left;
- unseqSelected = selected.get(0).right;
+ seqSelected = selected.get(0).getSeqFiles();
+ unseqSelected = selected.get(0).getUnseqFiles();
assertEquals(seqResources.subList(0, 1), seqSelected);
assertEquals(unseqResources.subList(0, 1), unseqSelected);
}
@@ -89,7 +89,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
assertEquals(1, selected.size());
}
@@ -100,10 +100,10 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- List<TsFileResource> seqSelected = selected.get(0).left;
- List<TsFileResource> unseqSelected = selected.get(0).right;
+ List<TsFileResource> seqSelected = selected.get(0).getSeqFiles();
+ List<TsFileResource> unseqSelected = selected.get(0).getUnseqFiles();
assertEquals(seqResources.subList(0, 5), seqSelected);
assertEquals(unseqResources.subList(0, 6), unseqSelected);
}
@@ -156,7 +156,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
newUnseqResources.add(largeUnseqTsFileResource);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, newUnseqResources);
assertEquals(0, selected.size());
}
@@ -247,9 +247,9 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
new CrossSpaceCompactionCandidate(seqResources, unseqResources);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
- assertEquals(2, selected.get(0).left.size());
+ assertEquals(2, selected.get(0).getSeqFiles().size());
}
@Test
@@ -310,12 +310,12 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqList, unseqList);
- assertEquals(1, selected.get(0).left.size());
- assertEquals(1, selected.get(0).right.size());
- assertEquals(seqList.get(0), selected.get(0).left.get(0));
- assertEquals(unseqList.get(0), selected.get(0).right.get(0));
+ assertEquals(1, selected.get(0).getSeqFiles().size());
+ assertEquals(1, selected.get(0).getUnseqFiles().size());
+ assertEquals(seqList.get(0), selected.get(0).getSeqFiles().get(0));
+ assertEquals(unseqList.get(0), selected.get(0).getUnseqFiles().get(0));
selected =
selector.selectCrossSpaceTask(
@@ -393,11 +393,11 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqList, unseqList);
Assert.assertEquals(1, selected.size());
- Assert.assertEquals(1, selected.get(0).left.size());
- Assert.assertEquals(10, selected.get(0).right.size());
+ Assert.assertEquals(1, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(10, selected.get(0).getUnseqFiles().size());
} finally {
SystemInfo.getInstance().setMemorySizeForCompaction(origin);
}
@@ -466,11 +466,11 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqList, unseqList);
Assert.assertEquals(1, selected.size());
- Assert.assertEquals(1, selected.get(0).left.size());
- Assert.assertEquals(1, selected.get(0).right.size());
+ Assert.assertEquals(1, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(1, selected.get(0).getUnseqFiles().size());
} finally {
SystemInfo.getInstance().setMemorySizeForCompaction(origin);
}
@@ -541,11 +541,11 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqList, unseqList);
Assert.assertEquals(1, selected.size());
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
} finally {
SystemInfo.getInstance().setMemorySizeForCompaction(origin);
}
@@ -617,11 +617,11 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqList, unseqList);
Assert.assertEquals(1, selected.size());
- Assert.assertEquals(5, selected.get(0).left.size());
- Assert.assertEquals(4, selected.get(0).right.size());
+ Assert.assertEquals(5, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(4, selected.get(0).getUnseqFiles().size());
} finally {
SystemInfo.getInstance().setMemorySizeForCompaction(origin);
}
@@ -696,11 +696,11 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqList, unseqList);
Assert.assertEquals(1, selected.size());
- Assert.assertEquals(3, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(3, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
} finally {
SystemInfo.getInstance().setMemorySizeForCompaction(origin);
}
@@ -928,11 +928,11 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqList, unseqList);
Assert.assertEquals(1, selected.size());
- Assert.assertEquals(2, selected.get(0).left.size());
- Assert.assertEquals(2, selected.get(0).right.size());
+ Assert.assertEquals(2, selected.get(0).getSeqFiles().size());
+ Assert.assertEquals(2, selected.get(0).getUnseqFiles().size());
} finally {
SystemInfo.getInstance().setMemorySizeForCompaction(origin);
}
@@ -945,11 +945,11 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
IoTDBDescriptor.getInstance().getConfig().setMaxCrossCompactionCandidateFileNum(5);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
assertEquals(1, selected.size());
- List<TsFileResource> seqSelected = selected.get(0).left;
- List<TsFileResource> unseqSelected = selected.get(0).right;
+ List<TsFileResource> seqSelected = selected.get(0).getSeqFiles();
+ List<TsFileResource> unseqSelected = selected.get(0).getUnseqFiles();
assertEquals(2, seqSelected.size());
assertEquals(2, unseqSelected.size());
@@ -966,11 +966,11 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
assertEquals(1, selected.size());
- List<TsFileResource> seqSelected = selected.get(0).left;
- List<TsFileResource> unseqSelected = selected.get(0).right;
+ List<TsFileResource> seqSelected = selected.get(0).getSeqFiles();
+ List<TsFileResource> unseqSelected = selected.get(0).getUnseqFiles();
assertEquals(1, seqSelected.size());
assertEquals(1, unseqSelected.size());
@@ -988,7 +988,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
new Thread(
() -> {
try {
- List<Pair<List<TsFileResource>, List<TsFileResource>>> selected =
+ List<CrossCompactionTaskResource> selected =
selector.selectCrossSpaceTask(seqResources, unseqResources);
} catch (Exception e) {
logger.error("Exception occurs", e);