Beyondeclipse commented on a change in pull request #11345:
URL: https://github.com/apache/shardingsphere/pull/11345#discussion_r674482739
##########
File path:
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilder.java
##########
@@ -147,9 +173,35 @@ private static void appendDialectRemainTables(final
DialectTableMetaDataLoader d
}
}
}
-
+
+ private static Map<String, String> getActualTable2LogicTableMap(final
SchemaBuilderMaterials materials, final Collection<String> ruleLogicTables) {
+ List<DataNodeContainedRule> dataNodeContainedRuleList =
materials.getRules().stream()
+ .filter(each -> each instanceof DataNodeContainedRule)
+ .map(each -> (DataNodeContainedRule) each)
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(dataNodeContainedRuleList)) {
+ return Collections.emptyMap();
+ }
+
+ int size = dataNodeContainedRuleList.stream()
+ .mapToInt(each -> each.getAllDataNodes().entrySet().stream()
+ .mapToInt(entry -> entry.getValue().size())
+ .sum())
+ .sum();
+ Map<String, String> actualTable2LogicTableMap = new HashMap<>(size);
Review comment:
Do you mean that change 'entry' to 'each'? But it is in a map.
##########
File path:
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilder.java
##########
@@ -130,15 +141,30 @@ private static void appendRemainTables(final
SchemaBuilderMaterials materials, f
return Optional.empty();
}
- private static void appendDialectRemainTables(final
DialectTableMetaDataLoader dialectLoader, final SchemaBuilderMaterials
materials, final Map<String, TableMetaData> tables) throws SQLException {
+ private static void appendDialectRemainTables(final
DialectTableMetaDataLoader dialectLoader,
+ final SchemaBuilderMaterials materials, final Map<String,
TableMetaData> tables, final Collection<String> ruleLogicTables) throws
SQLException {
+
+ Map<String, String> actualTable2LogicTableMap =
getActualTable2LogicTableMap(materials, ruleLogicTables);
+
Collection<Future<Map<String, TableMetaData>>> futures = new
LinkedList<>();
- Collection<String> existedTables =
getExistedTables(materials.getRules(), tables);
for (DataSource each : materials.getDataSourceMap().values()) {
- futures.add(EXECUTOR_SERVICE.submit(() -> dialectLoader.load(each,
existedTables)));
+ futures.add(EXECUTOR_SERVICE.submit(() -> dialectLoader.load(each,
Collections.emptyList())));
}
for (Future<Map<String, TableMetaData>> each : futures) {
try {
- tables.putAll(each.get());
+ Map<String, TableMetaData> tableMetaMap = each.get();
+ for (Map.Entry<String, TableMetaData> one :
tableMetaMap.entrySet()) {
+ String actualTableName = one.getKey();
+ String logicTableName =
actualTable2LogicTableMap.get(actualTableName);
Review comment:
OK
##########
File path:
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilder.java
##########
@@ -130,15 +141,30 @@ private static void appendRemainTables(final
SchemaBuilderMaterials materials, f
return Optional.empty();
}
- private static void appendDialectRemainTables(final
DialectTableMetaDataLoader dialectLoader, final SchemaBuilderMaterials
materials, final Map<String, TableMetaData> tables) throws SQLException {
+ private static void appendDialectRemainTables(final
DialectTableMetaDataLoader dialectLoader,
+ final SchemaBuilderMaterials materials, final Map<String,
TableMetaData> tables, final Collection<String> ruleLogicTables) throws
SQLException {
+
+ Map<String, String> actualTable2LogicTableMap =
getActualTable2LogicTableMap(materials, ruleLogicTables);
+
Collection<Future<Map<String, TableMetaData>>> futures = new
LinkedList<>();
- Collection<String> existedTables =
getExistedTables(materials.getRules(), tables);
for (DataSource each : materials.getDataSourceMap().values()) {
- futures.add(EXECUTOR_SERVICE.submit(() -> dialectLoader.load(each,
existedTables)));
+ futures.add(EXECUTOR_SERVICE.submit(() -> dialectLoader.load(each,
Collections.emptyList())));
}
for (Future<Map<String, TableMetaData>> each : futures) {
try {
- tables.putAll(each.get());
+ Map<String, TableMetaData> tableMetaMap = each.get();
+ for (Map.Entry<String, TableMetaData> one :
tableMetaMap.entrySet()) {
Review comment:
OK.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
