Skip to content

Commit d342a10

Browse files
authored
Fix CompactionRunSimulatorTest after conflicting merged patches (#18814)
1 parent 2534e62 commit d342a10

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

server/src/test/java/org/apache/druid/server/compaction/CompactionRunSimulatorTest.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,17 @@ public void testSimulate_withFixedIntervalOrderPolicy()
177177
List.of("dataSource", "interval", "numSegments", "bytes", "reasonToSkip"),
178178
skippedTable.getColumnNames()
179179
);
180+
final String rejectedMessage
181+
= "Rejected by search policy: Datasource/Interval is not in the list of 'eligibleCandidates'";
180182
Assert.assertEquals(
181183
List.of(
182-
List.of("wiki", Intervals.of("2013-01-02/P1D"), 10, 1_000_000_000L, 1, "Rejected by search policy"),
183-
List.of("wiki", Intervals.of("2013-01-03/P1D"), 10, 1_000_000_000L, 1, "Rejected by search policy"),
184-
List.of("wiki", Intervals.of("2013-01-07/P1D"), 10, 1_000_000_000L, 1, "Rejected by search policy"),
185-
List.of("wiki", Intervals.of("2013-01-05/P1D"), 10, 1_000_000_000L, 1, "Rejected by search policy"),
186-
List.of("wiki", Intervals.of("2013-01-06/P1D"), 10, 1_000_000_000L, 1, "Rejected by search policy"),
187-
List.of("wiki", Intervals.of("2013-01-01/P1D"), 10, 1_000_000_000L, 1, "Rejected by search policy"),
188-
List.of("wiki", Intervals.of("2013-01-09/P1D"), 10, 1_000_000_000L, 1, "Rejected by search policy"),
184+
List.of("wiki", Intervals.of("2013-01-02/P1D"), 10, 1_000_000_000L, 1, rejectedMessage),
185+
List.of("wiki", Intervals.of("2013-01-03/P1D"), 10, 1_000_000_000L, 1, rejectedMessage),
186+
List.of("wiki", Intervals.of("2013-01-07/P1D"), 10, 1_000_000_000L, 1, rejectedMessage),
187+
List.of("wiki", Intervals.of("2013-01-05/P1D"), 10, 1_000_000_000L, 1, rejectedMessage),
188+
List.of("wiki", Intervals.of("2013-01-06/P1D"), 10, 1_000_000_000L, 1, rejectedMessage),
189+
List.of("wiki", Intervals.of("2013-01-01/P1D"), 10, 1_000_000_000L, 1, rejectedMessage),
190+
List.of("wiki", Intervals.of("2013-01-09/P1D"), 10, 1_000_000_000L, 1, rejectedMessage),
189191
List.of("wiki", Intervals.of("2013-01-10/P1D"), 10, 1_000_000_000L, 1, "skip offset from latest[P1D]")
190192
),
191193
skippedTable.getRows()

0 commit comments

Comments
 (0)