Use delayed blackhole table instead of cross join

trinodb · Oct 3, 2019 · 261cea1 · 261cea1
1 parent cfba397
commit 261cea1
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/presto-jdbc/src/test/java/io/prestosql/jdbc/TestJdbcWarnings.java b/presto-jdbc/src/test/java/io/prestosql/jdbc/TestJdbcWarnings.java
@@ -21,7 +21,6 @@
 import io.prestosql.execution.QueryInfo;
 import io.prestosql.execution.warnings.WarningCollectorConfig;
 import io.prestosql.plugin.blackhole.BlackHolePlugin;
-import io.prestosql.plugin.tpch.TpchPlugin;
 import io.prestosql.server.testing.TestingPrestoServer;
 import io.prestosql.spi.PrestoWarning;
 import io.prestosql.spi.WarningCode;
@@ -52,6 +51,7 @@
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
@@ -77,11 +77,22 @@ public void setupServer()
                 .put("testing-warning-collector.add-warnings", "true")
                 .put("testing-warning-collector.preloaded-warnings", String.valueOf(PRELOADED_WARNINGS))
                 .build());
-        server.installPlugin(new TpchPlugin());
-        server.createCatalog("tpch", "tpch");
         server.installPlugin(new BlackHolePlugin());
         server.createCatalog("blackhole", "blackhole");
         waitForNodeRefresh(server);
+
+        try (Connection connection = createConnection();
+                Statement statement = connection.createStatement()) {
+            statement.execute("CREATE SCHEMA blackhole.blackhole");
+            statement.executeUpdate("" +
+                    "CREATE TABLE slow_table (x int) " +
+                    "WITH (" +
+                    "   split_count = 1, " +
+                    "   pages_per_split = 5, " +
+                    "   rows_per_page = 3, " +
+                    "   page_processing_delay = '1s'" +
+                    ")");
+        }
     }
 
     @AfterClass(alwaysRun = true)
@@ -130,8 +141,7 @@ public void testLongRunningStatement()
         QueryCreationFuture queryCreationFuture = new QueryCreationFuture();
         executor.submit(() -> {
             try {
-                statement.execute("CREATE SCHEMA blackhole.blackhole");
-                statement.execute("CREATE TABLE blackhole.blackhole.test_table AS SELECT 1 AS col1 FROM tpch.sf1.lineitem CROSS JOIN tpch.sf1.lineitem");
+                statement.execute("CREATE TABLE test_long_running AS SELECT * FROM slow_table");
                 queryCreationFuture.set(null);
             }
             catch (Throwable e) {
@@ -141,18 +151,19 @@ public void testLongRunningStatement()
         while (statement.getWarnings() == null) {
             Thread.sleep(100);
         }
+        int expectedWarnings = 10;
         SQLWarning warning = statement.getWarnings();
         Set<WarningEntry> currentWarnings = new HashSet<>();
         assertTrue(currentWarnings.add(new WarningEntry(warning)));
-        for (int warnings = 1; !queryCreationFuture.isDone() && warnings < 100; warnings++) {
+        for (int warnings = 1; !queryCreationFuture.isDone() && warnings < expectedWarnings; warnings++) {
             for (SQLWarning nextWarning = warning.getNextWarning(); nextWarning == null; nextWarning = warning.getNextWarning()) {
                 // Wait for new warnings
             }
             warning = warning.getNextWarning();
             assertTrue(currentWarnings.add(new WarningEntry(warning)));
             Thread.sleep(100);
         }
-        assertEquals(currentWarnings.size(), 100);
+        assertThat(currentWarnings).size().isGreaterThanOrEqualTo(expectedWarnings);
     }
 
     @Test
@@ -162,7 +173,7 @@ public void testLongRunningQuery()
         QueryCreationFuture queryCreationFuture = new QueryCreationFuture();
         executor.submit(() -> {
             try {
-                statement.execute("SELECT 1 AS col1 FROM tpch.sf1.lineitem CROSS JOIN tpch.sf1.lineitem");
+                statement.execute("SELECT * FROM slow_table");
                 queryCreationFuture.set(null);
             }
             catch (Throwable e) {
@@ -267,11 +278,10 @@ private static void addWarnings(Set<WarningEntry> currentWarnings, SQLWarning ne
         }
     }
 
-    //TODO: this method seems to be copied in multiple test classes in this package, should it be moved to a utility?
     private Connection createConnection()
             throws SQLException
     {
-        String url = format("jdbc:presto://%s", server.getAddress());
+        String url = format("jdbc:presto://%s/blackhole/blackhole", server.getAddress());
         return DriverManager.getConnection(url, "test", null);
     }