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 3c864a1d570 Replace `CountMaskRuleResultSet` with
`CountMaskRuleExecutor` (#23805)
3c864a1d570 is described below
commit 3c864a1d570f649b1b823e6b8c9c575d47ed0ddb
Author: Zichao <[email protected]>
AuthorDate: Mon Jan 30 00:19:59 2023 +1300
Replace `CountMaskRuleResultSet` with `CountMaskRuleExecutor` (#23805)
* Replace `CountMaskRuleResultSet` with `CountMaskRuleExecutor`
* Replace `CountMaskRuleResultSet` with `CountMaskRuleExecutor`
---
...leResultSet.java => CountMaskRuleExecutor.java} | 37 +++++++-------------
...hardingsphere.distsql.handler.query.RQLExecutor | 1 +
...here.distsql.handler.resultset.DistSQLResultSet | 18 ----------
...SetTest.java => CountMaskRuleExecutorTest.java} | 40 +++++++++++++---------
4 files changed, 38 insertions(+), 58 deletions(-)
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleResultSet.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
similarity index 71%
rename from
features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleResultSet.java
rename to
features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
index 8322027fe78..f1edd19f419 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleResultSet.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java
@@ -17,16 +17,14 @@
package org.apache.shardingsphere.mask.distsql.handler.query;
-import
org.apache.shardingsphere.distsql.handler.resultset.DatabaseDistSQLResultSet;
+import org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
+import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.mask.distsql.parser.statement.CountMaskRuleStatement;
import org.apache.shardingsphere.mask.rule.MaskRule;
-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;
import java.util.Map;
@@ -35,25 +33,28 @@ import java.util.Optional;
import java.util.function.Supplier;
/**
- * Result set for count mask rule.
+ * Count mask rule executor.
*/
-public final class CountMaskRuleResultSet implements DatabaseDistSQLResultSet {
+public final class CountMaskRuleExecutor implements
RQLExecutor<CountMaskRuleStatement> {
private static final String MASK = "mask";
- private Iterator<Entry<String, LinkedList<Object>>> data =
Collections.emptyIterator();
-
@Override
public Collection<String> getColumnNames() {
return Arrays.asList("rule_name", "database", "count");
}
@Override
- public void init(final ShardingSphereDatabase database, final SQLStatement
sqlStatement) {
+ public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final CountMaskRuleStatement sqlStatement) {
Optional<MaskRule> rule =
database.getRuleMetaData().findSingleRule(MaskRule.class);
- Map<String, LinkedList<Object>> result = new LinkedHashMap<>();
- rule.ifPresent(optional -> addMaskData(result, database.getName(),
rule.get()));
- data = result.entrySet().iterator();
+ Map<String, LinkedList<Object>> rowMap = new LinkedHashMap<>();
+ rule.ifPresent(optional -> addMaskData(rowMap, database.getName(),
rule.get()));
+ Collection<LocalDataQueryResultRow> result = new LinkedList<>();
+ for (final Entry<String, LinkedList<Object>> entry :
rowMap.entrySet()) {
+ entry.getValue().addFirst(entry.getKey());
+ result.add(new LocalDataQueryResultRow(entry.getValue()));
+ }
+ return result;
}
private void addMaskData(final Map<String, LinkedList<Object>> rowMap,
final String databaseName, final MaskRule rule) {
@@ -72,18 +73,6 @@ public final class CountMaskRuleResultSet implements
DatabaseDistSQLResultSet {
return value;
}
- @Override
- public boolean next() {
- return data.hasNext();
- }
-
- @Override
- public Collection<Object> getRowData() {
- Entry<String, LinkedList<Object>> entry = data.next();
- entry.getValue().addFirst(entry.getKey());
- return entry.getValue();
- }
-
@Override
public String getType() {
return CountMaskRuleStatement.class.getName();
diff --git
a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
index 91d46e793cb..95a3cb562dd 100644
---
a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
+++
b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
@@ -16,3 +16,4 @@
#
org.apache.shardingsphere.mask.distsql.handler.query.ShowMaskRuleExecutor
+org.apache.shardingsphere.mask.distsql.handler.query.CountMaskRuleExecutor
diff --git
a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
deleted file mode 100644
index 663b0077db1..00000000000
---
a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.mask.distsql.handler.query.CountMaskRuleResultSet
diff --git
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleResultSetTest.java
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutorTest.java
similarity index 63%
rename from
features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleResultSetTest.java
rename to
features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutorTest.java
index 0624f2382a3..19afd8c78d8 100644
---
a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleResultSetTest.java
+++
b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutorTest.java
@@ -17,39 +17,47 @@
package org.apache.shardingsphere.mask.distsql.handler.query;
+import org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
+import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import
org.apache.shardingsphere.mask.distsql.parser.statement.CountMaskRuleStatement;
import org.apache.shardingsphere.mask.rule.MaskRule;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
-import java.util.List;
+import java.util.Iterator;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class CountMaskRuleResultSetTest {
+public final class CountMaskRuleExecutorTest {
@Test
public void assertGetRowData() {
- CountMaskRuleResultSet resultSet = new CountMaskRuleResultSet();
- resultSet.init(mockDatabase(), mock(CountMaskRuleStatement.class));
- assertTrue(resultSet.next());
-
assertTrue(resultSet.getColumnNames().containsAll(Arrays.asList("rule_name",
"database", "count")));
- List<Object> actual = new ArrayList<>(resultSet.getRowData());
- assertThat(actual.size(), is(3));
- assertThat(actual.get(0), is("mask"));
- assertThat(actual.get(1), is("mask_db"));
- assertThat(actual.get(2), is(1));
- assertFalse(resultSet.next());
+ RQLExecutor<CountMaskRuleStatement> executor = new
CountMaskRuleExecutor();
+ Collection<LocalDataQueryResultRow> actual =
executor.getRows(mockDatabase(), mock(CountMaskRuleStatement.class));
+ assertThat(actual.size(), is(1));
+ Iterator<LocalDataQueryResultRow> iterator = actual.iterator();
+ LocalDataQueryResultRow row = iterator.next();
+ assertThat(row.getCell(1), is("mask"));
+ assertThat(row.getCell(2), is("mask_db"));
+ assertThat(row.getCell(3), is(1));
+ }
+
+ @Test
+ public void assertGetColumnNames() {
+ RQLExecutor<CountMaskRuleStatement> executor = new
CountMaskRuleExecutor();
+ Collection<String> columns = executor.getColumnNames();
+ 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"));
}
private ShardingSphereDatabase mockDatabase() {
