[shardingsphere] branch master updated: Minor improve for MetaDataContextsBuilder (#11506)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 0d213c732 Minor improve for MetaDataContextsBuilder (#11506)
0d213c732 is described below

commit 0d213c732a68899fe1d879bb92f66c9693ff538f
Author: Haoran Meng <menghaora...@gmail.com>
AuthorDate: Mon Jul 26 14:46:44 2021 +0800

    Minor improve for MetaDataContextsBuilder (#11506)
---
 .../infra/metadata/schema/builder/SchemaBuilderTest.java   |  6 +++---
 .../infra/context/metadata/MetaDataContextsBuilder.java    | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilderTest.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilderTest.java
index 9248198..d16ca1d 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilderTest.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilderTest.java
@@ -111,9 +111,9 @@ public final class SchemaBuilderTest {
         when(resultSet.next()).thenReturn(true, true, true, true, true, true, 
false);
         String[] mockReturnTables = {singleTableNames[1], 
"data_node_routed_table1_0", "data_node_routed_table1_1", 
"data_node_routed_table2_0", "data_node_routed_table2_1"};
         when(resultSet.getString(TABLE_NAME)).thenReturn(singleTableNames[0], 
mockReturnTables);
-        Map<TableMetaData, TableMetaData> tableMetaDatas = 
SchemaBuilder.build(schemaBuilderMaterials);
-        assertThat(tableMetaDatas.keySet().size(), is(4));
-        assertActualOfShardingTablesAndSingleTables(tableMetaDatas.keySet());
+        Map<TableMetaData, TableMetaData> tableMetaData = 
SchemaBuilder.build(schemaBuilderMaterials);
+        assertThat(tableMetaData.keySet().size(), is(4));
+        assertActualOfShardingTablesAndSingleTables(tableMetaData.keySet());
     }
     
     private void assertActualOfShardingTablesAndSingleTables(final 
Collection<TableMetaData> actual) {
diff --git 
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java
 
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java
index b0078ff..63f9022 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/MetaDataContextsBuilder.java
@@ -98,21 +98,21 @@ public final class MetaDataContextsBuilder {
             Collection<RuleConfiguration> ruleConfigs = 
schemaRuleConfigs.get(each);
             DatabaseType databaseType = 
DatabaseTypeRecognizer.getDatabaseType(dataSourceMap.values());
             Collection<ShardingSphereRule> rules = 
ShardingSphereRulesBuilder.buildSchemaRules(each, ruleConfigs, databaseType, 
dataSourceMap);
-            Map<TableMetaData, TableMetaData> tableMetaDatas = 
SchemaBuilder.build(new SchemaBuilderMaterials(databaseType, dataSourceMap, 
rules, props));
+            Map<TableMetaData, TableMetaData> tableMetaData = 
SchemaBuilder.build(new SchemaBuilderMaterials(databaseType, dataSourceMap, 
rules, props));
             ShardingSphereRuleMetaData ruleMetaData = new 
ShardingSphereRuleMetaData(ruleConfigs, rules);
             ShardingSphereResource resource = buildResource(databaseType, 
dataSourceMap);
-            ShardingSphereSchema actualSchema = new 
ShardingSphereSchema(tableMetaDatas.keySet().stream().filter(Objects::nonNull).collect(Collectors.toMap(TableMetaData::getName,
 v -> v)));
+            ShardingSphereSchema actualSchema = new 
ShardingSphereSchema(tableMetaData.keySet().stream().filter(Objects::nonNull).collect(Collectors.toMap(TableMetaData::getName,
 v -> v)));
             actualMetaDataMap.put(each, new ShardingSphereMetaData(each, 
resource, ruleMetaData, actualSchema));
-            metaDataMap.put(each, new ShardingSphereMetaData(each, resource, 
ruleMetaData, buildSchema(tableMetaDatas)));
+            metaDataMap.put(each, new ShardingSphereMetaData(each, resource, 
ruleMetaData, buildSchema(tableMetaData)));
         }
         OptimizeContextFactory optimizeContextFactory = new 
OptimizeContextFactory(actualMetaDataMap);
         return new StandardMetaDataContexts(persistService, metaDataMap, 
buildGlobalSchemaMetaData(metaDataMap), executorEngine, props, 
optimizeContextFactory);
     }
     
-    private ShardingSphereSchema buildSchema(final Map<TableMetaData, 
TableMetaData> tableMetaDatas) {
-        Map<String, TableMetaData> tables = new 
HashMap<>(tableMetaDatas.size(), 1);
-        
tables.putAll(tableMetaDatas.keySet().stream().collect(Collectors.toMap(TableMetaData::getName,
 v -> v)));
-        
tables.putAll(tableMetaDatas.values().stream().collect(Collectors.toMap(TableMetaData::getName,
 v -> v)));
+    private ShardingSphereSchema buildSchema(final Map<TableMetaData, 
TableMetaData> tableMetaData) {
+        Map<String, TableMetaData> tables = new 
HashMap<>(tableMetaData.size(), 1);
+        
tables.putAll(tableMetaData.keySet().stream().collect(Collectors.toMap(TableMetaData::getName,
 v -> v)));
+        
tables.putAll(tableMetaData.values().stream().collect(Collectors.toMap(TableMetaData::getName,
 v -> v)));
         return new ShardingSphereSchema(tables);
     }