Skip to content

Commit e510edb

Browse files
authored
Minor refactor for MetaDataImportExecutor and StandaloneContextManagerBuilder (#34990)
1 parent 418dbb4 commit e510edb

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ public final class StandaloneContextManagerBuilder implements ContextManagerBuil
4343
@Override
4444
public ContextManager build(final ContextManagerBuilderParameter param, final EventBusContext eventBusContext) throws SQLException {
4545
PersistRepositoryConfiguration repositoryConfig = param.getModeConfiguration().getRepository();
46-
StandalonePersistRepository repository = TypedSPILoader.getService(
47-
StandalonePersistRepository.class, null == repositoryConfig ? null : repositoryConfig.getType(), null == repositoryConfig ? new Properties() : repositoryConfig.getProps());
4846
ComputeNodeInstanceContext computeNodeInstanceContext = new ComputeNodeInstanceContext(new ComputeNodeInstance(param.getInstanceMetaData()), param.getModeConfiguration(), eventBusContext);
4947
computeNodeInstanceContext.init(new StandaloneWorkerIdGenerator(), new StandaloneLockContext());
48+
StandalonePersistRepository repository = TypedSPILoader.getService(
49+
StandalonePersistRepository.class, null == repositoryConfig ? null : repositoryConfig.getType(), null == repositoryConfig ? new Properties() : repositoryConfig.getProps());
5050
MetaDataContexts metaDataContexts = new MetaDataContextsFactory(new MetaDataPersistFacade(repository), computeNodeInstanceContext).create(param);
5151
return new ContextManager(metaDataContexts, computeNodeInstanceContext, repository);
5252
}

proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java

+16-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import org.apache.shardingsphere.proxy.backend.distsql.export.ExportedMetaData;
2828

2929
import java.util.Collection;
30-
import java.util.LinkedList;
30+
import java.util.LinkedHashMap;
31+
import java.util.Map;
32+
import java.util.Map.Entry;
3133

3234
/**
3335
* Metadata import executor.
@@ -52,13 +54,13 @@ public MetaDataImportExecutor(final ContextManager contextManager) {
5254
* @param exportedMetaData exported metadata
5355
*/
5456
public void importClusterConfigurations(final ExportedMetaData exportedMetaData) {
55-
Collection<YamlProxyDatabaseConfiguration> databaseConfigs = getYamlProxyDatabaseConfigurations(exportedMetaData);
56-
importServerConfiguration(exportedMetaData);
57-
importDatabaseConfigurations(databaseConfigs);
57+
Map<String, YamlProxyDatabaseConfiguration> databaseConfigs = getYamlProxyDatabaseConfigurations(exportedMetaData);
58+
YamlProxyServerConfiguration yamlServerConfig = getYamlServerConfig(exportedMetaData);
59+
importServerConfiguration(yamlServerConfig);
60+
importDatabaseConfigurations(databaseConfigs.values());
5861
}
5962

60-
private void importServerConfiguration(final ExportedMetaData exportedMetaData) {
61-
YamlProxyServerConfiguration yamlServerConfig = YamlEngine.unmarshal(exportedMetaData.getRules() + System.lineSeparator() + exportedMetaData.getProps(), YamlProxyServerConfiguration.class);
63+
private void importServerConfiguration(final YamlProxyServerConfiguration yamlServerConfig) {
6264
if (null == yamlServerConfig) {
6365
return;
6466
}
@@ -77,14 +79,18 @@ private void importProps(final YamlProxyServerConfiguration yamlServerConfig) {
7779
contextManager.getPersistServiceFacade().getModePersistServiceFacade().getMetaDataManagerPersistService().alterProperties(yamlServerConfig.getProps());
7880
}
7981

80-
private Collection<YamlProxyDatabaseConfiguration> getYamlProxyDatabaseConfigurations(final ExportedMetaData exportedMetaData) {
81-
Collection<YamlProxyDatabaseConfiguration> result = new LinkedList<>();
82-
for (String each : exportedMetaData.getDatabases().values()) {
83-
result.add(YamlEngine.unmarshal(each, YamlProxyDatabaseConfiguration.class));
82+
private Map<String, YamlProxyDatabaseConfiguration> getYamlProxyDatabaseConfigurations(final ExportedMetaData exportedMetaData) {
83+
Map<String, YamlProxyDatabaseConfiguration> result = new LinkedHashMap<>();
84+
for (Entry<String, String> entry : exportedMetaData.getDatabases().entrySet()) {
85+
result.put(entry.getKey(), YamlEngine.unmarshal(entry.getValue(), YamlProxyDatabaseConfiguration.class));
8486
}
8587
return result;
8688
}
8789

90+
private YamlProxyServerConfiguration getYamlServerConfig(final ExportedMetaData exportedMetaData) {
91+
return YamlEngine.unmarshal(exportedMetaData.getRules() + System.lineSeparator() + exportedMetaData.getProps(), YamlProxyServerConfiguration.class);
92+
}
93+
8894
/**
8995
* Import database configurations.
9096
*

0 commit comments

Comments
 (0)