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 ed9273b1e63 Refactor code format ClusterContextManagerBuilder and
MemoryContextManagerBuilder (#18603)
ed9273b1e63 is described below
commit ed9273b1e63eed8ff2eb4d63ff3d8c2c25ce1ba4
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jun 26 13:18:43 2022 +0800
Refactor code format ClusterContextManagerBuilder and
MemoryContextManagerBuilder (#18603)
* Refactor code format ClusterContextManagerBuilder and
MemoryContextManagerBuilder
* Refactor code format MetaDataContextsBuilder
* Refactor MetaDataContextsBuilder
* Refactor MetaDataContextsBuilder
---
.../mode/metadata/MetaDataContextsBuilder.java | 22 +++++++++++-----------
.../cluster/ClusterContextManagerBuilder.java | 8 ++++----
.../memory/MemoryContextManagerBuilder.java | 3 +--
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
index 7f4522735ce..c4d5a31dd44 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
@@ -51,27 +51,27 @@ public final class MetaDataContextsBuilder {
/**
* Build meta data contexts.
*
- * @param metaDataPersistService persist service
+ * @param persistService meta data persist service
* @exception SQLException SQL exception
* @return meta data contexts
*/
- public MetaDataContexts build(final MetaDataPersistService
metaDataPersistService) throws SQLException {
- DatabaseType protocolType =
DatabaseTypeEngine.getProtocolType(databaseConfigMap, props);
- DatabaseType storageType =
DatabaseTypeEngine.getStorageType(databaseConfigMap);
- Map<String, ShardingSphereDatabase> databases =
getDatabases(protocolType, storageType);
+ public MetaDataContexts build(final MetaDataPersistService persistService)
throws SQLException {
+ Map<String, ShardingSphereDatabase> databases = createDatabases();
ShardingSphereRuleMetaData globalMetaData = new
ShardingSphereRuleMetaData(GlobalRulesBuilder.buildRules(globalRuleConfigs,
databases));
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(databases, globalMetaData, props);
- return new MetaDataContexts(metaDataPersistService, metaData,
OptimizerContextFactory.create(databases, globalMetaData));
+ return new MetaDataContexts(persistService, metaData,
OptimizerContextFactory.create(databases, globalMetaData));
}
- private Map<String, ShardingSphereDatabase> getDatabases(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
+ private Map<String, ShardingSphereDatabase> createDatabases() throws
SQLException {
+ DatabaseType protocolType =
DatabaseTypeEngine.getProtocolType(databaseConfigMap, props);
+ DatabaseType storageType =
DatabaseTypeEngine.getStorageType(databaseConfigMap);
Map<String, ShardingSphereDatabase> result = new
HashMap<>(databaseConfigMap.size() +
protocolType.getSystemDatabaseSchemaMap().size(), 1);
- result.putAll(getGenericDatabases(protocolType, storageType));
- result.putAll(getSystemDatabases(protocolType));
+ result.putAll(createGenericDatabases(protocolType, storageType));
+ result.putAll(createSystemDatabases(protocolType));
return result;
}
- private Map<String, ShardingSphereDatabase> getGenericDatabases(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
+ private Map<String, ShardingSphereDatabase> createGenericDatabases(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
Map<String, ShardingSphereDatabase> result = new
HashMap<>(databaseConfigMap.size(), 1);
for (Entry<String, DatabaseConfiguration> entry :
databaseConfigMap.entrySet()) {
String databaseName = entry.getKey();
@@ -82,7 +82,7 @@ public final class MetaDataContextsBuilder {
return result;
}
- private Map<String, ShardingSphereDatabase> getSystemDatabases(final
DatabaseType protocolType) throws SQLException {
+ private Map<String, ShardingSphereDatabase> createSystemDatabases(final
DatabaseType protocolType) throws SQLException {
Map<String, ShardingSphereDatabase> result = new
HashMap<>(protocolType.getSystemDatabaseSchemaMap().size(), 1);
for (String each : protocolType.getSystemDatabaseSchemaMap().keySet())
{
if (!databaseConfigMap.containsKey(each) ||
databaseConfigMap.get(each).getDataSources().isEmpty()) {
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 2a3d5da186e..fe5a68c2af6 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
@@ -56,13 +56,13 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
public ContextManager build(final ContextManagerBuilderParameter
parameter) throws SQLException {
ModeScheduleContextFactory.getInstance().init(parameter.getInstanceDefinition().getInstanceId(),
parameter.getModeConfig());
ClusterPersistRepository repository =
ClusterPersistRepositoryFactory.getInstance((ClusterPersistRepositoryConfiguration)
parameter.getModeConfig().getRepository());
- MetaDataPersistService metaDataPersistService = new
MetaDataPersistService(repository);
- persistConfigurations(metaDataPersistService, parameter);
+ MetaDataPersistService persistService = new
MetaDataPersistService(repository);
+ persistConfigurations(persistService, parameter);
RegistryCenter registryCenter = new RegistryCenter(repository);
- MetaDataContexts metaDataContexts =
createMetaDataContextsBuilder(metaDataPersistService,
parameter).build(metaDataPersistService);
+ MetaDataContexts metaDataContexts =
createMetaDataContextsBuilder(persistService, parameter).build(persistService);
persistMetaData(metaDataContexts);
ContextManager result = createContextManager(repository,
registryCenter, parameter.getInstanceDefinition(), metaDataContexts,
parameter.getModeConfig());
- registerOnline(metaDataPersistService, parameter, result,
registryCenter);
+ registerOnline(persistService, parameter, result, registryCenter);
return result;
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
index 8d25f07e9bd..ee213b354ff 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
@@ -42,8 +42,7 @@ public final class MemoryContextManagerBuilder implements
ContextManagerBuilder
MetaDataContexts metaDataContexts = new MetaDataContextsBuilder(
parameter.getDatabaseConfigs(),
parameter.getGlobalRuleConfigs(), new
ConfigurationProperties(parameter.getProps())).build(null);
InstanceContext instanceContext = buildInstanceContext(parameter);
- ContextManager result = new ContextManager(metaDataContexts,
instanceContext);
- return result;
+ return new ContextManager(metaDataContexts, instanceContext);
}
private InstanceContext buildInstanceContext(final
ContextManagerBuilderParameter parameter) {
