[Fix][Connector] Fix presto/trino execute job error (#324)

datavane · Dec 22, 2023 · 4c54a28 · 4c54a28
1 parent ae704f2
commit 4c54a28
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/...tavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnector.java b/...tavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnector.java
@@ -20,6 +20,8 @@
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
 import io.datavines.common.param.ConnectorResponse;
 import io.datavines.common.param.TestConnectionRequestParam;
+import io.datavines.common.param.form.Validate;
+import io.datavines.common.param.form.type.InputParam;
 import io.datavines.common.utils.JSONUtils;
 import io.datavines.common.utils.StringUtils;
 import io.datavines.connector.api.DataSourceClient;

diff --git a/...presto/src/main/java/io/datavines/connector/plugin/PrestoConnectorParameterConverter.java b/...presto/src/main/java/io/datavines/connector/plugin/PrestoConnectorParameterConverter.java
@@ -42,6 +42,11 @@ protected String getUrl(Map<String, Object> parameter) {
                     parameter.get(PORT),
                     parameter.get(CATALOG));
         }
+
+        String properties = (String)parameter.get(PROPERTIES);
+        if (StringUtils.isNotEmpty(properties)) {
+            url += "?" + properties;
+        }
         return url;
     }
 }
diff --git a/...-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoDataSourceClient.java b/...-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoDataSourceClient.java
@@ -89,7 +89,7 @@ public Connection getConnection(Properties properties) throws SQLException {
 
     @Override
     public JdbcTemplate getJdbcTemplate(BaseJdbcDataSourceInfo baseJdbcDataSourceInfo) throws SQLException {
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(JdbcDataSourceManager.getInstance().getDataSource(baseJdbcDataSourceInfo));
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(getDataSource(baseJdbcDataSourceInfo));
         jdbcTemplate.setFetchSize(500);
         return jdbcTemplate;
     }

diff --git a/...datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnector.java b/...datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnector.java
@@ -20,6 +20,8 @@
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
 import io.datavines.common.param.ConnectorResponse;
 import io.datavines.common.param.TestConnectionRequestParam;
+import io.datavines.common.param.form.Validate;
+import io.datavines.common.param.form.type.InputParam;
 import io.datavines.common.utils.JSONUtils;
 import io.datavines.common.utils.StringUtils;
 import io.datavines.connector.api.DataSourceClient;

diff --git a/...r-trino/src/main/java/io/datavines/connector/plugin/TrinoConnectorParameterConverter.java b/...r-trino/src/main/java/io/datavines/connector/plugin/TrinoConnectorParameterConverter.java
@@ -42,6 +42,11 @@ protected String getUrl(Map<String, Object> parameter) {
                     parameter.get(PORT),
                     parameter.get(CATALOG));
         }
+
+        String properties = (String)parameter.get(PROPERTIES);
+        if (StringUtils.isNotEmpty(properties)) {
+            url += "?" + properties;
+        }
         return url;
     }
 }
diff --git a/...es-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoDataSourceClient.java b/...es-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoDataSourceClient.java
@@ -90,7 +90,7 @@ public Connection getConnection(Properties properties) throws SQLException {
 
     @Override
     public JdbcTemplate getJdbcTemplate(BaseJdbcDataSourceInfo baseJdbcDataSourceInfo) throws SQLException {
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(JdbcDataSourceManager.getInstance().getDataSource(baseJdbcDataSourceInfo));
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(getDataSource(baseJdbcDataSourceInfo));
         jdbcTemplate.setFetchSize(500);
         return jdbcTemplate;
     }