[Chore] Remove unused JDBCDataSourceProvider (#16881)

apache · Dec 7, 2024 · 0d9dba2 · 0d9dba2
1 parent 28e849e
commit 0d9dba2
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 414 deletions.
diff --git a/...va/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java b/...va/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceClientProvider.java
@@ -30,7 +30,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
@@ -69,8 +68,7 @@ public static DataSourceClient getPooledDataSourceClient(DbType dbType,
         BaseConnectionParam baseConnectionParam = (BaseConnectionParam) connectionParam;
         String datasourceUniqueId = DataSourceUtils.getDatasourceUniqueId(baseConnectionParam, dbType);
         return POOLED_DATASOURCE_CLIENT_CACHE.get(datasourceUniqueId, () -> {
-            Map<String, DataSourceChannel> dataSourceChannelMap = dataSourcePluginManager.getDataSourceChannelMap();
-            DataSourceChannel dataSourceChannel = dataSourceChannelMap.get(dbType.getName());
+            DataSourceChannel dataSourceChannel = dataSourcePluginManager.getDataSourceChannel(dbType);
             if (null == dataSourceChannel) {
                 throw new RuntimeException(String.format("datasource plugin '%s' is not found", dbType.getName()));
             }
@@ -85,8 +83,7 @@ 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.getName());
+        DataSourceChannel dataSourceChannel = dataSourcePluginManager.getDataSourceChannel(dbType);
         if (null == dataSourceChannel) {
             throw new RuntimeException(String.format("datasource plugin '%s' is not found", dbType.getName()));
         }

diff --git a/...ava/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourcePluginManager.java b/...ava/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourcePluginManager.java
@@ -21,9 +21,9 @@
 
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel;
 import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory;
+import org.apache.dolphinscheduler.spi.enums.DbType;
 import org.apache.dolphinscheduler.spi.plugin.PrioritySPIFactory;
 
-import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -34,8 +34,8 @@ public class DataSourcePluginManager {
 
     private final Map<String, DataSourceChannel> datasourceChannelMap = new ConcurrentHashMap<>();
 
-    public Map<String, DataSourceChannel> getDataSourceChannelMap() {
-        return Collections.unmodifiableMap(datasourceChannelMap);
+    public DataSourceChannel getDataSourceChannel(final DbType dbType) {
+        return datasourceChannelMap.get(dbType.getName());
     }
 
     public void installPlugin() {

diff --git a/...va/org/apache/dolphinscheduler/plugin/datasource/api/provider/JDBCDataSourceProvider.java b/...va/org/apache/dolphinscheduler/plugin/datasource/api/provider/JDBCDataSourceProvider.java
diff --git a/...st/java/org/apache/dolphinscheduler/plugin/doris/provider/JDBCDataSourceProviderTest.java b/...st/java/org/apache/dolphinscheduler/plugin/doris/provider/JDBCDataSourceProviderTest.java
diff --git a/...g/apache/dolphinscheduler/plugin/datasource/hana/provider/JDBCDataSourceProviderTest.java b/...g/apache/dolphinscheduler/plugin/datasource/hana/provider/JDBCDataSourceProviderTest.java
diff --git a/.../dolphinscheduler/plugin/datasource/kyuubi/provider/KyuubiJDBCDataSourceProviderTest.java b/.../dolphinscheduler/plugin/datasource/kyuubi/provider/KyuubiJDBCDataSourceProviderTest.java
diff --git a/.../apache/dolphinscheduler/plugin/datasource/mysql/provider/JDBCDataSourceProviderTest.java b/.../apache/dolphinscheduler/plugin/datasource/mysql/provider/JDBCDataSourceProviderTest.java