[Refactor][Connector] Refactor DataSource Client (#318)

datavane · Dec 18, 2023 · 3f28774 · 3f28774
1 parent 2b3e00d
commit 3f28774
Show file tree

Hide file tree

Showing 62 changed files with 656 additions and 118 deletions.
diff --git a/datavines-common/pom.xml b/datavines-common/pom.xml
@@ -181,7 +181,6 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>
diff --git a/...or/datavines-connector-api/src/main/java/io/datavines/connector/api/DataSourceClient.java b/...or/datavines-connector-api/src/main/java/io/datavines/connector/api/DataSourceClient.java
@@ -17,6 +17,8 @@
 package io.datavines.connector.api;
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
+import io.datavines.common.exception.DataVinesException;
+import org.slf4j.Logger;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
@@ -37,6 +39,8 @@ public interface DataSourceClient {
 
     Connection getConnection(Map<String,Object> configMap) throws SQLException;
 
+    Connection getConnection(Map<String,Object> configMap, Logger logger) throws DataVinesException;
+
     Connection getConnection(Properties properties) throws SQLException;
 
     JdbcTemplate getJdbcTemplate(BaseJdbcDataSourceInfo baseJdbcDataSourceInfo) throws SQLException;

diff --git a/...connector-clickhouse/src/main/java/io/datavines/connector/plugin/ClickHouseConnector.java b/...connector-clickhouse/src/main/java/io/datavines/connector/plugin/ClickHouseConnector.java
@@ -18,9 +18,13 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
+import io.datavines.connector.api.DataSourceClient;
 
 public class ClickHouseConnector extends JdbcConnector {
 
+    public ClickHouseConnector(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
+    }
     @Override
     public BaseJdbcDataSourceInfo getDatasourceInfo(JdbcConnectionInfo jdbcConnectionInfo) {
         return new ClickHouseDataSourceInfo(jdbcConnectionInfo);

diff --git a/...or-clickhouse/src/main/java/io/datavines/connector/plugin/ClickHouseConnectorFactory.java b/...or-clickhouse/src/main/java/io/datavines/connector/plugin/ClickHouseConnectorFactory.java
@@ -35,11 +35,11 @@ public Dialect getDialect() {
 
     @Override
     public Connector getConnector() {
-        return new ClickHouseConnector();
+        return new ClickHouseConnector(getDataSourceClient());
     }
 
     @Override
     public Executor getExecutor() {
-        return new ClickHouseExecutor(new JdbcDataSourceClient());
+        return new ClickHouseExecutor(getDataSourceClient());
     }
 }
diff --git a/...-connector-clickhouse/src/main/java/io/datavines/connector/plugin/ClickHouseExecutor.java b/...-connector-clickhouse/src/main/java/io/datavines/connector/plugin/ClickHouseExecutor.java
@@ -18,10 +18,11 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
+import io.datavines.connector.api.DataSourceClient;
 
 public class ClickHouseExecutor extends BaseJdbcExecutor {
 
-    public ClickHouseExecutor(JdbcDataSourceClient jdbcDataSourceClient) {
+    public ClickHouseExecutor(DataSourceClient jdbcDataSourceClient) {
         super(jdbcDataSourceClient);
     }
 

diff --git a/...nes-connector-databend/src/main/java/io/datavines/connector/plugin/DatabendConnector.java b/...nes-connector-databend/src/main/java/io/datavines/connector/plugin/DatabendConnector.java
@@ -22,6 +22,7 @@
 import io.datavines.common.param.TestConnectionRequestParam;
 import io.datavines.common.utils.JSONUtils;
 import io.datavines.common.utils.StringUtils;
+import io.datavines.connector.api.DataSourceClient;
 
 import java.sql.*;
 
@@ -31,6 +32,10 @@ public class DatabendConnector extends JdbcConnector {
 
     protected static final String[] TABLE_TYPES = new String[]{TABLE};
 
+    public DatabendConnector(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
+    }
+
     @Override
     public ResultSet getMetadataTables(DatabaseMetaData metaData, String catalog, String schema) throws SQLException {
         return metaData.getTables(catalog, schema, null, TABLE_TYPES);

diff --git a/...nector-databend/src/main/java/io/datavines/connector/plugin/DatabendConnectorFactory.java b/...nector-databend/src/main/java/io/datavines/connector/plugin/DatabendConnectorFactory.java
@@ -27,7 +27,7 @@ public ConnectorParameterConverter getConnectorParameterConverter() {
 
     @Override
     public Connector getConnector() {
-        return new DatabendConnector();
+        return new DatabendConnector(getDataSourceClient());
     }
 
     @Override
@@ -37,7 +37,7 @@ public Dialect getDialect() {
 
     @Override
     public Executor getExecutor() {
-        return new DatabendExecutor(new JdbcDataSourceClient());
+        return new DatabendExecutor(getDataSourceClient());
     }
 
     @Override

diff --git a/...ines-connector-databend/src/main/java/io/datavines/connector/plugin/DatabendExecutor.java b/...ines-connector-databend/src/main/java/io/datavines/connector/plugin/DatabendExecutor.java
@@ -18,10 +18,11 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
+import io.datavines.connector.api.DataSourceClient;
 
 public class DatabendExecutor extends BaseJdbcExecutor {
 
-    public DatabendExecutor(JdbcDataSourceClient jdbcDataSourceClient) {
+    public DatabendExecutor(DataSourceClient jdbcDataSourceClient) {
         super(jdbcDataSourceClient);
     }
     @Override

diff --git a/...ugins/datavines-connector-dm/src/main/java/io/datavines/connector/plugin/DmConnector.java b/...ugins/datavines-connector-dm/src/main/java/io/datavines/connector/plugin/DmConnector.java
@@ -18,12 +18,19 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
+import io.datavines.connector.api.DataSourceClient;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-public class DmConnector  extends JdbcConnector {
+public class DmConnector extends JdbcConnector {
+
+    public DmConnector(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
+    }
+
     @Override
     public BaseJdbcDataSourceInfo getDatasourceInfo(JdbcConnectionInfo jdbcConnectionInfo) {
         return new DmDataSourceInfo(jdbcConnectionInfo);

diff --git a/...atavines-connector-dm/src/main/java/io/datavines/connector/plugin/DmConnectorFactory.java b/...atavines-connector-dm/src/main/java/io/datavines/connector/plugin/DmConnectorFactory.java
@@ -19,9 +19,10 @@
 import io.datavines.connector.api.*;
 
 public class DmConnectorFactory extends AbstractJdbcConnectorFactory {
+
     @Override
     public Connector getConnector() {
-        return new DmConnector();
+        return new DmConnector(getDataSourceClient());
     }
 
     @Override
@@ -36,7 +37,7 @@ public ConnectorParameterConverter getConnectorParameterConverter() {
 
     @Override
     public Executor getExecutor() {
-        return new DmExecutor(new JdbcDataSourceClient());
+        return new DmExecutor(getDataSourceClient());
     }
 
     @Override

diff --git a/...lugins/datavines-connector-dm/src/main/java/io/datavines/connector/plugin/DmExecutor.java b/...lugins/datavines-connector-dm/src/main/java/io/datavines/connector/plugin/DmExecutor.java
@@ -18,10 +18,11 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
+import io.datavines.connector.api.DataSourceClient;
 
 public class DmExecutor extends BaseJdbcExecutor{
 
-    public DmExecutor(JdbcDataSourceClient jdbcDataSourceClient) {
+    public DmExecutor(DataSourceClient jdbcDataSourceClient) {
         super(jdbcDataSourceClient);
     }
 

diff --git a/...datavines-connector-doris/src/main/java/io/datavines/connector/plugin/DorisConnector.java b/...datavines-connector-doris/src/main/java/io/datavines/connector/plugin/DorisConnector.java
@@ -16,6 +16,11 @@
  */
 package io.datavines.connector.plugin;
 
+import io.datavines.connector.api.DataSourceClient;
+
 public class DorisConnector extends MysqlConnector {
 
+    public DorisConnector(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
+    }
 }
diff --git a/...es-connector-doris/src/main/java/io/datavines/connector/plugin/DorisConnectorFactory.java b/...es-connector-doris/src/main/java/io/datavines/connector/plugin/DorisConnectorFactory.java
@@ -32,12 +32,12 @@ public Dialect getDialect() {
 
     @Override
     public Connector getConnector() {
-        return new DorisConnector();
+        return new DorisConnector(getDataSourceClient());
     }
 
     @Override
     public Executor getExecutor() {
-        return new DorisExecutor(new JdbcDataSourceClient());
+        return new DorisExecutor(getDataSourceClient());
     }
 
     @Override

diff --git a/.../datavines-connector-doris/src/main/java/io/datavines/connector/plugin/DorisExecutor.java b/.../datavines-connector-doris/src/main/java/io/datavines/connector/plugin/DorisExecutor.java
@@ -18,11 +18,12 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
+import io.datavines.connector.api.DataSourceClient;
 
 public class DorisExecutor extends MysqlExecutor {
 
-    public DorisExecutor(JdbcDataSourceClient jdbcDataSourceClient) {
-        super(jdbcDataSourceClient);
+    public DorisExecutor(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
     }
 
     @Override

diff --git a/...s/datavines-connector-hive/src/main/java/io/datavines/connector/plugin/HiveConnector.java b/...s/datavines-connector-hive/src/main/java/io/datavines/connector/plugin/HiveConnector.java
@@ -18,14 +18,18 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
-import io.datavines.common.param.form.type.InputParam;
+import io.datavines.connector.api.DataSourceClient;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 public class HiveConnector extends JdbcConnector {
 
+    public HiveConnector(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
+    }
+
     @Override
     public BaseJdbcDataSourceInfo getDatasourceInfo(JdbcConnectionInfo jdbcConnectionInfo) {
         return new HiveDataSourceInfo(jdbcConnectionInfo);

diff --git a/...ines-connector-hive/src/main/java/io/datavines/connector/plugin/HiveConnectorFactory.java b/...ines-connector-hive/src/main/java/io/datavines/connector/plugin/HiveConnectorFactory.java
@@ -32,12 +32,12 @@ public Dialect getDialect() {
 
     @Override
     public Connector getConnector() {
-        return new HiveConnector();
+        return new HiveConnector(getDataSourceClient());
     }
 
     @Override
     public Executor getExecutor() {
-        return new HiveExecutor(new JdbcDataSourceClient());
+        return new HiveExecutor(getDataSourceClient());
     }
 
     @Override

diff --git a/...ns/datavines-connector-hive/src/main/java/io/datavines/connector/plugin/HiveExecutor.java b/...ns/datavines-connector-hive/src/main/java/io/datavines/connector/plugin/HiveExecutor.java
@@ -20,12 +20,13 @@
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
 import io.datavines.common.datasource.jdbc.utils.HiveSqlUtils;
 import io.datavines.common.entity.ListWithQueryColumn;
+import io.datavines.connector.api.DataSourceClient;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 public class HiveExecutor extends BaseJdbcExecutor {
 
-    public HiveExecutor(JdbcDataSourceClient jdbcDataSourceClient) {
-        super(jdbcDataSourceClient);
+    public HiveExecutor(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
     }
 
     @Override

diff --git a/...tavines-connector-impala/src/main/java/io/datavines/connector/plugin/ImpalaConnector.java b/...tavines-connector-impala/src/main/java/io/datavines/connector/plugin/ImpalaConnector.java
@@ -18,9 +18,14 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
+import io.datavines.connector.api.DataSourceClient;
 
 public class ImpalaConnector extends JdbcConnector {
 
+    public ImpalaConnector(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
+    }
+
     @Override
     public BaseJdbcDataSourceInfo getDatasourceInfo(JdbcConnectionInfo jdbcConnectionInfo) {
         return new ImpalaDataSourceInfo(jdbcConnectionInfo);

diff --git a/...-connector-impala/src/main/java/io/datavines/connector/plugin/ImpalaConnectorFactory.java b/...-connector-impala/src/main/java/io/datavines/connector/plugin/ImpalaConnectorFactory.java
@@ -35,11 +35,11 @@ public Dialect getDialect() {
 
     @Override
     public Connector getConnector() {
-        return new ImpalaConnector();
+        return new ImpalaConnector(getDataSourceClient());
     }
 
     @Override
     public Executor getExecutor() {
-        return new ImpalaExecutor(new JdbcDataSourceClient());
+        return new ImpalaExecutor(getDataSourceClient());
     }
 }
diff --git a/...atavines-connector-impala/src/main/java/io/datavines/connector/plugin/ImpalaExecutor.java b/...atavines-connector-impala/src/main/java/io/datavines/connector/plugin/ImpalaExecutor.java
@@ -18,11 +18,12 @@
 
 import io.datavines.common.datasource.jdbc.BaseJdbcDataSourceInfo;
 import io.datavines.common.datasource.jdbc.JdbcConnectionInfo;
+import io.datavines.connector.api.DataSourceClient;
 
 public class ImpalaExecutor extends BaseJdbcExecutor {
 
-    public ImpalaExecutor(JdbcDataSourceClient jdbcDataSourceClient) {
-        super(jdbcDataSourceClient);
+    public ImpalaExecutor(DataSourceClient dataSourceClient) {
+        super(dataSourceClient);
     }
 
     @Override

diff --git a/...atavines-connector-jdbc/src/main/java/io/datavines/connector/plugin/BaseJdbcExecutor.java b/...atavines-connector-jdbc/src/main/java/io/datavines/connector/plugin/BaseJdbcExecutor.java
@@ -22,6 +22,7 @@
 import io.datavines.common.param.ConnectorResponse;
 import io.datavines.common.param.ExecuteRequestParam;
 import io.datavines.common.utils.JSONUtils;
+import io.datavines.connector.api.DataSourceClient;
 import io.datavines.connector.api.Executor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -30,10 +31,10 @@
 
 public abstract class BaseJdbcExecutor implements Executor, IJdbcDataSourceInfo {
 
-    private final JdbcDataSourceClient jdbcDataSourceClient;
+    private final DataSourceClient dataSourceClient;
 
-    public BaseJdbcExecutor(JdbcDataSourceClient jdbcDataSourceClient) {
-        this.jdbcDataSourceClient = jdbcDataSourceClient;
+    public BaseJdbcExecutor(DataSourceClient dataSourceClient) {
+        this.dataSourceClient = dataSourceClient;
     }
 
     protected ListWithQueryColumn query(JdbcTemplate jdbcTemplate, String sql, int limit) {
@@ -47,7 +48,7 @@ public ConnectorResponse queryForPage(ExecuteRequestParam param) throws SQLExcep
 
         JdbcConnectionInfo jdbcConnectionInfo = JSONUtils.parseObject(dataSourceParam, JdbcConnectionInfo.class);
 
-        JdbcTemplate jdbcTemplate = jdbcDataSourceClient.getJdbcTemplate(
+        JdbcTemplate jdbcTemplate = dataSourceClient.getJdbcTemplate(
                 JdbcDataSourceInfoManager.getDatasourceInfo(dataSourceParam, getDatasourceInfo(jdbcConnectionInfo)));
 
         String sql = param.getScript();
@@ -68,7 +69,7 @@ public ConnectorResponse queryForOne(ExecuteRequestParam param) throws SQLExcept
         String dataSourceParam = param.getDataSourceParam();
 
         JdbcConnectionInfo jdbcConnectionInfo = JSONUtils.parseObject(dataSourceParam, JdbcConnectionInfo.class);
-        JdbcTemplate jdbcTemplate = jdbcDataSourceClient.getJdbcTemplate(
+        JdbcTemplate jdbcTemplate = dataSourceClient.getJdbcTemplate(
                 JdbcDataSourceInfoManager.getDatasourceInfo(dataSourceParam, getDatasourceInfo(jdbcConnectionInfo)));
 
         String sql = param.getScript() + " limit 1";
@@ -89,7 +90,7 @@ public ConnectorResponse queryForList(ExecuteRequestParam param) throws Exceptio
         String dataSourceParam = param.getDataSourceParam();
         JdbcConnectionInfo jdbcConnectionInfo = JSONUtils.parseObject(dataSourceParam, JdbcConnectionInfo.class);
 
-        JdbcTemplate jdbcTemplate = jdbcDataSourceClient.getJdbcTemplate(
+        JdbcTemplate jdbcTemplate = dataSourceClient.getJdbcTemplate(
                 JdbcDataSourceInfoManager.getDatasourceInfo(dataSourceParam, getDatasourceInfo(jdbcConnectionInfo)));
 
         String sql = param.getScript();

diff --git a/...tavines-connector-jdbc/src/main/java/io/datavines/connector/plugin/JdbcConfigBuilder.java b/...tavines-connector-jdbc/src/main/java/io/datavines/connector/plugin/JdbcConfigBuilder.java
@@ -93,8 +93,7 @@ protected InputParam getSchemaInput(boolean isEn) {
     protected InputParam getDatabaseInput(boolean isEn) {
         return getInputParam("database",
                 isEn ? "database" : "数据库",
-                isEn ? "please enter database" : "请填入数据库", 1,
-                Validate.newBuilder().setRequired(true).setMessage(isEn ? "please enter database" : "请填入数据库").build(),
+                isEn ? "please enter database" : "请填入数据库", 1, null,
                 null);
     }