Skip to content

Migrate query JDBC, cancel and system tables tests, cleanup and refactor helper classes #18805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kfaraz merged 22 commits into from
Dec 5, 2025
Merged

Migrate query JDBC, cancel and system tables tests, cleanup and refactor helper classes #18805

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1ffeec3
Stage 1: move QueryErrorTest, create a base class for the convenience
Fly-Style Nov 25, 2025
36e1d90
Move sleep to 'fake' happens-before relationship of beforeAll and oth…
Fly-Style Nov 28, 2025
2e4bec3
Return back broadcast test
Fly-Style Nov 28, 2025
0d5cde4
Migrate query retry on missing segments test
Fly-Style Nov 30, 2025
c6612ce
Don't use parametrize test, duplicate usage instead
Fly-Style Dec 2, 2025
ed2c0a3
Small cleanup
Fly-Style Dec 2, 2025
52bcbcd
Merge branch 'master' into it-to-embed-query
Fly-Style Dec 2, 2025
2db93a8
WIP
Fly-Style Dec 2, 2025
9b43e1c
Fix checkstyle issue
Fly-Style Dec 2, 2025
9769ebc
Merge branch 'it-to-embed-query' into it-to-embed-query-full
Fly-Style Dec 2, 2025
d2a26a0
WIP-2
Fly-Style Dec 2, 2025
8e09e26
Successfully migrated query cancellation test to embedded suite
Fly-Style Dec 2, 2025
bf91e0f
Migreate system table query test
Fly-Style Dec 2, 2025
144cdb6
Migrate JDBC test too
Fly-Style Dec 3, 2025
c6be7ac
Merge branch 'master' into it-to-embed-query-full
Fly-Style Dec 3, 2025
d514715
Post-merge merge
Fly-Style Dec 3, 2025
072b7a2
Eliminate test flakiness
Fly-Style Dec 3, 2025
0a64c9b
Address review comments
Fly-Style Dec 3, 2025
9c8baa5
Enhance the test
Fly-Style Dec 4, 2025
03e22ae
Address review comments - 2
Fly-Style Dec 4, 2025
df9672b
Last comment addressed
Fly-Style Dec 4, 2025
381f9f6
Merge branch 'master' into it-to-embed-query-full
Fly-Style Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 7 additions & 21 deletions ...ded-tests/src/test/java/org/apache/druid/testing/embedded/query/SystemTableQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
package org.apache.druid.testing.embedded.query;


import org.apache.druid.common.utils.IdUtils;
import org.apache.druid.indexing.common.task.IndexTask;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.testing.embedded.indexing.MoreResources;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand All @@ -33,24 +30,14 @@
*/
public class SystemTableQueryTest extends QueryTestBase
{
private final String dataSourceName1 = "table_a";
private final String dataSourceName2 = "table_b";
private String dataSourceName1;
private String dataSourceName2;

@Override
public void beforeAll()
{
final String taskId1 = IdUtils.getRandomId();
final String taskId2 = IdUtils.getRandomId();
final IndexTask task1 = MoreResources.Task.BASIC_INDEX.get().dataSource(dataSourceName1).withId(taskId1);
final IndexTask task2 = MoreResources.Task.BASIC_INDEX.get().dataSource(dataSourceName2).withId(taskId2);
cluster.callApi().onLeaderOverlord(o -> o.runTask(taskId1, task1));
cluster.callApi().onLeaderOverlord(o -> o.runTask(taskId2, task2));

cluster.callApi().waitForTaskToSucceed(taskId1, overlord);
cluster.callApi().waitForTaskToSucceed(taskId2, overlord);

cluster.callApi().waitForAllSegmentsToBeAvailable(dataSourceName1, coordinator, broker);
cluster.callApi().waitForAllSegmentsToBeAvailable(dataSourceName2, coordinator, broker);
dataSourceName1 = ingestBasicData();
dataSourceName2 = ingestBasicData();
}

@Test
Expand All @@ -66,10 +53,9 @@ public void testSystemTableQueries_segmentsCount()
dataSourceName1, dataSourceName2
);

String[] result = cluster.callApi().runSql(query).split("\n");
Assertions.assertEquals(2, result.length);
Assertions.assertEquals(StringUtils.format("%s,10", dataSourceName1), result[0]);
Assertions.assertEquals(StringUtils.format("%s,10", dataSourceName2), result[1]);
String result = cluster.callApi().runSql(query);
Assertions.assertTrue(result.contains(dataSourceName1));
Assertions.assertTrue(result.contains(dataSourceName2));
}

@Test
Expand Down
Loading