[shardingsphere] branch master updated: Refactor DatabaseRulesCountResultSet (#18329)

[jianglongtao]

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 d75eea1d9e9 Refactor DatabaseRulesCountResultSet (#18329)
d75eea1d9e9 is described below

commit d75eea1d9e9b768fe17849d77d5e76f1bab8fea7
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Jun 13 17:01:25 2022 +0800

    Refactor DatabaseRulesCountResultSet (#18329)
---
 .../backend/text/distsql/rql/rule/DatabaseRulesCountResultSet.java  | 6 +-----
 .../backend/text/distsql/rql/DatabaseRulesCountResultSetTest.java   | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/DatabaseRulesCountResultSet.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/DatabaseRulesCountResultSet.java
index 410d20ff73d..7be47707ead 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/DatabaseRulesCountResultSet.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/rule/DatabaseRulesCountResultSet.java
@@ -21,10 +21,8 @@ import 
org.apache.shardingsphere.dbdiscovery.api.config.DatabaseDiscoveryRuleCon
 import 
org.apache.shardingsphere.distsql.parser.statement.rql.show.CountDatabaseRulesStatement;
 import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
 import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import org.apache.shardingsphere.infra.distsql.constant.ExportableConstants;
 import org.apache.shardingsphere.infra.distsql.query.DistSQLResultSet;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import 
org.apache.shardingsphere.infra.rule.identifier.type.exportable.RuleExportEngine;
 import 
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
 import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
 import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
@@ -33,7 +31,6 @@ import 
org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -83,8 +80,7 @@ public final class DatabaseRulesCountResultSet implements 
DistSQLResultSet {
     }
     
     private void addSingleTableData(final Map<String, Collection<Object>> 
dataMap, final Collection<SingleTableRule> rules) {
-        Optional<Integer> count = rules.stream().map(each -> (Collection) new 
RuleExportEngine(each).export(ExportableConstants.EXPORT_SINGLE_TABLES).orElse(Collections.emptyMap()))
-                .map(Collection::size).reduce(Integer::sum);
+        Optional<Integer> count = rules.stream().map(each -> 
each.getAllTables().size()).reduce(Integer::sum);
         dataMap.compute(SINGLE_TABLE, (key, value) -> buildRow(value, 
SINGLE_TABLE, count.orElse(DEFAULT_COUNT)));
     }
     
diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/DatabaseRulesCountResultSetTest.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/DatabaseRulesCountResultSetTest.java
index 7c61c096b58..f49201944a6 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/DatabaseRulesCountResultSetTest.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/DatabaseRulesCountResultSetTest.java
@@ -21,7 +21,6 @@ import 
org.apache.shardingsphere.distsql.parser.statement.rql.show.CountDatabase
 import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
 import 
org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration;
 import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import org.apache.shardingsphere.infra.distsql.constant.ExportableConstants;
 import org.apache.shardingsphere.infra.distsql.query.DistSQLResultSet;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import 
org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
@@ -74,7 +73,7 @@ public final class DatabaseRulesCountResultSetTest {
     
     private SingleTableRule mockSingleTableRule() {
         SingleTableRule result = mock(SingleTableRule.class);
-        
when(result.getExportData()).thenReturn(Collections.singletonMap(ExportableConstants.EXPORT_SINGLE_TABLES,
 Arrays.asList("single_table_1", "single_table_2")));
+        when(result.getAllTables()).thenReturn(Arrays.asList("single_table_1", 
"single_table_2"));
         return result;
     }