This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 7a55adeae9 [Improvement-15919][datasource] Improvement datasource get
name (#15920)
7a55adeae9 is described below
commit 7a55adeae9d9c5e8bc813d952322c8da1aabdc99
Author: 小可耐 <[email protected]>
AuthorDate: Sun Apr 28 11:02:44 2024 +0800
[Improvement-15919][datasource] Improvement datasource get name (#15920)
---
.../datasource/AbstractDataSourceProcessor.java | 2 +-
.../api/plugin/DataSourceClientProvider.java | 8 +--
.../athena/AthenaDataSourceChannelFactory.java | 3 +-
.../azuresql/AzureSQLDataSourceChannelFactory.java | 3 +-
.../ClickHouseDataSourceChannelFactory.java | 3 +-
.../dameng/DamengDataSourceChannelFactory.java | 2 +-
.../databend/DatabendDataSourceChannelFactory.java | 3 +-
.../param/DatabendDataSourceProcessorTest.java | 2 +-
.../db2/DB2DataSourceChannelFactory.java | 3 +-
.../doris/DorisDataSourceChannelFactory.java | 2 +-
.../hana/HanaDataSourceChannelFactory.java | 3 +-
.../hive/HiveDataSourceChannelFactory.java | 3 +-
.../k8s/K8sDataSourceChannelFactory.java | 3 +-
.../k8s/param/K8sDataSourceProcessor.java | 2 +-
.../kyuubi/KyuubiDataSourceChannelFactory.java | 3 +-
.../param/KyuubiDataSourceProcessorTest.java | 2 +-
.../mysql/MySQLDataSourceChannelFactory.java | 3 +-
.../OceanBaseDataSourceChannelFactory.java | 3 +-
.../oracle/OracleDataSourceChannelFactory.java | 3 +-
.../PostgreSQLDataSourceChannelFactory.java | 3 +-
.../presto/PrestoDataSourceChannelFactory.java | 3 +-
.../redshift/RedshiftDataSourceChannelFactory.java | 3 +-
.../SagemakerDataSourceChannelFactory.java | 3 +-
.../param/SagemakerDataSourceProcessor.java | 2 +-
.../SnowflakeDataSourceChannelFactory.java | 3 +-
.../param/SnowflakeDataSourceProcessorTest.java | 2 +-
.../spark/SparkDataSourceChannelFactory.java | 3 +-
.../SQLServerDataSourceChannelFactory.java | 3 +-
.../ssh/SSHDataSourceChannelFactory.java | 3 +-
.../ssh/param/SSHDataSourceProcessor.java | 2 +-
.../StarRocksDataSourceChannelFactory.java | 2 +-
.../trino/TrinoDataSourceChannelFactory.java | 3 +-
.../vertica/VerticaDataSourceChannelFactory.java | 3 +-
.../zeppelin/ZeppelinDataSourceChannelFactory.java | 3 +-
.../param/ZeppelinDataSourceProcessor.java | 2 +-
.../apache/dolphinscheduler/spi/enums/DbType.java | 62 ++++++++++++----------
36 files changed, 95 insertions(+), 66 deletions(-)
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
index 98222a2c5a..4acf531ddc 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
@@ -118,7 +118,7 @@ public abstract class AbstractDataSourceProcessor
implements DataSourceProcessor
@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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java
index 839a4c5d61..7223fe62a3 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java
@@ -69,9 +69,9 @@ public class DataSourceClientProvider {
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 class DataSourceClientProvider {
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/src/main/java/org/apache/dolphinscheduler/plugin/datasource/athena/AthenaDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/src/main/java/org/apache/dolphinscheduler/plugin/datasource/athena/AthenaDataSourceChannelFactory.java
index 1b2ed367d0..b4759db39a 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/src/main/java/org/apache/dolphinscheduler/plugin/datasource/athena/AthenaDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/src/main/java/org/apache/dolphinscheduler/plugin/datasource/athena/AthenaDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.athena;
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 class AthenaDataSourceChannelFactory implements
DataSourceChannelFactory
@Override
public String getName() {
- return "athena";
+ return DbType.ATHENA.getName();
}
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/azuresql/AzureSQLDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/azuresql/AzureSQLDataSourceChannelFactory.java
index 5966848f33..2b8cdca973 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/azuresql/AzureSQLDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/azuresql/AzureSQLDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.azuresql;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/src/main/java/org/apache/dolphinscheduler/plugin/datasource/clickhouse/ClickHouseDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/src/main/java/org/apache/dolphinscheduler/plugin/datasource/clickhouse/ClickHouseDataSourceChannelFactory.java
index d756226522..77d0feb1d1 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/src/main/java/org/apache/dolphinscheduler/plugin/datasource/clickhouse/ClickHouseDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/src/main/java/org/apache/dolphinscheduler/plugin/datasource/clickhouse/ClickHouseDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.clickhouse;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/src/main/java/org/apache/dolphinscheduler/plugin/datasource/dameng/DamengDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/src/main/java/org/apache/dolphinscheduler/plugin/datasource/dameng/DamengDataSourceChannelFactory.java
index 945f6610c0..84ae080134 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/src/main/java/org/apache/dolphinscheduler/plugin/datasource/dameng/DamengDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/src/main/java/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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/main/java/org/apache/dolphinscheduler/plugin/datasource/databend/DatabendDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/main/java/org/apache/dolphinscheduler/plugin/datasource/databend/DatabendDataSourceChannelFactory.java
index 0ea40c3b13..3c86601dd7 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/main/java/org/apache/dolphinscheduler/plugin/datasource/databend/DatabendDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/main/java/org/apache/dolphinscheduler/plugin/datasource/databend/DatabendDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.databend;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/test/java/org/apache/dolphinscheduler/plugin/datasource/databend/param/DatabendDataSourceProcessorTest.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/test/java/org/apache/dolphinscheduler/plugin/datasource/databend/param/DatabendDataSourceProcessorTest.java
index f225a2fd3d..cb41c6562b 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/test/java/org/apache/dolphinscheduler/plugin/datasource/databend/param/DatabendDataSourceProcessorTest.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/src/test/java/org/apache/dolphinscheduler/plugin/datasource/databend/param/DatabendDataSourceProcessorTest.java
@@ -151,7 +151,7 @@ public class DatabendDataSourceProcessorTest {
@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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/src/main/java/org/apache/dolphinscheduler/plugin/datasource/db2/DB2DataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/src/main/java/org/apache/dolphinscheduler/plugin/datasource/db2/DB2DataSourceChannelFactory.java
index cda8a2e592..3bbae238ea 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/src/main/java/org/apache/dolphinscheduler/plugin/datasource/db2/DB2DataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/src/main/java/org/apache/dolphinscheduler/plugin/datasource/db2/DB2DataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.db2;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/src/main/java/org/apache/dolphinscheduler/plugin/doris/DorisDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/src/main/java/org/apache/dolphinscheduler/plugin/doris/DorisDataSourceChannelFactory.java
index d663c362f2..7180a6c6c2 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/src/main/java/org/apache/dolphinscheduler/plugin/doris/DorisDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/src/main/java/org/apache/dolphinscheduler/plugin/doris/DorisDataSourceChannelFactory.java
@@ -32,6 +32,6 @@ public class DorisDataSourceChannelFactory implements
DataSourceChannelFactory {
@Override
public String getName() {
- return DbType.DORIS.getDescp();
+ return DbType.DORIS.getName();
}
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelFactory.java
index 75aacebaff..91d275aab6 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hana/HanaDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.hana;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/HiveDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/HiveDataSourceChannelFactory.java
index 96ee007c8d..2caa4092dc 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/HiveDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/HiveDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.hive;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java
index 03ec046de8..6a4428b47b 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.k8s;
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 class K8sDataSourceChannelFactory implements
DataSourceChannelFactory {
@Override
public String getName() {
- return "k8s";
+ return DbType.K8S.getName();
}
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java
index 9e7342d433..fd3b49469f 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java
@@ -58,7 +58,7 @@ public class K8sDataSourceProcessor extends
AbstractDataSourceProcessor {
@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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java
index 4c67a2098f..c60e74ccf8 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.kyuubi;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java
index 865565c5dc..a18ceb4216 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java
@@ -143,7 +143,7 @@ public class KyuubiDataSourceProcessorTest {
@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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/mysql/MySQLDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/mysql/MySQLDataSourceChannelFactory.java
index e57fc7e61d..adc3ec7946 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/mysql/MySQLDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/mysql/MySQLDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.mysql;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/src/main/java/org/apache/dolphinscheduler/plugin/datasource/oceanbase/OceanBaseDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/src/main/java/org/apache/dolphinscheduler/plugin/datasource/oceanbase/OceanBaseDataSourceChannelFactory.java
index a69d6b3ae5..13650679b0 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/src/main/java/org/apache/dolphinscheduler/plugin/datasource/oceanbase/OceanBaseDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/src/main/java/org/apache/dolphinscheduler/plugin/datasource/oceanbase/OceanBaseDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.oceanbase;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/src/main/java/org/apache/dolphinscheduler/plugin/datasource/oracle/OracleDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/src/main/java/org/apache/dolphinscheduler/plugin/datasource/oracle/OracleDataSourceChannelFactory.java
index dedbce4946..f63aff9a2b 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/src/main/java/org/apache/dolphinscheduler/plugin/datasource/oracle/OracleDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/src/main/java/org/apache/dolphinscheduler/plugin/datasource/oracle/OracleDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.oracle;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/postgresql/PostgreSQLDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/postgresql/PostgreSQLDataSourceChannelFactory.java
index 8aa6e566b7..e82a2e6860 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/postgresql/PostgreSQLDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/src/main/java/org/apache/dolphinscheduler/plugin/datasource/postgresql/PostgreSQLDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.postgresql;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/PrestoDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/PrestoDataSourceChannelFactory.java
index ed1292ffc9..76bf9d0808 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/PrestoDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/PrestoDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.presto;
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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/src/main/java/org/apache/dolphinscheduler/plugin/datasource/redshift/RedshiftDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/src/main/java/org/apache/dolphinscheduler/plugin/datasource/redshift/RedshiftDataSourceChannelFactory.java
index 25a587ae06..8c588f0b44 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/src/main/java/org/apache/dolphinscheduler/plugin/datasource/redshift/RedshiftDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/src/main/java/org/apache/dolphinscheduler/plugin/datasource/redshift/RedshiftDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.redshift;
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 class RedshiftDataSourceChannelFactory implements
DataSourceChannelFactor
@Override
public String getName() {
- return "redshift";
+ return DbType.REDSHIFT.getName();
}
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceChannelFactory.java
index 04ab93f36f..2457843614 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.sagemaker;
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 class SagemakerDataSourceChannelFactory implements
DataSourceChannelFacto
@Override
public String getName() {
- return "sagemaker";
+ return DbType.SAGEMAKER.getName();
}
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/param/SagemakerDataSourceProcessor.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/param/SagemakerDataSourceProcessor.java
index 4239f45e5c..7452ef8a14 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/param/SagemakerDataSourceProcessor.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/param/SagemakerDataSourceProcessor.java
@@ -57,7 +57,7 @@ public class SagemakerDataSourceProcessor extends
AbstractDataSourceProcessor {
@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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/src/main/java/org/apache/dolphinscheduler/plugin/datasource/snowflake/SnowflakeDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/src/main/java/org/apache/dolphinscheduler/plugin/datasource/snowflake/SnowflakeDataSourceChannelFactory.java
index 0d0c97ecd6..6bbfd7a6fb 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/src/main/java/org/apache/dolphinscheduler/plugin/datasource/snowflake/SnowflakeDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/src/main/java/org/apache/dolphinscheduler/plugin/datasource/snowflake/SnowflakeDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.snowflake;
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-datasource-plugin/dolphinscheduler-datasource-snowflake/src/test/java/org/apache/dolphinscheduler/plugin/datasource/snowflake/param/SnowflakeDataSourceProcessorTest.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/src/test/java/org/apache/dolphinscheduler/plugin/datasource/snowflake/param/SnowflakeDataSourceProcessorTest.java
index 54c5acf0f2..c60e70576f 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/src/test/java/org/apache/dolphinscheduler/plugin/datasource/snowflake/param/SnowflakeDataSourceProcessorTest.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/src/test/java/org/apache/dolphinscheduler/plugin/datasource/snowflake/param/SnowflakeDataSourceProcessorTest.java
@@ -169,7 +169,7 @@ public class SnowflakeDataSourceProcessorTest {
@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/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/src/main/java/org/apache/dolphinscheduler/plugin/datasource/spark/SparkDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/src/main/java/org/apache/dolphinscheduler/plugin/datasource/spark/SparkDataSourceChannelFactory.java
index dbda3da5bd..25f29ff21f 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/src/main/java/org/apache/dolphinscheduler/plugin/datasource/spark/SparkDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/src/main/java/org/apache/dolphinscheduler/plugin/datasource/spark/SparkDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.spark;
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
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sqlserver/SQLServerDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sqlserver/SQLServerDataSourceChannelFactory.java
index e76f520d1e..f29cf6415e 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sqlserver/SQLServerDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/src/main/java/org/apache/dolphinscheduler/plugin/datasource/sqlserver/SQLServerDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.sqlserver;
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 SQLServerDataSourceChannelFactory implements
DataSourceChannelFacto
@Override
public String getName() {
- return "sqlserver";
+ return DbType.SQLSERVER.getName();
}
@Override
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/SSHDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/SSHDataSourceChannelFactory.java
index 3195432703..9742c97e9b 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/SSHDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/SSHDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.ssh;
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 SSHDataSourceChannelFactory implements
DataSourceChannelFactory {
@Override
public String getName() {
- return "ssh";
+ return DbType.SSH.getName();
}
@Override
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/param/SSHDataSourceProcessor.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/param/SSHDataSourceProcessor.java
index 6bf0bed1b9..1916edba35 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/param/SSHDataSourceProcessor.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/src/main/java/org/apache/dolphinscheduler/plugin/datasource/ssh/param/SSHDataSourceProcessor.java
@@ -55,7 +55,7 @@ public class SSHDataSourceProcessor extends
AbstractDataSourceProcessor {
@Override
public String getDatasourceUniqueId(ConnectionParam connectionParam,
DbType dbType) {
SSHConnectionParam baseConnectionParam = (SSHConnectionParam)
connectionParam;
- return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getDescp(),
baseConnectionParam.getHost(),
+ return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getName(),
baseConnectionParam.getHost(),
baseConnectionParam.getUser(),
PasswordUtils.encodePassword(baseConnectionParam.getPassword()));
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/src/main/java/org/apache/dolphinscheduler/plugin/datasource/starrocks/StarRocksDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/src/main/java/org/apache/dolphinscheduler/plugin/datasource/starrocks/StarRocksDataSourceChannelFactory.java
index 50e2483952..82f78cff21 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/src/main/java/org/apache/dolphinscheduler/plugin/datasource/starrocks/StarRocksDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/src/main/java/org/apache/dolphinscheduler/plugin/datasource/starrocks/StarRocksDataSourceChannelFactory.java
@@ -33,6 +33,6 @@ public class StarRocksDataSourceChannelFactory implements
DataSourceChannelFacto
@Override
public String getName() {
- return DbType.STARROCKS.getDescp();
+ return DbType.STARROCKS.getName();
}
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/src/main/java/org/apache/dolphinscheduler/plugin/datasource/trino/TrinoDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/src/main/java/org/apache/dolphinscheduler/plugin/datasource/trino/TrinoDataSourceChannelFactory.java
index 8c9605d791..36a3817fb0 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/src/main/java/org/apache/dolphinscheduler/plugin/datasource/trino/TrinoDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/src/main/java/org/apache/dolphinscheduler/plugin/datasource/trino/TrinoDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.trino;
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 TrinoDataSourceChannelFactory implements
DataSourceChannelFactory {
@Override
public String getName() {
- return "trino";
+ return DbType.TRINO.getName();
}
@Override
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/src/main/java/org/apache/dolphinscheduler/plugin/datasource/vertica/VerticaDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/src/main/java/org/apache/dolphinscheduler/plugin/datasource/vertica/VerticaDataSourceChannelFactory.java
index b507a207b4..44e151f2f2 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/src/main/java/org/apache/dolphinscheduler/plugin/datasource/vertica/VerticaDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/src/main/java/org/apache/dolphinscheduler/plugin/datasource/vertica/VerticaDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.plugin.datasource.vertica;
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 VerticaDataSourceChannelFactory implements
DataSourceChannelFactory
@Override
public String getName() {
- return "vertica";
+ return DbType.VERTICA.getName();
}
@Override
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/datasource/zeppelin/ZeppelinDataSourceChannelFactory.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/datasource/zeppelin/ZeppelinDataSourceChannelFactory.java
index 692819cf78..559ee55836 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/datasource/zeppelin/ZeppelinDataSourceChannelFactory.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/datasource/zeppelin/ZeppelinDataSourceChannelFactory.java
@@ -19,6 +19,7 @@ package
org.apache.dolphinscheduler.plugin.datasource.zeppelin;
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 class ZeppelinDataSourceChannelFactory implements
DataSourceChannelFactor
@Override
public String getName() {
- return "zeppelin";
+ return DbType.ZEPPELIN.getName();
}
}
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/datasource/zeppelin/param/ZeppelinDataSourceProcessor.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/datasource/zeppelin/param/ZeppelinDataSourceProcessor.java
index 92077275ad..88a913974e 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/datasource/zeppelin/param/ZeppelinDataSourceProcessor.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/datasource/zeppelin/param/ZeppelinDataSourceProcessor.java
@@ -56,7 +56,7 @@ public class ZeppelinDataSourceProcessor extends
AbstractDataSourceProcessor {
@Override
public String getDatasourceUniqueId(ConnectionParam connectionParam,
DbType dbType) {
ZeppelinConnectionParam baseConnectionParam =
(ZeppelinConnectionParam) connectionParam;
- return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getDescp(),
baseConnectionParam.getRestEndpoint(),
+ return MessageFormat.format("{0}@{1}@{2}@{3}", dbType.getName(),
baseConnectionParam.getRestEndpoint(),
baseConnectionParam.getUsername(),
PasswordUtils.encodePassword(baseConnectionParam.getPassword()));
}
diff --git
a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java
b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java
index e7ebbeee0a..882b170e11 100644
---
a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java
+++
b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java
@@ -28,42 +28,44 @@ import com.google.common.base.Functions;
public enum DbType {
- MYSQL(0, "mysql"),
- POSTGRESQL(1, "postgresql"),
- HIVE(2, "hive"),
- SPARK(3, "spark"),
- CLICKHOUSE(4, "clickhouse"),
- ORACLE(5, "oracle"),
- SQLSERVER(6, "sqlserver"),
- DB2(7, "db2"),
- PRESTO(8, "presto"),
- H2(9, "h2"),
- REDSHIFT(10, "redshift"),
- ATHENA(11, "athena"),
- TRINO(12, "trino"),
- STARROCKS(13, "starrocks"),
- AZURESQL(14, "azuresql"),
- DAMENG(15, "dameng"),
- OCEANBASE(16, "oceanbase"),
- SSH(17, "ssh"),
- KYUUBI(18, "kyuubi"),
- DATABEND(19, "databend"),
- SNOWFLAKE(20, "snowflake"),
- VERTICA(21, "vertica"),
- HANA(22, "hana"),
- DORIS(23, "doris"),
- ZEPPELIN(24, "zeppelin"),
- SAGEMAKER(25, "sagemaker"),
+ MYSQL(0, "mysql", "mysql"),
+ POSTGRESQL(1, "postgresql", "postgresql"),
+ HIVE(2, "hive", "hive"),
+ SPARK(3, "spark", "spark"),
+ CLICKHOUSE(4, "clickhouse", "clickhouse"),
+ ORACLE(5, "oracle", "oracle"),
+ SQLSERVER(6, "sqlserver", "sqlserver"),
+ DB2(7, "db2", "db2"),
+ PRESTO(8, "presto", "presto"),
+ H2(9, "h2", "h2"),
+ REDSHIFT(10, "redshift", "redshift"),
+ ATHENA(11, "athena", "athena"),
+ TRINO(12, "trino", "trino"),
+ STARROCKS(13, "starrocks", "starrocks"),
+ AZURESQL(14, "azuresql", "azuresql"),
+ DAMENG(15, "dameng", "dameng"),
+ OCEANBASE(16, "oceanbase", "oceanbase"),
+ SSH(17, "ssh", "ssh"),
+ KYUUBI(18, "kyuubi", "kyuubi"),
+ DATABEND(19, "databend", "databend"),
+ SNOWFLAKE(20, "snowflake", "snowflake"),
+ VERTICA(21, "vertica", "vertica"),
+ HANA(22, "hana", "hana"),
+ DORIS(23, "doris", "doris"),
+ ZEPPELIN(24, "zeppelin", "zeppelin"),
+ SAGEMAKER(25, "sagemaker", "sagemaker"),
- K8S(26, "k8s");
+ K8S(26, "k8s", "k8s");
private static final Map<Integer, DbType> DB_TYPE_MAP =
Arrays.stream(DbType.values()).collect(toMap(DbType::getCode,
Functions.identity()));
@EnumValue
private final int code;
+ private final String name;
private final String descp;
- DbType(int code, String descp) {
+ DbType(int code, String name, String descp) {
this.code = code;
+ this.name = name;
this.descp = descp;
}
@@ -83,6 +85,10 @@ public enum DbType {
return code;
}
+ public String getName() {
+ return name;
+ }
+
public String getDescp() {
return descp;
}
