Address review comments - 2

Author: Fly-Style

embedded-tests/src/test/java/org/apache/druid/testing/embedded/query/JdbcQueryTest.java

@@ -60,7 +60,7 @@ public class JdbcQueryTest extends QueryTestBase
   private String[] connections;
   private Properties connectionProperties;
 
-  private String tableName;
+  private String dataSourceName;
 
   @Override
   protected void beforeAll()
@@ -73,7 +73,7 @@ protected void beforeAll()
         StringUtils.format(CONNECTION_TEMPLATE, getServerUrl(broker)),
         };
 
-    tableName = ingestBasicData();
+    dataSourceName = ingestBasicData();
   }
 
   @Test
@@ -111,16 +111,16 @@ public void testJdbcMetadata()
         LOG.info("'druid' schema tables %s", druidTables);
         // There may be more tables than this, but at least should have @tableName
         Assertions.assertTrue(
-            druidTables.containsAll(ImmutableList.of(tableName))
+            druidTables.containsAll(ImmutableList.of(dataSourceName))
         );
 
         Set<String> wikiColumns = new HashSet<>();
-        ResultSet columnsMetadata = metadata.getColumns("druid", "druid", tableName, null);
+        ResultSet columnsMetadata = metadata.getColumns("druid", "druid", dataSourceName, null);
         while (columnsMetadata.next()) {
           final String column = columnsMetadata.getString(4);
           wikiColumns.add(column);
         }
-        LOG.info("'%s' columns %s", tableName, wikiColumns);
+        LOG.info("'%s' columns %s", dataSourceName, wikiColumns);
         // a lot more columns than this, but at least should have these
         Assertions.assertTrue(
             wikiColumns.containsAll(ImmutableList.of("__time", "item", "value"))
@@ -135,7 +135,7 @@ public void testJdbcMetadata()
   @Test
   public void testJdbcStatementQuery()
   {
-    String query = StringUtils.format(QUERY_TEMPLATE, tableName, "1000");
+    String query = StringUtils.format(QUERY_TEMPLATE, dataSourceName, "1000");
     for (String url : connections) {
       try (Connection connection = DriverManager.getConnection(url, connectionProperties)) {
         try (Statement statement = connection.createStatement()) {
@@ -158,7 +158,7 @@ public void testJdbcStatementQuery()
   @Test
   public void testJdbcPrepareStatementQuery()
   {
-    String query = StringUtils.format(QUERY_TEMPLATE, tableName, "?");
+    String query = StringUtils.format(QUERY_TEMPLATE, dataSourceName, "?");
     for (String url : connections) {
       try (Connection connection = DriverManager.getConnection(url, connectionProperties)) {
         try (PreparedStatement statement = connection.prepareStatement(query)) {
@@ -182,7 +182,7 @@ public void testJdbcPrepareStatementQuery()
   @Test
   public void testJdbcPrepareStatementQueryMissingParameters()
   {
-    String query = StringUtils.format(QUERY_TEMPLATE, tableName, "?");
+    String query = StringUtils.format(QUERY_TEMPLATE, dataSourceName, "?");
     for (String url : connections) {
       try (Connection connection = DriverManager.getConnection(url, connectionProperties);
            PreparedStatement statement = connection.prepareStatement(query);

embedded-tests/src/test/java/org/apache/druid/testing/embedded/query/SqlQueryCancelTest.java

@@ -33,7 +33,7 @@
 
 public class SqlQueryCancelTest extends QueryTestBase
 {
-  private static final String QUERY = " SELECT sleep(4) FROM %s LIMIT 4";
+  private static final String QUERY = " SELECT sleep(2) FROM %s LIMIT 2";
   private String dataSourceName;
 
   @Override
@@ -61,7 +61,7 @@ public void testCancelValidQuery() throws Exception
     ListenableFuture<StatusResponseHolder> f = executeQueryAsync(routerEndpoint, query);
 
     // Wait until the sqlLifecycle is authorized and registered
-    Thread.sleep(500L);
+    Thread.sleep(300L);
     StatusResponseHolder queryCancellationResponse = cancelQuery(routerEndpoint, queryId);
 
     StatusResponseHolder queryResponce = f.get();
@@ -74,7 +74,7 @@ public void testCancelValidQuery() throws Exception
   public void test_cancelInvalidQuery_returnsNotFound() throws Exception
   {
     final String sqlQuery = StringUtils.format(QUERY, dataSourceName);
-    final String validQueryId = "sql-cancel-test";
+    final String validQueryId = "sql-cancel-test-";
     final String invalidQueryId = "sql-continue-test";
     final ClientSqlQuery query = new ClientSqlQuery(
         sqlQuery,
@@ -87,9 +87,6 @@ public void test_cancelInvalidQuery_returnsNotFound() throws Exception
     );
 
     ListenableFuture<StatusResponseHolder> f = executeQueryAsync(routerEndpoint, query);
-
-    // Wait until the sqlLifecycle is authorized and registered
-    Thread.sleep(500L);
     StatusResponseHolder queryCancellationResponse = cancelQuery(routerEndpoint, invalidQueryId);
 
     StatusResponseHolder queryResponse = f.get();