This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 d9cc8c08860 Refactor MetaDataContextsFactory (#19271)
d9cc8c08860 is described below
commit d9cc8c08860b1ee123f294929d428229571b06cd
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jul 16 22:45:18 2022 +0800
Refactor MetaDataContextsFactory (#19271)
---
.../shardingsphere/mode/metadata/MetaDataContextsFactory.java | 8 ++++----
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 2 +-
.../mode/manager/standalone/StandaloneContextManagerBuilder.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
index c15c1111f05..0c5ab844fa0 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.infra.config.database.impl.DataSourceProvidedDa
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import
org.apache.shardingsphere.infra.federation.optimizer.context.OptimizerContextFactory;
import org.apache.shardingsphere.infra.instance.InstanceContext;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import
org.apache.shardingsphere.infra.instance.metadata.jdbc.JDBCInstanceMetaData;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
@@ -52,14 +51,15 @@ public final class MetaDataContextsFactory {
*
* @param persistService persist service
* @param databaseConfigs database configurations
- * @param instanceMetaData instance meta data
* @param instanceContext instance context
* @return meta data contexts
* @throws SQLException SQL exception
*/
public static MetaDataContexts create(final MetaDataPersistService
persistService, final Map<String, DatabaseConfiguration> databaseConfigs,
- final InstanceMetaData
instanceMetaData, final InstanceContext instanceContext) throws SQLException {
- Collection<String> databaseNames = instanceMetaData instanceof
JDBCInstanceMetaData ? databaseConfigs.keySet() :
persistService.getDatabaseMetaDataService().loadAllDatabaseNames();
+ final InstanceContext
instanceContext) throws SQLException {
+ Collection<String> databaseNames =
instanceContext.getInstance().getInstanceMetaData() instanceof
JDBCInstanceMetaData
+ ? databaseConfigs.keySet()
+ :
persistService.getDatabaseMetaDataService().loadAllDatabaseNames();
Map<String, DatabaseConfiguration> effectiveDatabaseConfigs =
createEffectiveDatabaseConfigurations(databaseNames, databaseConfigs,
persistService);
Collection<RuleConfiguration> globalRuleConfigs =
persistService.getGlobalRuleService().load();
ConfigurationProperties props = new
ConfigurationProperties(persistService.getPropsService().load());
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 86b3d758873..93cff78ec19 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -51,7 +51,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
RegistryCenter registryCenter = new RegistryCenter(repository, new
EventBusContext());
InstanceContext instanceContext = buildInstanceContext(registryCenter,
parameter);
registryCenter.getRepository().watchSessionConnection(instanceContext);
- MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(persistService, parameter.getDatabaseConfigs(),
parameter.getInstanceMetaData(), instanceContext);
+ MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(persistService, parameter.getDatabaseConfigs(),
instanceContext);
persistMetaData(metaDataContexts);
ContextManager result = new ContextManager(metaDataContexts,
instanceContext);
registerOnline(persistService, registryCenter, parameter, result);
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 15eeb4b993f..34c97a574ee 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -46,7 +46,7 @@ public final class StandaloneContextManagerBuilder implements
ContextManagerBuil
MetaDataPersistService persistService = new
MetaDataPersistService(repository);
persistConfigurations(persistService, parameter);
InstanceContext instanceContext = buildInstanceContext(parameter);
- MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(persistService, parameter.getDatabaseConfigs(),
parameter.getInstanceMetaData(), instanceContext);
+ MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(persistService, parameter.getDatabaseConfigs(),
instanceContext);
return new ContextManager(metaDataContexts, instanceContext);
}
