[Improvement-15919][datasource] Improvement datasource get name (apac…

…he#15920)
ruanwenjun · Apr 28, 2024 · 7a55ade · 7a55ade
1 parent b29965b
commit 7a55ade
Show file tree

Hide file tree

Showing 36 changed files with 95 additions and 66 deletions.
diff --git a/...apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java b/...apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
@@ -118,7 +118,7 @@ protected Map<String, String> transformOtherParamToMap(String other) {
     @Override
     public String getDatasourceUniqueId(ConnectionParam connectionParam, DbType dbType) {
         BaseConnectionParam baseConnectionParam = (BaseConnectionParam) connectionParam;
-        return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getDescp(), baseConnectionParam.getUser(),
+        return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getName(), baseConnectionParam.getUser(),
                 PasswordUtils.encodePassword(baseConnectionParam.getPassword()), baseConnectionParam.getJdbcUrl());
     }
 

diff --git a/...va/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java b/...va/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java
@@ -69,9 +69,9 @@ public static DataSourceClient getPooledDataSourceClient(DbType dbType,
         String datasourceUniqueId = DataSourceUtils.getDatasourceUniqueId(baseConnectionParam, dbType);
         return POOLED_DATASOURCE_CLIENT_CACHE.get(datasourceUniqueId, () -> {
             Map<String, DataSourceChannel> dataSourceChannelMap = dataSourcePluginManager.getDataSourceChannelMap();
-            DataSourceChannel dataSourceChannel = dataSourceChannelMap.get(dbType.getDescp());
+            DataSourceChannel dataSourceChannel = dataSourceChannelMap.get(dbType.getName());
             if (null == dataSourceChannel) {
-                throw new RuntimeException(String.format("datasource plugin '%s' is not found", dbType.getDescp()));
+                throw new RuntimeException(String.format("datasource plugin '%s' is not found", dbType.getName()));
             }
             return dataSourceChannel.createPooledDataSourceClient(baseConnectionParam, dbType);
         });
@@ -85,9 +85,9 @@ public static Connection getPooledConnection(DbType dbType,
     public static AdHocDataSourceClient getAdHocDataSourceClient(DbType dbType, ConnectionParam connectionParam) {
         BaseConnectionParam baseConnectionParam = (BaseConnectionParam) connectionParam;
         Map<String, DataSourceChannel> dataSourceChannelMap = dataSourcePluginManager.getDataSourceChannelMap();
-        DataSourceChannel dataSourceChannel = dataSourceChannelMap.get(dbType.getDescp());
+        DataSourceChannel dataSourceChannel = dataSourceChannelMap.get(dbType.getName());
         if (null == dataSourceChannel) {
-            throw new RuntimeException(String.format("datasource plugin '%s' is not found", dbType.getDescp()));
+            throw new RuntimeException(String.format("datasource plugin '%s' is not found", dbType.getName()));
         }
         return dataSourceChannel.createAdHocDataSourceClient(baseConnectionParam, dbType);
     }

diff --git a/.../org/apache/dolphinscheduler/plugin/datasource/athena/AthenaDataSourceChannelFactory.java b/.../org/apache/dolphinscheduler/plugin/datasource/athena/AthenaDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -32,6 +33,6 @@ public DataSourceChannel create() {
 
     @Override
     public String getName() {
-        return "athena";
+        return DbType.ATHENA.getName();
     }
 }
diff --git a/.../apache/dolphinscheduler/plugin/datasource/azuresql/AzureSQLDataSourceChannelFactory.java b/.../apache/dolphinscheduler/plugin/datasource/azuresql/AzureSQLDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class AzureSQLDataSourceChannelFactory implements DataSourceChannelFactor
 
     @Override
     public String getName() {
-        return "azuresql";
+        return DbType.AZURESQL.getName();
     }
 
     @Override

diff --git a/...che/dolphinscheduler/plugin/datasource/clickhouse/ClickHouseDataSourceChannelFactory.java b/...che/dolphinscheduler/plugin/datasource/clickhouse/ClickHouseDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class ClickHouseDataSourceChannelFactory implements DataSourceChannelFact
 
     @Override
     public String getName() {
-        return "clickhouse";
+        return DbType.CLICKHOUSE.getName();
     }
 
     @Override

diff --git a/.../org/apache/dolphinscheduler/plugin/datasource/dameng/DamengDataSourceChannelFactory.java b/.../org/apache/dolphinscheduler/plugin/datasource/dameng/DamengDataSourceChannelFactory.java
@@ -28,7 +28,7 @@ public class DamengDataSourceChannelFactory implements DataSourceChannelFactory
 
     @Override
     public String getName() {
-        return DbType.DAMENG.getDescp();
+        return DbType.DAMENG.getName();
     }
 
     @Override

diff --git a/.../apache/dolphinscheduler/plugin/datasource/databend/DatabendDataSourceChannelFactory.java b/.../apache/dolphinscheduler/plugin/datasource/databend/DatabendDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class DatabendDataSourceChannelFactory implements DataSourceChannelFactor
 
     @Override
     public String getName() {
-        return "databend";
+        return DbType.DATABEND.getName();
     }
 
     @Override

diff --git a/...he/dolphinscheduler/plugin/datasource/databend/param/DatabendDataSourceProcessorTest.java b/...he/dolphinscheduler/plugin/datasource/databend/param/DatabendDataSourceProcessorTest.java
@@ -151,7 +151,7 @@ public void testGetJdbcUrl() {
     @Test
     public void testDbType() {
         Assertions.assertEquals(19, DbType.DATABEND.getCode());
-        Assertions.assertEquals("databend", DbType.DATABEND.getDescp());
+        Assertions.assertEquals("databend", DbType.DATABEND.getName());
         Assertions.assertEquals(DbType.DATABEND, DbType.of(19));
     }
 

diff --git a/...n/java/org/apache/dolphinscheduler/plugin/datasource/db2/DB2DataSourceChannelFactory.java b/...n/java/org/apache/dolphinscheduler/plugin/datasource/db2/DB2DataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class DB2DataSourceChannelFactory implements DataSourceChannelFactory {
 
     @Override
     public String getName() {
-        return "db2";
+        return DbType.DB2.getName();
     }
 
     @Override

diff --git a/...src/main/java/org/apache/dolphinscheduler/plugin/doris/DorisDataSourceChannelFactory.java b/...src/main/java/org/apache/dolphinscheduler/plugin/doris/DorisDataSourceChannelFactory.java
@@ -32,6 +32,6 @@ public DataSourceChannel create() {
 
     @Override
     public String getName() {
-        return DbType.DORIS.getDescp();
+        return DbType.DORIS.getName();
     }
 }
diff --git a/...java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelFactory.java b/...java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class HanaDataSourceChannelFactory implements DataSourceChannelFactory {
 
     @Override
     public String getName() {
-        return "hana";
+        return DbType.HANA.getName();
     }
 
     @Override

diff --git a/...java/org/apache/dolphinscheduler/plugin/datasource/hive/HiveDataSourceChannelFactory.java b/...java/org/apache/dolphinscheduler/plugin/datasource/hive/HiveDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class HiveDataSourceChannelFactory implements DataSourceChannelFactory {
 
     @Override
     public String getName() {
-        return "hive";
+        return DbType.HIVE.getName();
     }
 
     @Override

diff --git a/...n/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java b/...n/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -32,7 +33,7 @@ public DataSourceChannel create() {
 
     @Override
     public String getName() {
-        return "k8s";
+        return DbType.K8S.getName();
     }
 
 }
diff --git a/.../java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java b/.../java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java
@@ -58,7 +58,7 @@ public void checkDatasourceParam(BaseDataSourceParamDTO datasourceParam) {
     @Override
     public String getDatasourceUniqueId(ConnectionParam connectionParam, DbType dbType) {
         K8sConnectionParam baseConnectionParam = (K8sConnectionParam) connectionParam;
-        return MessageFormat.format("{0}@{1}@{2}", dbType.getDescp(),
+        return MessageFormat.format("{0}@{1}@{2}", dbType.getName(),
                 PasswordUtils.encodePassword(baseConnectionParam.getKubeConfig()), baseConnectionParam.getNamespace());
     }
 

diff --git a/.../org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java b/.../org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class KyuubiDataSourceChannelFactory implements DataSourceChannelFactory
 
     @Override
     public String getName() {
-        return "kyuubi";
+        return DbType.KYUUBI.getName();
     }
 
     @Override

diff --git a/...apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java b/...apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java
@@ -143,7 +143,7 @@ public void testGetJdbcUrl() {
     @Test
     public void testDbType() {
         Assertions.assertEquals(18, DbType.KYUUBI.getCode());
-        Assertions.assertEquals("kyuubi", DbType.KYUUBI.getDescp());
+        Assertions.assertEquals("kyuubi", DbType.KYUUBI.getName());
         Assertions.assertEquals(DbType.KYUUBI, DbType.of(18));
     }
 

diff --git a/...va/org/apache/dolphinscheduler/plugin/datasource/mysql/MySQLDataSourceChannelFactory.java b/...va/org/apache/dolphinscheduler/plugin/datasource/mysql/MySQLDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class MySQLDataSourceChannelFactory implements DataSourceChannelFactory {
 
     @Override
     public String getName() {
-        return "mysql";
+        return DbType.MYSQL.getName();
     }
 
     @Override

diff --git a/...pache/dolphinscheduler/plugin/datasource/oceanbase/OceanBaseDataSourceChannelFactory.java b/...pache/dolphinscheduler/plugin/datasource/oceanbase/OceanBaseDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class OceanBaseDataSourceChannelFactory implements DataSourceChannelFacto
 
     @Override
     public String getName() {
-        return "oceanbase";
+        return DbType.OCEANBASE.getName();
     }
 
     @Override

diff --git a/.../org/apache/dolphinscheduler/plugin/datasource/oracle/OracleDataSourceChannelFactory.java b/.../org/apache/dolphinscheduler/plugin/datasource/oracle/OracleDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class OracleDataSourceChannelFactory implements DataSourceChannelFactory
 
     @Override
     public String getName() {
-        return "oracle";
+        return DbType.ORACLE.getName();
     }
 
     @Override

diff --git a/...che/dolphinscheduler/plugin/datasource/postgresql/PostgreSQLDataSourceChannelFactory.java b/...che/dolphinscheduler/plugin/datasource/postgresql/PostgreSQLDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class PostgreSQLDataSourceChannelFactory implements DataSourceChannelFact
 
     @Override
     public String getName() {
-        return "postgresql";
+        return DbType.POSTGRESQL.getName();
     }
 
     @Override

diff --git a/.../org/apache/dolphinscheduler/plugin/datasource/presto/PrestoDataSourceChannelFactory.java b/.../org/apache/dolphinscheduler/plugin/datasource/presto/PrestoDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class PrestoDataSourceChannelFactory implements DataSourceChannelFactory
 
     @Override
     public String getName() {
-        return "presto";
+        return DbType.PRESTO.getName();
     }
 
     @Override

diff --git a/.../apache/dolphinscheduler/plugin/datasource/redshift/RedshiftDataSourceChannelFactory.java b/.../apache/dolphinscheduler/plugin/datasource/redshift/RedshiftDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -32,6 +33,6 @@ public DataSourceChannel create() {
 
     @Override
     public String getName() {
-        return "redshift";
+        return DbType.REDSHIFT.getName();
     }
 }
diff --git a/...pache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceChannelFactory.java b/...pache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -32,7 +33,7 @@ public DataSourceChannel create() {
 
     @Override
     public String getName() {
-        return "sagemaker";
+        return DbType.SAGEMAKER.getName();
     }
 
 }
diff --git a/...ache/dolphinscheduler/plugin/datasource/sagemaker/param/SagemakerDataSourceProcessor.java b/...ache/dolphinscheduler/plugin/datasource/sagemaker/param/SagemakerDataSourceProcessor.java
@@ -57,7 +57,7 @@ public void checkDatasourceParam(BaseDataSourceParamDTO datasourceParamDTO) {
     @Override
     public String getDatasourceUniqueId(ConnectionParam connectionParam, DbType dbType) {
         SagemakerConnectionParam baseConnectionParam = (SagemakerConnectionParam) connectionParam;
-        return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getDescp(),
+        return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getName(),
                 PasswordUtils.encodePassword(baseConnectionParam.getUserName()),
                 PasswordUtils.encodePassword(baseConnectionParam.getPassword()),
                 PasswordUtils.encodePassword(baseConnectionParam.getAwsRegion()));

diff --git a/...pache/dolphinscheduler/plugin/datasource/snowflake/SnowflakeDataSourceChannelFactory.java b/...pache/dolphinscheduler/plugin/datasource/snowflake/SnowflakeDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class SnowflakeDataSourceChannelFactory implements DataSourceChannelFacto
 
     @Override
     public String getName() {
-        return "snowflake";
+        return DbType.SNOWFLAKE.getName();
     }
 
     @Override

diff --git a/.../dolphinscheduler/plugin/datasource/snowflake/param/SnowflakeDataSourceProcessorTest.java b/.../dolphinscheduler/plugin/datasource/snowflake/param/SnowflakeDataSourceProcessorTest.java
@@ -169,7 +169,7 @@ public void testCreateDatasourceParamDTO() {
     @Test
     public void testDbType() {
         Assertions.assertEquals(20, DbType.SNOWFLAKE.getCode());
-        Assertions.assertEquals("snowflake", DbType.SNOWFLAKE.getDescp());
+        Assertions.assertEquals("snowflake", DbType.SNOWFLAKE.getName());
         Assertions.assertEquals(DbType.of(20), DbType.SNOWFLAKE);
         Assertions.assertEquals(DbType.ofName("SNOWFLAKE"), DbType.SNOWFLAKE);
     }

diff --git a/...va/org/apache/dolphinscheduler/plugin/datasource/spark/SparkDataSourceChannelFactory.java b/...va/org/apache/dolphinscheduler/plugin/datasource/spark/SparkDataSourceChannelFactory.java
@@ -19,6 +19,7 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import com.google.auto.service.AutoService;
 
@@ -27,7 +28,7 @@ public class SparkDataSourceChannelFactory implements DataSourceChannelFactory {
 
     @Override
     public String getName() {
-        return "spark";
+        return DbType.SPARK.getName();
     }
 
     @Override