[Improvement-15260][dolphinscheduler-datasource-hana] add hana relate…

…d dependencies (#15260) * add hana related dependencies * optimizing HANA data source bugs * run mvn spotless:apply * Fix hana datasource getValidationQuery() * Fix hana datasource testGetJdbcUrl() --------- Co-authored-by: xujiaqiang <“xujiaqiangwz@163.com”> Co-authored-by: David Zollo <dailidong66@gmail.com>
apache · Dec 12, 2023 · 0feb144 · 0feb144
1 parent 0c470ff
commit 0feb144
Show file tree

Hide file tree

Showing 14 changed files with 159 additions and 57 deletions.
diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml
@@ -60,6 +60,7 @@
         <vertica-jdbc.version>12.0.4-0</vertica-jdbc.version>
         <oracle-jdbc.version>21.5.0.0</oracle-jdbc.version>
         <dameng-jdbc.version>8.1.2.79</dameng-jdbc.version>
+        <ngdbc.version>2.4.51</ngdbc.version>
         <slf4j.version>1.7.36</slf4j.version>
         <poi.version>4.1.2</poi.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@@ -418,6 +419,14 @@
                 <artifactId>h2</artifactId>
                 <version>${h2.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.sap.cloud.db.jdbc</groupId>
+                <artifactId>ngdbc</artifactId>
+                <version>${ngdbc.version}</version>
+                <scope>test</scope>
+            </dependency>
+
             <!-- sl4j -->
             <dependency>
                 <groupId>org.slf4j</groupId>

diff --git a/...ommon/src/main/java/org/apache/dolphinscheduler/common/constants/DataSourceConstants.java b/...ommon/src/main/java/org/apache/dolphinscheduler/common/constants/DataSourceConstants.java
@@ -65,7 +65,7 @@ public class DataSourceConstants {
     public static final String KYUUBI_VALIDATION_QUERY = "select 1";
     public static final String VERTICA_VALIDATION_QUERY = "select 1";
 
-    public static final String HANA_VALIDATION_QUERY = "select 1";
+    public static final String HANA_VALIDATION_QUERY = "select 1 from DUMMY";
 
     /**
      * jdbc url

diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml
@@ -153,5 +153,10 @@
             <artifactId>dolphinscheduler-datasource-k8s</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-datasource-hana</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.dolphinscheduler</groupId>
+        <artifactId>dolphinscheduler-datasource-plugin</artifactId>
+        <version>dev-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dolphinscheduler-datasource-hana</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-datasource-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sap.cloud.db.jdbc</groupId>
+            <artifactId>ngdbc</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...datasource/hana/HanaDataSourceClient.java → ...ource/hana/HanaAdHocDataSourceClient.java b/...datasource/hana/HanaDataSourceClient.java → ...ource/hana/HanaAdHocDataSourceClient.java
@@ -17,14 +17,13 @@
 
 package org.apache.dolphinscheduler.plugin.datasource.hana;
 
-import org.apache.dolphinscheduler.plugin.datasource.api.client.CommonDataSourceClient;
+import org.apache.dolphinscheduler.plugin.datasource.api.client.BaseAdHocDataSourceClient;
 import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
 import org.apache.dolphinscheduler.spi.enums.DbType;
 
-public class HanaDataSourceClient extends CommonDataSourceClient {
+public class HanaAdHocDataSourceClient extends BaseAdHocDataSourceClient {
 
-    public HanaDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
+    public HanaAdHocDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
         super(baseConnectionParam, dbType);
     }
-
 }
diff --git a/...c/main/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannel.java b/...c/main/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannel.java
@@ -17,15 +17,21 @@
 
 package org.apache.dolphinscheduler.plugin.datasource.hana;
 
+import org.apache.dolphinscheduler.spi.datasource.AdHocDataSourceClient;
 import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
-import org.apache.dolphinscheduler.spi.datasource.DataSourceClient;
+import org.apache.dolphinscheduler.spi.datasource.PooledDataSourceClient;
 import org.apache.dolphinscheduler.spi.enums.DbType;
 
 public class HanaDataSourceChannel implements DataSourceChannel {
 
     @Override
-    public DataSourceClient createDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
-        return new HanaDataSourceClient(baseConnectionParam, dbType);
+    public AdHocDataSourceClient createAdHocDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
+        return new HanaAdHocDataSourceClient(baseConnectionParam, dbType);
+    }
+
+    @Override
+    public PooledDataSourceClient createPooledDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
+        return new HanaPooledDataSourceClient(baseConnectionParam, dbType);
     }
 }
diff --git a/...n/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaPooledDataSourceClient.java b/...n/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaPooledDataSourceClient.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.datasource.hana;
+
+import org.apache.dolphinscheduler.plugin.datasource.api.client.BasePooledDataSourceClient;
+import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
+import org.apache.dolphinscheduler.spi.enums.DbType;
+
+public class HanaPooledDataSourceClient extends BasePooledDataSourceClient {
+
+    public HanaPooledDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
+        super(baseConnectionParam, dbType);
+    }
+
+}
diff --git a/...ava/org/apache/dolphinscheduler/plugin/datasource/hana/param/HanaDataSourceProcessor.java b/...ava/org/apache/dolphinscheduler/plugin/datasource/hana/param/HanaDataSourceProcessor.java
@@ -34,16 +34,13 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.auto.service.AutoService;
+
 @AutoService(DataSourceProcessor.class)
 public class HanaDataSourceProcessor extends AbstractDataSourceProcessor {
 
-    private final Logger logger = LoggerFactory.getLogger(HanaDataSourceProcessor.class);
-
     private static final String APPEND_PARAMS = "reconnect=true";
+
     @Override
     public BaseDataSourceParamDTO castDatasourceParamDTO(String paramJson) {
         return JSONUtils.parseObject(paramJson, HanaDataSourceParamDTO.class);
@@ -96,7 +93,7 @@ public String getDatasourceDriver() {
 
     @Override
     public String getValidationQuery() {
-        return DataSourceConstants.COM_HANA_DB_JDBC_DRIVER;
+        return DataSourceConstants.HANA_VALIDATION_QUERY;
     }
 
     @Override

diff --git a/.../org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelFactoryTest.java b/.../org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelFactoryTest.java
@@ -18,13 +18,14 @@
 package org.apache.dolphinscheduler.plugin.datasource.hana;
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class HanaDataSourceChannelFactoryTest {
+class HanaDataSourceChannelFactoryTest {
 
     @Test
-    public void testCreate() {
+    void testCreate() {
         HanaDataSourceChannelFactory sourceChannelFactory = new HanaDataSourceChannelFactory();
         DataSourceChannel dataSourceChannel = sourceChannelFactory.create();
         Assertions.assertNotNull(dataSourceChannel);

diff --git a/...st/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelTest.java b/...st/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelTest.java
@@ -19,20 +19,22 @@
 
 import org.apache.dolphinscheduler.plugin.datasource.hana.param.HanaConnectionParam;
 import org.apache.dolphinscheduler.spi.enums.DbType;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-public class HanaDataSourceChannelTest {
+class HanaDataSourceChannelTest {
 
     @Test
-    public void testCreateDataSourceClient() {
+    void testCreateDataSourceClient() {
         HanaDataSourceChannel sourceChannel = Mockito.mock(HanaDataSourceChannel.class);
-        HanaDataSourceClient dataSourceClient = Mockito.mock(HanaDataSourceClient.class);
-        Mockito.when(sourceChannel.createDataSourceClient(Mockito.any(), Mockito.any())).thenReturn(dataSourceClient);
-        Assertions.assertNotNull(sourceChannel.createDataSourceClient(new HanaConnectionParam(), DbType.HANA));
+        HanaPooledDataSourceClient dataSourceClient = Mockito.mock(HanaPooledDataSourceClient.class);
+        Mockito.when(sourceChannel.createPooledDataSourceClient(Mockito.any(), Mockito.any()))
+                .thenReturn(dataSourceClient);
+        Assertions.assertNotNull(sourceChannel.createPooledDataSourceClient(new HanaConnectionParam(), DbType.HANA));
     }
 }
diff --git a/...org/apache/dolphinscheduler/plugin/datasource/hana/param/HanaDataSourceProcessorTest.java b/...org/apache/dolphinscheduler/plugin/datasource/hana/param/HanaDataSourceProcessorTest.java
@@ -20,23 +20,24 @@
 import org.apache.dolphinscheduler.common.constants.DataSourceConstants;
 import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
 import org.apache.dolphinscheduler.spi.enums.DbType;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @ExtendWith(MockitoExtension.class)
-public class HanaDataSourceProcessorTest {
+class HanaDataSourceProcessorTest {
 
     private HanaDataSourceProcessor hanaDataSourceProcessor = new HanaDataSourceProcessor();
 
     @Test
-    public void testCreateConnectionParams() {
+    void testCreateConnectionParams() {
         Map<String, String> props = new HashMap<>();
         HanaDataSourceParamDTO mysqlDatasourceParamDTO = new HanaDataSourceParamDTO();
         mysqlDatasourceParamDTO.setUserName("root");
@@ -55,7 +56,7 @@ public void testCreateConnectionParams() {
     }
 
     @Test
-    public void testCreateConnectionParams2() {
+    void testCreateConnectionParams2() {
         String connectionJson = "{\"user\":\"root\",\"password\":\"123456\",\"address\":\"jdbc:sap://localhost:30015\""
                 + ",\"database\":\"default\",\"jdbcUrl\":\"jdbc:sap://localhost:30015?currentschema=default\"}";
         HanaConnectionParam connectionParams = (HanaConnectionParam) hanaDataSourceProcessor
@@ -65,13 +66,13 @@ public void testCreateConnectionParams2() {
     }
 
     @Test
-    public void testGetDatasourceDriver() {
+    void testGetDatasourceDriver() {
         Assertions.assertEquals(DataSourceConstants.COM_HANA_DB_JDBC_DRIVER,
                 hanaDataSourceProcessor.getDatasourceDriver());
     }
 
     @Test
-    public void testGetJdbcUrl() {
+    void testGetJdbcUrl() {
         HanaConnectionParam hanaConnectionParam = new HanaConnectionParam();
         hanaConnectionParam.setJdbcUrl("jdbc:sap://localhost:30015?currentschema=default");
         Assertions.assertEquals(
@@ -80,18 +81,18 @@ public void testGetJdbcUrl() {
     }
 
     @Test
-    public void testGetDbType() {
+    void testGetDbType() {
         Assertions.assertEquals(DbType.HANA, hanaDataSourceProcessor.getDbType());
     }
 
     @Test
-    public void testGetValidationQuery() {
+    void testGetValidationQuery() {
         Assertions.assertEquals(DataSourceConstants.HANA_VALIDATION_QUERY,
                 hanaDataSourceProcessor.getValidationQuery());
     }
 
     @Test
-    public void testGetDatasourceUniqueId() {
+    void testGetDatasourceUniqueId() {
         HanaConnectionParam mysqlConnectionParam = new HanaConnectionParam();
         mysqlConnectionParam.setJdbcUrl("jdbc:sap://localhost:30015?currentschema=default");
         mysqlConnectionParam.setUser("root");

diff --git a/...g/apache/dolphinscheduler/plugin/datasource/hana/provider/JDBCDataSourceProviderTest.java b/...g/apache/dolphinscheduler/plugin/datasource/hana/provider/JDBCDataSourceProviderTest.java
@@ -17,36 +17,38 @@
 
 package org.apache.dolphinscheduler.plugin.datasource.hana.provider;
 
-import com.zaxxer.hikari.HikariDataSource;
 import org.apache.dolphinscheduler.plugin.datasource.api.provider.JDBCDataSourceProvider;
 import org.apache.dolphinscheduler.plugin.datasource.hana.param.HanaConnectionParam;
 import org.apache.dolphinscheduler.spi.enums.DbType;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import com.zaxxer.hikari.HikariDataSource;
+
 @ExtendWith(MockitoExtension.class)
-public class JDBCDataSourceProviderTest {
+class JDBCDataSourceProviderTest {
 
     @Test
-    public void testCreateJdbcDataSource() {
+    void testCreateJdbcDataSource() {
         try (
                 MockedStatic<JDBCDataSourceProvider> mockedJDBCDataSourceProvider =
                         Mockito.mockStatic(JDBCDataSourceProvider.class)) {
             HikariDataSource dataSource = Mockito.mock(HikariDataSource.class);
             mockedJDBCDataSourceProvider
-                    .when(() -> JDBCDataSourceProvider.createJdbcDataSource(Mockito.any(), Mockito.any()))
+                    .when(() -> JDBCDataSourceProvider.createOneSessionJdbcDataSource(Mockito.any(), Mockito.any()))
                     .thenReturn(dataSource);
             Assertions.assertNotNull(
-                    JDBCDataSourceProvider.createJdbcDataSource(new HanaConnectionParam(), DbType.HANA));
+                    JDBCDataSourceProvider.createOneSessionJdbcDataSource(new HanaConnectionParam(), DbType.HANA));
         }
     }
 
     @Test
-    public void testCreateOneSessionJdbcDataSource() {
+    void testCreateOneSessionJdbcDataSource() {
         try (
                 MockedStatic<JDBCDataSourceProvider> mockedJDBCDataSourceProvider =
                         Mockito.mockStatic(JDBCDataSourceProvider.class)) {