From 71a1296701a83ddae15e69a5572e4b2e9fefc5e8 Mon Sep 17 00:00:00 2001 From: zixi0825 Date: Fri, 22 Dec 2023 21:55:36 +0800 Subject: [PATCH] [Fix][Connector] Fix presto/trino execute job error --- .../java/io/datavines/connector/plugin/PrestoConnector.java | 2 ++ .../connector/plugin/PrestoConnectorParameterConverter.java | 5 +++++ .../datavines/connector/plugin/PrestoDataSourceClient.java | 2 +- .../java/io/datavines/connector/plugin/TrinoConnector.java | 2 ++ .../connector/plugin/TrinoConnectorParameterConverter.java | 5 +++++ .../io/datavines/connector/plugin/TrinoDataSourceClient.java | 2 +- 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnector.java b/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnector.java index 939f9c1f8..b20b1299b 100644 --- a/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnector.java +++ b/datavines-connector/datavines-connector-plugins/datavines-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/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnectorParameterConverter.java b/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnectorParameterConverter.java index 51c942a62..1225b70a6 100644 --- a/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnectorParameterConverter.java +++ b/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoConnectorParameterConverter.java @@ -42,6 +42,11 @@ protected String getUrl(Map parameter) { parameter.get(PORT), parameter.get(CATALOG)); } + + String properties = (String)parameter.get(PROPERTIES); + if (StringUtils.isNotEmpty(properties)) { + url += "?" + properties; + } return url; } } diff --git a/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoDataSourceClient.java b/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoDataSourceClient.java index 913ccf803..7aae77cdb 100644 --- a/datavines-connector/datavines-connector-plugins/datavines-connector-presto/src/main/java/io/datavines/connector/plugin/PrestoDataSourceClient.java +++ b/datavines-connector/datavines-connector-plugins/datavines-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/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnector.java b/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnector.java index 5d94f9103..afd839aa5 100644 --- a/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnector.java +++ b/datavines-connector/datavines-connector-plugins/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/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnectorParameterConverter.java b/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnectorParameterConverter.java index d0ada32c7..6c0366504 100644 --- a/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnectorParameterConverter.java +++ b/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoConnectorParameterConverter.java @@ -42,6 +42,11 @@ protected String getUrl(Map parameter) { parameter.get(PORT), parameter.get(CATALOG)); } + + String properties = (String)parameter.get(PROPERTIES); + if (StringUtils.isNotEmpty(properties)) { + url += "?" + properties; + } return url; } } diff --git a/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoDataSourceClient.java b/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoDataSourceClient.java index 738ee80cf..f410d3ac1 100644 --- a/datavines-connector/datavines-connector-plugins/datavines-connector-trino/src/main/java/io/datavines/connector/plugin/TrinoDataSourceClient.java +++ b/datavines-connector/datavines-connector-plugins/datavines-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; }