[shardingsphere] branch master updated: fixes TODO for load global rules from registry center (#11504)

[zhangliang]

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

zhangliang 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 7609eb5  fixes TODO for load global rules from registry center (#11504)
7609eb5 is described below

commit 7609eb5653dd6b61cf3aad9030240213f74ea5af
Author: Haoran Meng <menghaora...@gmail.com>
AuthorDate: Mon Jul 26 12:52:13 2021 +0800

    fixes TODO for load global rules from registry center (#11504)
---
 .../governance/context/metadata/GovernanceMetaDataContexts.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
 
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
index 01bdeb8..654889e 100644
--- 
a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
+++ 
b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
@@ -360,7 +360,6 @@ public final class GovernanceMetaDataContexts implements 
MetaDataContexts {
                 configCenter.getDataSourceService().load(schemaName)));
         MetaDataContextsBuilder metaDataContextsBuilder = new 
MetaDataContextsBuilder(dataSourcesMap,
                 Collections.singletonMap(schemaName, 
configCenter.getSchemaRuleService().load(schemaName)),
-                // TODO load global schema from reg center
                 configCenter.getGlobalRuleService().load(), 
                 metaDataContexts.getProps().getProps());
         return 
metaDataContextsBuilder.build(configCenter).getMetaDataMap().get(schemaName);
@@ -372,9 +371,8 @@ public final class GovernanceMetaDataContexts implements 
MetaDataContexts {
     }
     
     private ShardingSphereMetaData getChangedMetaData(final 
ShardingSphereMetaData oldMetaData, final Collection<RuleConfiguration> 
ruleConfigs) throws SQLException {
-        // TODO load global schema from reg center
         MetaDataContextsBuilder builder = new 
MetaDataContextsBuilder(Collections.singletonMap(oldMetaData.getName(), 
oldMetaData.getResource().getDataSources()),
-                Collections.singletonMap(oldMetaData.getName(), ruleConfigs), 
new LinkedList<>(), metaDataContexts.getProps().getProps());
+                Collections.singletonMap(oldMetaData.getName(), ruleConfigs), 
configCenter.getGlobalRuleService().load(), 
metaDataContexts.getProps().getProps());
         return 
builder.build(configCenter).getMetaDataMap().values().iterator().next();
     }
     
@@ -385,8 +383,8 @@ public final class GovernanceMetaDataContexts implements 
MetaDataContexts {
         oldMetaData.getResource().close(modifiedDataSources.keySet());
         Map<String, Map<String, DataSource>> dataSourcesMap = 
Collections.singletonMap(oldMetaData.getName(), 
                 getNewDataSources(oldMetaData.getResource().getDataSources(), 
getAddedDataSources(oldMetaData, newDataSourceConfigs), modifiedDataSources, 
deletedDataSources));
-        // TODO load global schema from reg center
-        return new MetaDataContextsBuilder(dataSourcesMap, 
Collections.singletonMap(oldMetaData.getName(), 
oldMetaData.getRuleMetaData().getConfigurations()), new LinkedList<>(),
+        return new MetaDataContextsBuilder(dataSourcesMap, 
Collections.singletonMap(oldMetaData.getName(), 
+                oldMetaData.getRuleMetaData().getConfigurations()), 
configCenter.getGlobalRuleService().load(),
                 
metaDataContexts.getProps().getProps()).build(configCenter).getMetaDataMap().get(oldMetaData.getName());
     }