This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 cd6ff459fba Add CountRQLExecutor (#29722)
cd6ff459fba is described below
commit cd6ff459fba8e593c46d0c576536af62e9140866
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 14 23:34:17 2024 +0800
Add CountRQLExecutor (#29722)
* Add CountRQLExecutor
* Add CountRQLExecutor
* For code format
---
.../handler/query/CountBroadcastRuleExecutor.java | 21 +++++----------
.../handler/query/CountEncryptRuleExecutor.java | 25 +++++------------
.../handler/query/CountMaskRuleExecutor.java | 25 +++++------------
.../query/CountReadwriteSplittingRuleExecutor.java | 25 +++++------------
.../handler/query/CountShadowRuleExecutor.java | 25 +++++------------
.../handler/query/CountShardingRuleExecutor.java | 29 +++++---------------
.../distsql/handler/type/rql/CountRQLExecutor.java | 31 ++++++++++++----------
.../handler/query/CountSingleTableExecutor.java | 16 +++++------
.../query/CountSingleTableExecutorTest.java | 8 +++---
9 files changed, 70 insertions(+), 135 deletions(-)
diff --git
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
index a2b3b4e0f84..b336c0fbeb0 100644
---
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
+++
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
@@ -19,31 +19,24 @@ package
org.apache.shardingsphere.broadcast.distsql.handler.query;
import
org.apache.shardingsphere.broadcast.distsql.statement.CountBroadcastRuleStatement;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
-import org.apache.shardingsphere.distsql.handler.type.rql.RQLExecutor;
+import org.apache.shardingsphere.distsql.handler.type.rql.CountRQLExecutor;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
-import java.util.Optional;
+import java.util.Collections;
/**
* Count broadcast rule executor.
*/
-public final class CountBroadcastRuleExecutor implements
RQLExecutor<CountBroadcastRuleStatement> {
+public final class CountBroadcastRuleExecutor extends
CountRQLExecutor<CountBroadcastRuleStatement, BroadcastRule> {
- @Override
- public Collection<String> getColumnNames() {
- return Arrays.asList("rule_name", "database", "count");
+ public CountBroadcastRuleExecutor() {
+ super(BroadcastRule.class);
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountBroadcastRuleStatement
sqlStatement) {
- Optional<BroadcastRule> rule =
database.getRuleMetaData().findSingleRule(BroadcastRule.class);
- Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> result.add(new
LocalDataQueryResultRow("broadcast_table", database.getName(),
optional.getConfiguration().getTables().size())));
- return result;
+ protected Collection<LocalDataQueryResultRow> generateRows(final
BroadcastRule rule, final String databaseName) {
+ return Collections.singleton(new
LocalDataQueryResultRow("broadcast_table", databaseName,
rule.getConfiguration().getTables().size()));
}
@Override
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
index 0e6e91f4861..37cc9ef17d7 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java
@@ -17,37 +17,26 @@
package org.apache.shardingsphere.encrypt.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.type.rql.RQLExecutor;
+import org.apache.shardingsphere.distsql.handler.type.rql.CountRQLExecutor;
import
org.apache.shardingsphere.encrypt.distsql.statement.CountEncryptRuleStatement;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
-import java.util.Optional;
+import java.util.Collections;
/**
* Count encrypt rule executor.
*/
-public final class CountEncryptRuleExecutor implements
RQLExecutor<CountEncryptRuleStatement> {
+public final class CountEncryptRuleExecutor extends
CountRQLExecutor<CountEncryptRuleStatement, EncryptRule> {
- @Override
- public Collection<String> getColumnNames() {
- return Arrays.asList("rule_name", "database", "count");
+ public CountEncryptRuleExecutor() {
+ super(EncryptRule.class);
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountEncryptRuleStatement sqlStatement) {
- Optional<EncryptRule> rule =
database.getRuleMetaData().findSingleRule(EncryptRule.class);
- Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
- return result;
- }
-
- private void fillRows(final Collection<LocalDataQueryResultRow> result,
final EncryptRule rule, final String databaseName) {
- result.add(new LocalDataQueryResultRow("encrypt", databaseName,
rule.getLogicTableMapper().getTableNames().size()));
+ protected Collection<LocalDataQueryResultRow> generateRows(final
EncryptRule rule, final String databaseName) {
+ return Collections.singleton(new LocalDataQueryResultRow("encrypt",
databaseName, rule.getLogicTableMapper().getTableNames().size()));
}
@Override
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
index cf133d9107c..62e1b0f5650 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
@@ -17,37 +17,26 @@
package org.apache.shardingsphere.mask.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.type.rql.RQLExecutor;
+import org.apache.shardingsphere.distsql.handler.type.rql.CountRQLExecutor;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.mask.distsql.statement.CountMaskRuleStatement;
import org.apache.shardingsphere.mask.rule.MaskRule;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
-import java.util.Optional;
+import java.util.Collections;
/**
* Count mask rule executor.
*/
-public final class CountMaskRuleExecutor implements
RQLExecutor<CountMaskRuleStatement> {
+public final class CountMaskRuleExecutor extends
CountRQLExecutor<CountMaskRuleStatement, MaskRule> {
- @Override
- public Collection<String> getColumnNames() {
- return Arrays.asList("rule_name", "database", "count");
+ public CountMaskRuleExecutor() {
+ super(MaskRule.class);
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountMaskRuleStatement sqlStatement) {
- Optional<MaskRule> rule =
database.getRuleMetaData().findSingleRule(MaskRule.class);
- Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
- return result;
- }
-
- private void fillRows(final Collection<LocalDataQueryResultRow> result,
final MaskRule rule, final String databaseName) {
- result.add(new LocalDataQueryResultRow("mask", databaseName,
rule.getLogicTableMapper().getTableNames().size()));
+ protected Collection<LocalDataQueryResultRow> generateRows(final MaskRule
rule, final String databaseName) {
+ return Collections.singleton(new LocalDataQueryResultRow("mask",
databaseName, rule.getLogicTableMapper().getTableNames().size()));
}
@Override
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
index 2b21cd3b21b..52d2fae063f 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java
@@ -17,37 +17,26 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.type.rql.RQLExecutor;
+import org.apache.shardingsphere.distsql.handler.type.rql.CountRQLExecutor;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.readwritesplitting.distsql.statement.CountReadwriteSplittingRuleStatement;
import
org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
-import java.util.Optional;
+import java.util.Collections;
/**
* Count readwrite-splitting rule executor.
*/
-public final class CountReadwriteSplittingRuleExecutor implements
RQLExecutor<CountReadwriteSplittingRuleStatement> {
+public final class CountReadwriteSplittingRuleExecutor extends
CountRQLExecutor<CountReadwriteSplittingRuleStatement, ReadwriteSplittingRule> {
- @Override
- public Collection<String> getColumnNames() {
- return Arrays.asList("rule_name", "database", "count");
+ public CountReadwriteSplittingRuleExecutor() {
+ super(ReadwriteSplittingRule.class);
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountReadwriteSplittingRuleStatement
sqlStatement) {
- Optional<ReadwriteSplittingRule> rule =
database.getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class);
- Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
- return result;
- }
-
- private void fillRows(final Collection<LocalDataQueryResultRow> result,
final ReadwriteSplittingRule rule, final String databaseName) {
- result.add(new LocalDataQueryResultRow("readwrite_splitting",
databaseName, rule.getDataSourceMapper().size()));
+ protected Collection<LocalDataQueryResultRow> generateRows(final
ReadwriteSplittingRule rule, final String databaseName) {
+ return Collections.singleton(new
LocalDataQueryResultRow("readwrite_splitting", databaseName,
rule.getDataSourceMapper().size()));
}
@Override
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
index 102c4904b25..71c7e52e993 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java
@@ -17,37 +17,26 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.type.rql.RQLExecutor;
+import org.apache.shardingsphere.distsql.handler.type.rql.CountRQLExecutor;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.shadow.distsql.statement.CountShadowRuleStatement;
import org.apache.shardingsphere.shadow.rule.ShadowRule;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
-import java.util.Optional;
+import java.util.Collections;
/**
* Count shadow rule executor.
*/
-public final class CountShadowRuleExecutor implements
RQLExecutor<CountShadowRuleStatement> {
+public final class CountShadowRuleExecutor extends
CountRQLExecutor<CountShadowRuleStatement, ShadowRule> {
- @Override
- public Collection<String> getColumnNames() {
- return Arrays.asList("rule_name", "database", "count");
+ public CountShadowRuleExecutor() {
+ super(ShadowRule.class);
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountShadowRuleStatement sqlStatement) {
- Optional<ShadowRule> rule =
database.getRuleMetaData().findSingleRule(ShadowRule.class);
- Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
- return result;
- }
-
- private void fillRows(final Collection<LocalDataQueryResultRow> result,
final ShadowRule rule, final String databaseName) {
- result.add(new LocalDataQueryResultRow("shadow", databaseName,
rule.getDataSourceMapper().size()));
+ protected Collection<LocalDataQueryResultRow> generateRows(final
ShadowRule rule, final String databaseName) {
+ return Collections.singleton(new LocalDataQueryResultRow("shadow",
databaseName, rule.getDataSourceMapper().size()));
}
@Override
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
index 5ad35b67f0e..5346f3ae928 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java
@@ -17,43 +17,28 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.type.rql.RQLExecutor;
+import org.apache.shardingsphere.distsql.handler.type.rql.CountRQLExecutor;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.distsql.statement.CountShardingRuleStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
-import java.util.Optional;
/**
* Count sharding rule executor.
*/
-public final class CountShardingRuleExecutor implements
RQLExecutor<CountShardingRuleStatement> {
+public final class CountShardingRuleExecutor extends
CountRQLExecutor<CountShardingRuleStatement, ShardingRule> {
- @Override
- public Collection<String> getColumnNames() {
- return Arrays.asList("rule_name", "database", "count");
+ public CountShardingRuleExecutor() {
+ super(ShardingRule.class);
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountShardingRuleStatement sqlStatement)
{
- Optional<ShardingRule> rule =
database.getRuleMetaData().findSingleRule(ShardingRule.class);
- Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> fillRows(result, optional,
database.getName()));
- return result;
- }
-
- private void fillRows(final Collection<LocalDataQueryResultRow> result,
final ShardingRule rule, final String databaseName) {
- fillRows(result, "sharding_table", databaseName,
rule.getTableRules().size());
- fillRows(result, "sharding_table_reference", databaseName,
((ShardingRuleConfiguration)
rule.getConfiguration()).getBindingTableGroups().size());
- }
-
- private void fillRows(final Collection<LocalDataQueryResultRow> result,
final String ruleName, final String databaseName, final int count) {
- result.add(new LocalDataQueryResultRow(ruleName, databaseName, count));
+ protected Collection<LocalDataQueryResultRow> generateRows(final
ShardingRule rule, final String databaseName) {
+ return Arrays.asList(new LocalDataQueryResultRow("sharding_table",
databaseName, rule.getTableRules().size()),
+ new LocalDataQueryResultRow("sharding_table_reference",
databaseName, ((ShardingRuleConfiguration)
rule.getConfiguration()).getBindingTableGroups().size()));
}
@Override
diff --git
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rql/CountRQLExecutor.java
similarity index 56%
copy from
features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
copy to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rql/CountRQLExecutor.java
index a2b3b4e0f84..dc39186ba86 100644
---
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rql/CountRQLExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.broadcast.distsql.handler.query;
+package org.apache.shardingsphere.distsql.handler.type.rql;
-import
org.apache.shardingsphere.broadcast.distsql.statement.CountBroadcastRuleStatement;
-import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
-import org.apache.shardingsphere.distsql.handler.type.rql.RQLExecutor;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.statement.rql.RQLStatement;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
+import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import java.util.Arrays;
import java.util.Collection;
@@ -29,25 +29,28 @@ import java.util.LinkedList;
import java.util.Optional;
/**
- * Count broadcast rule executor.
+ * Count RQL executor.
+ *
+ * @param <T> type of RQL statement
+ * @param <R> type of ShardingSphere rule
*/
-public final class CountBroadcastRuleExecutor implements
RQLExecutor<CountBroadcastRuleStatement> {
+@RequiredArgsConstructor
+public abstract class CountRQLExecutor<T extends RQLStatement, R extends
ShardingSphereRule> implements RQLExecutor<T> {
+
+ private final Class<R> ruleClass;
@Override
- public Collection<String> getColumnNames() {
+ public final Collection<String> getColumnNames() {
return Arrays.asList("rule_name", "database", "count");
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountBroadcastRuleStatement
sqlStatement) {
- Optional<BroadcastRule> rule =
database.getRuleMetaData().findSingleRule(BroadcastRule.class);
+ public final Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final T sqlStatement) {
+ Optional<R> rule =
database.getRuleMetaData().findSingleRule(ruleClass);
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
- rule.ifPresent(optional -> result.add(new
LocalDataQueryResultRow("broadcast_table", database.getName(),
optional.getConfiguration().getTables().size())));
+ rule.ifPresent(optional -> result.addAll(generateRows(optional,
database.getName())));
return result;
}
- @Override
- public Class<CountBroadcastRuleStatement> getType() {
- return CountBroadcastRuleStatement.class;
- }
+ protected abstract Collection<LocalDataQueryResultRow> generateRows(R
rule, String databaseName);
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutor.java
index 06e3cdc3ff2..8ce4631ec22 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutor.java
@@ -17,30 +17,26 @@
package org.apache.shardingsphere.single.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.type.rql.RQLExecutor;
+import org.apache.shardingsphere.distsql.handler.type.rql.CountRQLExecutor;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.single.distsql.statement.rql.CountSingleTableStatement;
import org.apache.shardingsphere.single.rule.SingleRule;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
/**
* Count single table executor.
*/
-public final class CountSingleTableExecutor implements
RQLExecutor<CountSingleTableStatement> {
+public final class CountSingleTableExecutor extends
CountRQLExecutor<CountSingleTableStatement, SingleRule> {
- @Override
- public Collection<String> getColumnNames() {
- return Arrays.asList("database", "count");
+ public CountSingleTableExecutor() {
+ super(SingleRule.class);
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountSingleTableStatement sqlStatement) {
- SingleRule rule =
database.getRuleMetaData().getSingleRule(SingleRule.class);
- return Collections.singleton(new
LocalDataQueryResultRow(database.getName(),
rule.getLogicTableMapper().getTableNames().size()));
+ protected Collection<LocalDataQueryResultRow> generateRows(final
SingleRule rule, final String databaseName) {
+ return Collections.singleton(new LocalDataQueryResultRow("single",
databaseName, rule.getLogicTableMapper().getTableNames().size()));
}
@Override
diff --git
a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutorTest.java
b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutorTest.java
index 3de7a3f26f1..c2738171b17 100644
---
a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutorTest.java
+++
b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/CountSingleTableExecutorTest.java
@@ -43,15 +43,17 @@ class CountSingleTableExecutorTest {
assertThat(actual.size(), is(1));
Iterator<LocalDataQueryResultRow> iterator = actual.iterator();
LocalDataQueryResultRow row = iterator.next();
- assertThat(row.getCell(1), is("db_1"));
- assertThat(row.getCell(2), is(2));
+ assertThat(row.getCell(1), is("single"));
+ assertThat(row.getCell(2), is("db_1"));
+ assertThat(row.getCell(3), is(2));
}
@Test
void assertGetColumnNames() {
Collection<String> columns = new
CountSingleTableExecutor().getColumnNames();
- assertThat(columns.size(), is(2));
+ assertThat(columns.size(), is(3));
Iterator<String> iterator = columns.iterator();
+ assertThat(iterator.next(), is("rule_name"));
assertThat(iterator.next(), is("database"));
assertThat(iterator.next(), is("count"));
}
