(shardingsphere) branch master updated: Simplify MetaDataContextsFactory (#34321)

[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 0f366568f12 Simplify MetaDataContextsFactory (#34321)
0f366568f12 is described below

commit 0f366568f12bffd1c004435699eda0c70387e795
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jan 12 15:33:52 2025 +0800

    Simplify MetaDataContextsFactory (#34321)
---
 .../mode/metadata/MetaDataContextsFactory.java       | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
index ee36039a020..69b164fccd8 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -72,8 +72,8 @@ public final class MetaDataContextsFactory {
      * @return meta data contexts
      * @throws SQLException SQL exception
      */
-    public static MetaDataContexts create(final MetaDataPersistService 
persistService, final ContextManagerBuilderParameter param,
-                                          final ComputeNodeInstanceContext 
instanceContext) throws SQLException {
+    public static MetaDataContexts create(final MetaDataPersistService 
persistService,
+                                          final ContextManagerBuilderParameter 
param, final ComputeNodeInstanceContext instanceContext) throws SQLException {
         return isCreateByLocal(persistService) ? createByLocal(persistService, 
param, instanceContext) : createByRepository(persistService, param, 
instanceContext);
     }
     
@@ -81,19 +81,11 @@ public final class MetaDataContextsFactory {
         return 
persistService.getDatabaseMetaDataFacade().getDatabase().loadAllDatabaseNames().isEmpty();
     }
     
-    private static MetaDataContexts createByLocal(final MetaDataPersistService 
persistService, final ContextManagerBuilderParameter param,
-                                                  final 
ComputeNodeInstanceContext instanceContext) throws SQLException {
-        Map<String, DatabaseConfiguration> effectiveDatabaseConfigs = 
param.getDatabaseConfigs();
-        Collection<RuleConfiguration> globalRuleConfigs;
-        if (instanceContext.getModeConfiguration().isCluster()) {
-            globalRuleConfigs = new 
RuleConfigurationPersistDecorateEngine(instanceContext).tryRestore(param.getGlobalRuleConfigs());
-            param.getGlobalRuleConfigs().clear();
-            param.getGlobalRuleConfigs().addAll(globalRuleConfigs);
-        } else {
-            globalRuleConfigs = param.getGlobalRuleConfigs();
-        }
+    private static MetaDataContexts createByLocal(final MetaDataPersistService 
persistService,
+                                                  final 
ContextManagerBuilderParameter param, final ComputeNodeInstanceContext 
instanceContext) throws SQLException {
+        Collection<RuleConfiguration> globalRuleConfigs = 
param.getGlobalRuleConfigs();
         ConfigurationProperties props = new 
ConfigurationProperties(param.getProps());
-        Map<String, ShardingSphereDatabase> databases = 
ExternalMetaDataFactory.create(effectiveDatabaseConfigs, props, 
instanceContext);
+        Map<String, ShardingSphereDatabase> databases = 
ExternalMetaDataFactory.create(param.getDatabaseConfigs(), props, 
instanceContext);
         MetaDataContexts result = newMetaDataContexts(persistService, param, 
globalRuleConfigs, databases, props);
         persistDatabaseConfigurations(result, param, persistService, 
instanceContext);
         persistMetaData(result, persistService);