Skip to content

Commit 1fe82d9

Browse files
committed
fix build and test
1 parent 358c75f commit 1fe82d9

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,12 @@ public void testIncrementalCompaction() throws Exception
556556
Assume.assumeTrue("Incremental compaction depends on concurrent lock", useConcurrentLocks);
557557
verifyTaskSuccessRowsAndSchemaMatch(runIndexTask(), TOTAL_TEST_ROWS);
558558

559-
final CompactionTask compactionTask1 = compactionTaskBuilder(segmentGranularity).interval(inputInterval).build();
559+
final CompactionTask compactionTask1 =
560+
compactionTaskBuilder(segmentGranularity).interval(inputInterval, true).build();
560561

561562
final Pair<TaskStatus, DataSegmentsWithSchemas> resultPair1 = runTask(compactionTask1);
562563
verifyTaskSuccessRowsAndSchemaMatch(resultPair1, TOTAL_TEST_ROWS);
563-
verifyCompactedSegment(List.copyOf(resultPair1.rhs.getSegments()), segmentGranularity, DEFAULT_QUERY_GRAN);
564+
verifyCompactedSegment(List.copyOf(resultPair1.rhs.getSegments()), segmentGranularity, DEFAULT_QUERY_GRAN, false);
564565
Assert.assertEquals(1, resultPair1.rhs.getSegments().size());
565566
final DataSegment compactedSegment1 = Iterables.getOnlyElement(resultPair1.rhs.getSegments());
566567

@@ -573,7 +574,7 @@ public void testIncrementalCompaction() throws Exception
573574
.collect(Collectors.toList());
574575
final CompactionTask compactionTask2 =
575576
compactionTaskBuilder(segmentGranularity)
576-
.inputSpec(new CompactionIntervalSpec(inputInterval, uncompacted, null))
577+
.inputSpec(new CompactionIntervalSpec(inputInterval, uncompacted, null), true)
577578
.build();
578579
final Pair<TaskStatus, DataSegmentsWithSchemas> resultPair2 = runTask(compactionTask2);
579580
verifyTaskSuccessRowsAndSchemaMatch(resultPair2, TOTAL_TEST_ROWS);
@@ -618,12 +619,17 @@ public void testIncrementalCompactionOverlappingInterval() throws Exception
618619
indexTaskResult.rhs.getSegments().stream().map(DataSegment::toDescriptor).collect(Collectors.toList());
619620
final CompactionTask compactionTask1 =
620621
compactionTaskBuilder(segmentGranularity)
621-
.inputSpec(new CompactionIntervalSpec(inputInterval, uncompactedFromIndexTask, null))
622+
.inputSpec(new CompactionIntervalSpec(inputInterval, uncompactedFromIndexTask, null), true)
622623
.build();
623624
final Pair<TaskStatus, DataSegmentsWithSchemas> compactionResult1 = runTask(compactionTask1);
624625
Assert.assertEquals(1, compactionResult1.rhs.getSegments().size());
625626
verifyTaskSuccessRowsAndSchemaMatch(compactionResult1, TOTAL_TEST_ROWS);
626-
verifyCompactedSegment(List.copyOf(compactionResult1.rhs.getSegments()), segmentGranularity, DEFAULT_QUERY_GRAN);
627+
verifyCompactedSegment(
628+
List.copyOf(compactionResult1.rhs.getSegments()),
629+
segmentGranularity,
630+
DEFAULT_QUERY_GRAN,
631+
false
632+
);
627633
// Now we have 4 segments from the appendTask, and 1 segment from compactionTask.
628634
Assert.assertEquals(
629635
5,
@@ -641,7 +647,7 @@ public void testIncrementalCompactionOverlappingInterval() throws Exception
641647
Interval compactionInterval = Intervals.of("2014-01-01T00:00:00Z/2014-01-01T06:00:00Z");
642648
final CompactionTask compactionTask2 =
643649
compactionTaskBuilder(segmentGranularity)
644-
.inputSpec(new CompactionIntervalSpec(compactionInterval, uncompactedSegmentsInHour3, null))
650+
.inputSpec(new CompactionIntervalSpec(compactionInterval, uncompactedSegmentsInHour3, null), true)
645651
.build();
646652
final Pair<TaskStatus, DataSegmentsWithSchemas> resultPair2 = runTask(compactionTask2);
647653
verifyTaskSuccessRowsAndSchemaMatch(resultPair2, 3);
@@ -683,7 +689,8 @@ public void testIncrementalCompactionOverlappingInterval() throws Exception
683689
Assert.assertTrue(usedLoadPath.contains(compactedSegment2Path));
684690

685691
// Final compaction task, we should get 10 (from index task) + 6 (from append task) total rows.
686-
CompactionTask finalTask = compactionTaskBuilder(segmentGranularity).interval(Intervals.of("2014-01-01/2014-01-02")).build();
692+
CompactionTask finalTask =
693+
compactionTaskBuilder(segmentGranularity).interval(Intervals.of("2014-01-01/2014-01-02"), true).build();
687694
Pair<TaskStatus, DataSegmentsWithSchemas> finalResult = runTask(finalTask);
688695
verifyTaskSuccessRowsAndSchemaMatch(finalResult, 16);
689696
}

0 commit comments

Comments
 (0)