fix: fix update datasource may not update other cluster service

running-elephant · Dec 23, 2024 · a0f5b6a · a0f5b6a
1 parent 1e6be99
commit a0f5b6a
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/data-providers/jdbc-data-provider/src/main/java/datart/data/provider/JdbcDataProvider.java b/data-providers/jdbc-data-provider/src/main/java/datart/data/provider/JdbcDataProvider.java
@@ -143,14 +143,33 @@ private JdbcProperties conv2JdbcProperties(DataProviderSource config) {
     private JdbcDataProviderAdapter matchProviderAdapter(DataProviderSource source) {
         JdbcDataProviderAdapter adapter;
         adapter = cachedProviders.get(source.getSourceId());
-        if (adapter != null) {
-            return adapter;
+        boolean needCreateNewDataProvider = (adapter == null || !equalJdbcPropertiesAndDataProviderSource(adapter.getJdbcProperties(), source));
+        if (needCreateNewDataProvider) {
+            if (adapter != null) {
+                resetSource(source);
+            }
+            adapter = ProviderFactory.createDataProvider(conv2JdbcProperties(source), true);
+            cachedProviders.put(source.getSourceId(), adapter);
         }
-        adapter = ProviderFactory.createDataProvider(conv2JdbcProperties(source), true);
-        cachedProviders.put(source.getSourceId(), adapter);
         return adapter;
     }
 
+    private boolean equalJdbcPropertiesAndDataProviderSource(JdbcProperties jdbcProperties, DataProviderSource source) {
+        Map<String, Object> dataSourceProperties = source.getProperties();
+        if (jdbcProperties == null || dataSourceProperties == null) {
+            return false;
+        }
+        return Objects.equals(jdbcProperties.getDbType(), Optional.ofNullable(dataSourceProperties.get(DB_TYPE)).orElse("").toString().toUpperCase())
+                && Objects.equals(jdbcProperties.getUrl(), Optional.ofNullable(dataSourceProperties.get(URL)).orElse("").toString())
+                && Objects.equals(jdbcProperties.getUser(), Optional.ofNullable(dataSourceProperties.get(USER)).orElse("").toString())
+                && Objects.equals(jdbcProperties.getPassword(), Optional.ofNullable(dataSourceProperties.get(PASSWORD)).orElse("").toString())
+                && Objects.equals(jdbcProperties.getDriverClass(), Optional.ofNullable(dataSourceProperties.get(DRIVER_CLASS)).orElse("").toString())
+                && Objects.equals(String.valueOf(jdbcProperties.isEnableSpecialSql())
+                , Optional.ofNullable(dataSourceProperties.get(ENABLE_SPECIAL_SQL)).orElse("false").toString())
+                && Objects.equals(new HashMap<String, String>((Map) Optional.ofNullable(jdbcProperties.getProperties()).orElse(new Properties())).toString()
+                , (new HashMap<String, String>((Map) Optional.ofNullable(dataSourceProperties.get("properties")).orElse(new HashMap<>(0)))).toString());
+    }
+
     @Override
     public Set<StdSqlOperator> supportedStdFunctions(DataProviderSource source) {