[shardingsphere] branch master updated: Remove useless codes for ContextManager (#18741)

[yx9o]

This is an automated email from the ASF dual-hosted git repository.

yx9o 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 450457cd62a Remove useless codes for ContextManager (#18741)
450457cd62a is described below

commit 450457cd62a68fefd7e2488b6e957a5210e76d0e
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Jun 30 21:13:50 2022 +0800

    Remove useless codes for ContextManager (#18741)
---
 .../mode/manager/ContextManager.java               | 27 ++++------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git 
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
 
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 4def6fb484b..f944c1f3e6b 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -37,7 +37,6 @@ import 
org.apache.shardingsphere.infra.instance.InstanceContext;
 import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabasesFactory;
-import 
org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResource;
 import 
org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
 import 
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilder;
 import 
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterials;
@@ -192,11 +191,6 @@ public final class ContextManager implements AutoCloseable 
{
         }
     }
     
-    private void persistMetaData(final MetaDataContexts metaDataContexts) {
-        metaDataContexts.getMetaData().getDatabases().forEach((databaseName, 
schemas) -> schemas.getSchemas()
-                .forEach((schemaName, tables) -> 
metaDataContexts.getPersistService().ifPresent(optional -> 
optional.getSchemaMetaDataService().persistMetaData(databaseName, schemaName, 
tables))));
-    }
-    
     private void refreshRules(final ShardingSphereDatabase database) {
         Collection<ShardingSphereRule> databaseRules = 
DatabaseRulesBuilder.build(
                 database.getName(), new 
DataSourceProvidedDatabaseConfiguration(database.getResource().getDataSources(),
 database.getRuleMetaData().getConfigurations()));
@@ -523,7 +517,7 @@ public final class ContextManager implements AutoCloseable {
         
metaDataContexts.getMetaData().getGlobalRuleMetaData().findRules(ResourceHeldRule.class).forEach(ResourceHeldRule::closeStaleResources);
         
metaDataContexts.getMetaData().getDatabases().get(databaseName).getRuleMetaData().findRules(ResourceHeldRule.class).forEach(ResourceHeldRule::closeStaleResources);
         renewMetaDataContexts(newMetaDataContexts);
-        closeDataSources(databaseName, pendingClosedDataSources);
+        
pendingClosedDataSources.forEach(metaDataContexts.getMetaData().getDatabases().get(databaseName).getResource()::close);
     }
     
     private MetaDataContexts 
buildChangedMetaDataContextWithAddedDataSource(final ShardingSphereDatabase 
originalDatabase,
@@ -604,22 +598,9 @@ public final class ContextManager implements AutoCloseable 
{
         return 
DataSourcePoolCreator.create(getChangedDataSourceConfiguration(originalDatabase,
 newDataSourcePropsMap));
     }
     
-    private void closeDataSources(final ShardingSphereDatabase 
toBeRemovedDatabase) {
-        if (null != toBeRemovedDatabase.getResource()) {
-            
toBeRemovedDatabase.getResource().getDataSources().values().forEach(each -> 
toBeRemovedDatabase.getResource().close(each));
-        }
-    }
-    
-    private void closeDataSources(final String databaseName, final 
Collection<DataSource> dataSources) {
-        ShardingSphereResource resource = 
metaDataContexts.getMetaData().getDatabases().get(databaseName).getResource();
-        dataSources.forEach(resource::close);
-    }
-    
-    private void removeAndCloseResource(final String databaseName, final 
ShardingSphereDatabase database) {
-        
metaDataContexts.getMetaData().getGlobalRuleMetaData().getRules().stream()
-                .filter(each -> each instanceof ResourceHeldRule).map(each -> 
(ResourceHeldRule<?>) each).forEach(each -> 
each.closeStaleResource(databaseName));
-        database.getRuleMetaData().getRules().stream()
-                .filter(each -> each instanceof ResourceHeldRule).map(each -> 
(ResourceHeldRule<?>) each).forEach(each -> 
each.closeStaleResource(databaseName));
+    private void persistMetaData(final MetaDataContexts metaDataContexts) {
+        metaDataContexts.getMetaData().getDatabases().forEach((databaseName, 
schemas) -> schemas.getSchemas()
+                .forEach((schemaName, tables) -> 
metaDataContexts.getPersistService().ifPresent(optional -> 
optional.getSchemaMetaDataService().persistMetaData(databaseName, schemaName, 
tables))));
     }
     
     @Override