Remove DataSourceUnitPersistService.deleteConfigurations

apache · May 25, 2024 · fd21d5a · fd21d5a
1 parent ade11bf
commit fd21d5a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 37 deletions.
diff --git a/...shardingsphere/metadata/persist/service/config/database/DataSourceNodePersistService.java b/...shardingsphere/metadata/persist/service/config/database/DataSourceNodePersistService.java
@@ -95,6 +95,10 @@ public void persist(final String databaseName, final Map<String, DataSourcePoolP
         }
     }
 
+    private String getDataSourceActiveVersion(final String databaseName, final String dataSourceName) {
+        return repository.query(DataSourceMetaDataNode.getDataSourceNodeActiveVersionNode(databaseName, dataSourceName));
+    }
+
     /**
      * Delete data source pool configuration.
      *
@@ -104,8 +108,4 @@ public void persist(final String databaseName, final Map<String, DataSourcePoolP
     public void delete(final String databaseName, final String dataSourceName) {
         repository.delete(DataSourceMetaDataNode.getDataSourceNodeNode(databaseName, dataSourceName));
     }
-
-    private String getDataSourceActiveVersion(final String databaseName, final String dataSourceName) {
-        return repository.query(DataSourceMetaDataNode.getDataSourceNodeActiveVersionNode(databaseName, dataSourceName));
-    }
 }
diff --git a/...shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java b/...shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java
@@ -106,23 +106,6 @@ public void delete(final String databaseName, final String dataSourceName) {
         repository.delete(DataSourceMetaDataNode.getDataSourceUnitNode(databaseName, dataSourceName));
     }
 
-    /**
-     * Delete data source pool configurations.
-     *
-     * @param databaseName database name
-     * @param dataSourceConfigs to be deleted configurations
-     * @return meta data versions
-     */
-    public Collection<MetaDataVersion> deleteConfigurations(final String databaseName, final Map<String, DataSourcePoolProperties> dataSourceConfigs) {
-        Collection<MetaDataVersion> result = new LinkedList<>();
-        for (Entry<String, DataSourcePoolProperties> entry : dataSourceConfigs.entrySet()) {
-            String delKey = DataSourceMetaDataNode.getDataSourceUnitNode(databaseName, entry.getKey());
-            repository.delete(delKey);
-            result.add(new MetaDataVersion(delKey));
-        }
-        return result;
-    }
-
     /**
      * Persist data source pool configurations.
      *

diff --git a/...e/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java b/...e/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
@@ -109,6 +109,10 @@ private Collection<MetaDataVersion> persistDataNodes(final String databaseName,
         return result;
     }
 
+    private String getActiveVersion(final String databaseName, final String ruleName, final String key) {
+        return repository.query(DatabaseRuleMetaDataNode.getDatabaseRuleActiveVersionNode(databaseName, ruleName, key));
+    }
+
     /**
      * Delete configurations.
      *
@@ -150,8 +154,4 @@ private Collection<MetaDataVersion> deleteRepositoryTuples(final String database
         }
         return result;
     }
-
-    private String getActiveVersion(final String databaseName, final String ruleName, final String key) {
-        return repository.query(DatabaseRuleMetaDataNode.getDatabaseRuleActiveVersionNode(databaseName, ruleName, key));
-    }
 }
diff --git a/...che/shardingsphere/mode/manager/cluster/service/ClusterMetaDataManagerPersistService.java b/...che/shardingsphere/mode/manager/cluster/service/ClusterMetaDataManagerPersistService.java
@@ -34,7 +34,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
@@ -106,19 +105,14 @@ public void alterStorageUnits(final String databaseName, final Map<String, DataS
 
     @Override
     public void unregisterStorageUnits(final String databaseName, final Collection<String> toBeDroppedStorageUnitNames) {
-        contextManager.getPersistServiceFacade().getMetaDataPersistService().getDataSourceUnitService().deleteConfigurations(databaseName,
-                getToBeDroppedDataSourcePoolProperties(contextManager.getPersistServiceFacade().getMetaDataPersistService()
-                        .getDataSourceUnitService().load(databaseName), toBeDroppedStorageUnitNames));
+        for (String each : getToBeDroppedResourceNames(databaseName, toBeDroppedStorageUnitNames)) {
+            contextManager.getPersistServiceFacade().getMetaDataPersistService().getDataSourceUnitService().delete(databaseName, each);
+        }
     }
 
-    private Map<String, DataSourcePoolProperties> getToBeDroppedDataSourcePoolProperties(final Map<String, DataSourcePoolProperties> propsMap, final Collection<String> toBeDroppedResourceNames) {
-        Map<String, DataSourcePoolProperties> result = new LinkedHashMap<>(toBeDroppedResourceNames.size(), 1F);
-        for (String each : toBeDroppedResourceNames) {
-            if (propsMap.containsKey(each)) {
-                result.put(each, propsMap.get(each));
-            }
-        }
-        return result;
+    private Collection<String> getToBeDroppedResourceNames(final String databaseName, final Collection<String> toBeDroppedResourceNames) {
+        Map<String, DataSourcePoolProperties> propsMap = contextManager.getPersistServiceFacade().getMetaDataPersistService().getDataSourceUnitService().load(databaseName);
+        return toBeDroppedResourceNames.stream().filter(propsMap::containsKey).collect(Collectors.toList());
     }
 
     @Override