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 ee36039a0209f..69b164fccd827 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 @@ private static boolean isCreateByLocal(final MetaDataPersistService persistServi return persistService.getDatabaseMetaDataFacade().getDatabase().loadAllDatabaseNames().isEmpty(); } - private static MetaDataContexts createByLocal(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param, - final ComputeNodeInstanceContext instanceContext) throws SQLException { - Map effectiveDatabaseConfigs = param.getDatabaseConfigs(); - Collection 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 globalRuleConfigs = param.getGlobalRuleConfigs(); ConfigurationProperties props = new ConfigurationProperties(param.getProps()); - Map databases = ExternalMetaDataFactory.create(effectiveDatabaseConfigs, props, instanceContext); + Map databases = ExternalMetaDataFactory.create(param.getDatabaseConfigs(), props, instanceContext); MetaDataContexts result = newMetaDataContexts(persistService, param, globalRuleConfigs, databases, props); persistDatabaseConfigurations(result, param, persistService, instanceContext); persistMetaData(result, persistService);