This is an automated email from the ASF dual-hosted git repository. FrankChen021 pushed a commit to branch codex/native-compaction-test-matrix in repository https://gitbox.apache.org/repos/asf/druid.git
commit fd71cf5f81543906be9d948eeee2856cd584c114 Author: Frank Chen <[email protected]> AuthorDate: Wed Sep 9 18:18:19 2026 +0800 test: use compaction selections for MSQ cases --- .../common/task/CompactionTaskRunTestCases.java | 15 +++++++++++ .../druid/msq/exec/MSQCompactionTaskRunTest.java | 29 ++++------------------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTestCases.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTestCases.java index ab04520764b..6a4360b65ef 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTestCases.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTestCases.java @@ -63,6 +63,21 @@ public final class CompactionTaskRunTestCases return configuration.lockGranularity() == LockGranularity.SEGMENT; } }, + CONCURRENT_LOCK { + @Override + boolean isApplicable(Configuration configuration) + { + return configuration.useConcurrentLocks(); + } + }, + CONCURRENT_TIME_CHUNK_LOCK { + @Override + boolean isApplicable(Configuration configuration) + { + return configuration.useConcurrentLocks() + && configuration.lockGranularity() == LockGranularity.TIME_CHUNK; + } + }, NON_SEGMENT_LOCK_WITH_NULL_GRANULARITY { @Override boolean isApplicable(Configuration configuration) diff --git a/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java index 86a316c8836..913bb35d072 100644 --- a/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java +++ b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQCompactionTaskRunTest.java @@ -110,8 +110,6 @@ import org.apache.druid.timeline.partition.ShardSpec; import org.joda.time.Interval; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; import java.io.File; import java.util.ArrayList; @@ -176,17 +174,6 @@ public class MSQCompactionTaskRunTest extends CompactionTaskRunBase } } - public static Stream<Configuration> concurrentLockConfigurations() - { - return new MsqConfigurations().configurations().filter(Configuration::useConcurrentLocks); - } - - public static Stream<Configuration> timeChunkConcurrentLockConfigurations() - { - return concurrentLockConfigurations() - .filter(configuration -> configuration.lockGranularity() == LockGranularity.TIME_CHUNK); - } - @Override public void registerTaskActionClient(String taskId, TaskActionClient taskActionClient) { @@ -467,8 +454,7 @@ public class MSQCompactionTaskRunTest extends CompactionTaskRunBase ); } - @ParameterizedTest(name = "{0}") - @MethodSource("concurrentLockConfigurations") + @CompactionTest(Selection.CONCURRENT_LOCK) public void testMSQCompactionWithConcurrentAppendCompactionLocksFirst(Configuration configuration) throws Exception { startCase(configuration); @@ -528,9 +514,7 @@ public class MSQCompactionTaskRunTest extends CompactionTaskRunBase verifyTaskSuccessRowsAndSchemaMatch(finalResult, 19); } - - @ParameterizedTest(name = "{0}") - @MethodSource("concurrentLockConfigurations") + @CompactionTest(Selection.CONCURRENT_LOCK) public void testMSQCompactionWithConcurrentAppendAppendLocksFirst(Configuration configuration) throws Exception { startCase(configuration); @@ -590,8 +574,7 @@ public class MSQCompactionTaskRunTest extends CompactionTaskRunBase verifyTaskSuccessRowsAndSchemaMatch(finalResult, 19); } - @ParameterizedTest(name = "{0}") - @MethodSource("timeChunkConcurrentLockConfigurations") + @CompactionTest(Selection.CONCURRENT_TIME_CHUNK_LOCK) public void testMinorCompaction(Configuration configuration) throws Exception { startCase(configuration); @@ -646,8 +629,7 @@ public class MSQCompactionTaskRunTest extends CompactionTaskRunBase ), usedSegments); } - @ParameterizedTest(name = "{0}") - @MethodSource("timeChunkConcurrentLockConfigurations") + @CompactionTest(Selection.CONCURRENT_TIME_CHUNK_LOCK) public void testMinorCompactionRangePartition(Configuration configuration) throws Exception { startCase(configuration); @@ -704,8 +686,7 @@ public class MSQCompactionTaskRunTest extends CompactionTaskRunBase Assertions.assertEquals(Set.of("range"), shards.stream().map(ShardSpec::getType).collect(Collectors.toSet())); } - @ParameterizedTest(name = "{0}") - @MethodSource("timeChunkConcurrentLockConfigurations") + @CompactionTest(Selection.CONCURRENT_TIME_CHUNK_LOCK) public void testMinorCompactionOverlappingInterval(Configuration configuration) throws Exception { startCase(configuration); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
