Merge pull request trinodb#6 from academy-codex/mr_trino_sybase_conne…

…ctor_fixes Mr trino sybase connector fixes
dbit-xia · Jul 17, 2021 · 3170f9a · 3170f9a
2 parents 55ff4de + 618cce6
commit 3170f9a
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/plugin/trino-sybase/src/main/java/io/trino/plugin/sybase/SybaseClient.java b/plugin/trino-sybase/src/main/java/io/trino/plugin/sybase/SybaseClient.java
@@ -61,13 +61,6 @@ public class SybaseClient
 
     private static final Joiner DOT_JOINER = Joiner.on(".");
 
-    @Override
-    public void createSchema(ConnectorSession session, String schemaName)
-    {
-        // TODO: Add try-catch for error message parsing (test cases patch)
-        super.createSchema(session, schemaName);
-    }
-
     @Inject
     public SybaseClient(BaseJdbcConfig config, ConnectionFactory connectionFactory, IdentifierMapping identifierMapping)
     {

diff --git a/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/SybaseQueryRunner.java b/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/SybaseQueryRunner.java
@@ -13,12 +13,12 @@
  */
 package io.trino.plugin.sybase;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import io.airlift.log.Logger;
+import io.airlift.log.Logging;
 import io.trino.Session;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.DistributedQueryRunner;
-import io.trino.testing.QueryRunner;
 import io.trino.tpch.TpchTable;
 
 import java.util.HashMap;
@@ -35,16 +35,15 @@ private SybaseQueryRunner() {}
 
     private static final String TPCH_SCHEMA = "tpch";
 
-    public static QueryRunner createSybaseQueryRunner(TestingSybaseServer server, TpchTable<?>... tables)
+    public static DistributedQueryRunner createSybaseQueryRunner(TestingSybaseServer server,
+            Map<String, String> extraProperties,
+            Map<String, String> connectorProperties,
+            Iterable<TpchTable<?>> tables)
             throws Exception
     {
-        return createSybaseQueryRunner(server, ImmutableMap.of(), ImmutableList.copyOf(tables));
-    }
-
-    public static QueryRunner createSybaseQueryRunner(TestingSybaseServer server, Map<String, String> connectorProperties, Iterable<TpchTable<?>> tables)
-            throws Exception
-    {
-        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(createSession()).build();
+        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(createSession())
+                .setExtraProperties(extraProperties)
+                .build();
         try {
             queryRunner.installPlugin(new TpchPlugin());
             queryRunner.createCatalog("tpch", "tpch");
@@ -75,4 +74,20 @@ private static Session createSession()
                 .setSchema("dbo")
                 .build();
     }
+
+    public static void main(String[] args)
+            throws Exception
+    {
+        Logging.initialize();
+
+        DistributedQueryRunner queryRunner = createSybaseQueryRunner(
+                new TestingSybaseServer(),
+                ImmutableMap.of("http-server.http.port", "8080"),
+                ImmutableMap.of(),
+                TpchTable.getTables());
+
+        Logger log = Logger.get(SybaseQueryRunner.class);
+        log.info("======== SERVER STARTED ========");
+        log.info("\n====\n%s\n====", queryRunner.getCoordinator().getBaseUrl());
+    }
 }
diff --git a/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/TestSybaseConnectorTest.java b/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/TestSybaseConnectorTest.java
@@ -32,7 +32,7 @@ protected QueryRunner createQueryRunner()
             throws Exception
     {
         sybaseServer = new TestingSybaseServer();
-        return createSybaseQueryRunner(sybaseServer, ImmutableMap.of(), REQUIRED_TPCH_TABLES);
+        return createSybaseQueryRunner(sybaseServer, ImmutableMap.of(), ImmutableMap.of(), REQUIRED_TPCH_TABLES);
     }
 
     @AfterClass(alwaysRun = true)

diff --git a/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/TestSybasePlugin.java b/plugin/trino-sybase/src/test/java/io/trino/plugin/sybase/TestSybasePlugin.java
@@ -28,6 +28,6 @@ public void testCreateConnector()
     {
         Plugin plugin = new SybasePlugin();
         ConnectorFactory factory = getOnlyElement(plugin.getConnectorFactories());
-        factory.create("test", ImmutableMap.of("connection-url", "jdbc:mariadb://test"), new TestingConnectorContext()).shutdown();
+        factory.create("test", ImmutableMap.of("connection-url", "jdbc:jtds:sybase://testdb"), new TestingConnectorContext()).shutdown();
     }
 }
diff --git a/plugin/trino-sybase/src/test/resources/container-license-acceptance.txt b/plugin/trino-sybase/src/test/resources/container-license-acceptance.txt
diff --git a/pom.xml b/pom.xml
@@ -140,6 +140,7 @@
         <module>plugin/trino-resource-group-managers</module>
         <module>plugin/trino-session-property-managers</module>
         <module>plugin/trino-sqlserver</module>
+        <module>plugin/trino-sybase</module>
         <module>plugin/trino-teradata-functions</module>
         <module>plugin/trino-thrift</module>
         <module>plugin/trino-thrift-api</module>