Start Presto on 8080 in SqlServerQueryRunner.main

This makes it easier to connect to Presto thus started and makes the runner's main consistent with other runners.
trinodb · Sep 30, 2020 · 93e2ed1 · 93e2ed1
1 parent 98264f8
commit 93e2ed1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/presto-sqlserver/src/test/java/io/prestosql/plugin/sqlserver/SqlServerQueryRunner.java b/presto-sqlserver/src/test/java/io/prestosql/plugin/sqlserver/SqlServerQueryRunner.java
@@ -45,10 +45,16 @@ private SqlServerQueryRunner() {}
 
     private static final String TEST_SCHEMA = "dbo";
 
-    public static QueryRunner createSqlServerQueryRunner(TestingSqlServer testingSqlServer, Map<String, String> connectorProperties, Iterable<TpchTable<?>> tables)
+    public static QueryRunner createSqlServerQueryRunner(
+            TestingSqlServer testingSqlServer,
+            Map<String, String> extraProperties,
+            Map<String, String> connectorProperties,
+            Iterable<TpchTable<?>> tables)
             throws Exception
     {
-        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(createSession(testingSqlServer.getUsername()))
+        DistributedQueryRunner queryRunner = DistributedQueryRunner
+                .builder(createSession(testingSqlServer.getUsername()))
+                .setExtraProperties(extraProperties)
                 .build();
         try {
             queryRunner.installPlugin(new TpchPlugin());
@@ -106,6 +112,7 @@ public static void main(String[] args)
 
         DistributedQueryRunner queryRunner = (DistributedQueryRunner) createSqlServerQueryRunner(
                 testingSqlServer,
+                ImmutableMap.of("http-server.http.port", "8080"),
                 ImmutableMap.of(),
                 ImmutableList.of());
 

diff --git a/...qlserver/src/test/java/io/prestosql/plugin/sqlserver/TestSqlServerDistributedQueries.java b/...qlserver/src/test/java/io/prestosql/plugin/sqlserver/TestSqlServerDistributedQueries.java
@@ -39,6 +39,7 @@ protected QueryRunner createQueryRunner()
         sqlServer.start();
         return createSqlServerQueryRunner(
                 sqlServer,
+                ImmutableMap.of(),
                 ImmutableMap.<String, String>builder()
                         // caching here speeds up tests highly, caching is not used in smoke tests
                         .put("metadata.cache-ttl", "10m")

diff --git a/...server/src/test/java/io/prestosql/plugin/sqlserver/TestSqlServerIntegrationSmokeTest.java b/...server/src/test/java/io/prestosql/plugin/sqlserver/TestSqlServerIntegrationSmokeTest.java
@@ -46,7 +46,7 @@ protected QueryRunner createQueryRunner()
     {
         sqlServer = new TestingSqlServer();
         sqlServer.start();
-        return createSqlServerQueryRunner(sqlServer, ImmutableMap.of(), ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION));
+        return createSqlServerQueryRunner(sqlServer, ImmutableMap.of(), ImmutableMap.of(), ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION));
     }
 
     @AfterClass(alwaysRun = true)

diff --git a/presto-sqlserver/src/test/java/io/prestosql/plugin/sqlserver/TestSqlServerTypeMapping.java b/presto-sqlserver/src/test/java/io/prestosql/plugin/sqlserver/TestSqlServerTypeMapping.java
@@ -44,6 +44,7 @@ protected QueryRunner createQueryRunner()
         return createSqlServerQueryRunner(
                 sqlServer,
                 ImmutableMap.of(),
+                ImmutableMap.of(),
                 ImmutableList.of());
     }