You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2021/12/03 10:52:34 UTC
[iotdb] branch master updated: fix priority of cross space task (#4524)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new d514e00 fix priority of cross space task (#4524)
d514e00 is described below
commit d514e00e96da8d3d8c666ddef1e3b8c71a13ccee
Author: 周沛辰 <45...@users.noreply.github.com>
AuthorDate: Fri Dec 3 18:52:07 2021 +0800
fix priority of cross space task (#4524)
---
.../apache/iotdb/db/engine/compaction/CompactionTaskComparator.java | 2 +-
.../iotdb/db/engine/compaction/CompactionTaskComparatorTest.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparator.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparator.java
index 404d9e7..4ad59a4 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparator.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparator.java
@@ -104,6 +104,6 @@ public class CompactionTaskComparator implements Comparator<AbstractCompactionTa
}
// we prefer the task with more unsequence files
// because this type of tasks reduce more unsequence files
- return o1.getSelectedUnsequenceFiles().size() - o2.getSelectedUnsequenceFiles().size();
+ return o2.getSelectedUnsequenceFiles().size() - o1.getSelectedUnsequenceFiles().size();
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparatorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparatorTest.java
index bec59c9..fc06ca1 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparatorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparatorTest.java
@@ -202,6 +202,7 @@ public class CompactionTaskComparatorTest {
/** Test the comparation of cross space compaction task */
@Test
public void testComparationOfCrossSpaceTask() {
+ // the priority of the tasks in this array are created from highest to lowest
AbstractCompactionTask[] crossCompactionTasks = new AbstractCompactionTask[200];
for (int i = 0; i < 100; ++i) {
List<TsFileResource> sequenceResources = new ArrayList<>();
@@ -226,7 +227,7 @@ public class CompactionTaskComparatorTest {
new FakedTsFileResource(new File(String.format("%d-%d-0-0.tsfile", i + j, i + j)), j));
}
List<TsFileResource> unsequenceResources = new ArrayList<>();
- for (int j = 100; j < i + 1; ++j) {
+ for (int j = 199; j >= i; --j) {
unsequenceResources.add(
new FakedTsFileResource(new File(String.format("%d-%d-0-0.tsfile", i + j, i + j)), j));
}