This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new b5b5d07fdd2 Remove DataSourceUnitPersistService.deleteConfigurations
(#31385)
b5b5d07fdd2 is described below
commit b5b5d07fdd217d8e462302e007313ba6c19cc406
Author: Liang Zhang <[email protected]>
AuthorDate: Sat May 25 15:52:44 2024 +0800
Remove DataSourceUnitPersistService.deleteConfigurations (#31385)
---
.../config/database/DataSourceNodePersistService.java | 8 ++++----
.../config/database/DataSourceUnitPersistService.java | 17 -----------------
.../config/database/DatabaseRulePersistService.java | 8 ++++----
.../service/ClusterMetaDataManagerPersistService.java | 18 ++++++------------
4 files changed, 14 insertions(+), 37 deletions(-)
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceNodePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceNodePersistService.java
index 3859fab5834..15b81a1b8f4 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceNodePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceNodePersistService.java
@@ -95,6 +95,10 @@ public final class DataSourceNodePersistService {
}
}
+ 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 final class DataSourceNodePersistService {
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/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java
index 367ff0b769a..18c3a13eb42 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java
@@ -106,23 +106,6 @@ public final class DataSourceUnitPersistService {
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/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
index 90cce430fbd..1f89b6bb63d 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
@@ -109,6 +109,10 @@ public final class DatabaseRulePersistService {
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 @@ public final class DatabaseRulePersistService {
}
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/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/service/ClusterMetaDataManagerPersistService.java
index 40997eb0e4f..71a0a21ce06 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/service/ClusterMetaDataManagerPersistService.java
@@ -34,7 +34,6 @@ import
org.apache.shardingsphere.single.api.config.SingleRuleConfiguration;
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 final class ClusterMetaDataManagerPersistService
implements MetaDataManag
@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
