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 e4f60815081 Replace `UnusedShardingKeyGeneratorResultSet` with
`ShowUnusedShardingKeyGeneratorExecutor` (#23866)
e4f60815081 is described below
commit e4f60815081be61f9bf537e1d4560079a53e52d2
Author: Zichao <[email protected]>
AuthorDate: Tue Jan 31 22:14:39 2023 +1300
Replace `UnusedShardingKeyGeneratorResultSet` with
`ShowUnusedShardingKeyGeneratorExecutor` (#23866)
---
...=> ShowUnusedShardingKeyGeneratorExecutor.java} | 47 ++++++----------------
...hardingsphere.distsql.handler.query.RQLExecutor | 1 +
...here.distsql.handler.resultset.DistSQLResultSet | 1 -
...howUnusedShardingKeyGeneratorExecutorTest.java} | 38 +++++++++++------
4 files changed, 39 insertions(+), 48 deletions(-)
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorResultSet.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
similarity index 70%
rename from
features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorResultSet.java
rename to
features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
index 5597f01b7d0..ebbe74a9cd2 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/UnusedShardingKeyGeneratorResultSet.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
@@ -18,51 +18,46 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import com.google.common.base.Strings;
+import org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
-import
org.apache.shardingsphere.distsql.handler.resultset.DatabaseDistSQLResultSet;
+import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.util.props.PropertiesConverter;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingKeyGeneratorsStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-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.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
-import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
/**
- * Result set for show unused sharding key generator.
+ * Show unused sharding key generator executor.
*/
-public final class UnusedShardingKeyGeneratorResultSet implements
DatabaseDistSQLResultSet {
-
- private Iterator<Entry<String, AlgorithmConfiguration>> data =
Collections.emptyIterator();
+public final class ShowUnusedShardingKeyGeneratorExecutor implements
RQLExecutor<ShowUnusedShardingKeyGeneratorsStatement> {
@Override
- public void init(final ShardingSphereDatabase database, final SQLStatement
sqlStatement) {
+ public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase database, final ShowUnusedShardingKeyGeneratorsStatement
sqlStatement) {
Optional<ShardingRule> rule =
database.getRuleMetaData().findSingleRule(ShardingRule.class);
- rule.ifPresent(optional ->
getUnusedKeyGenerators((ShardingRuleConfiguration)
optional.getConfiguration()));
- }
-
- private void getUnusedKeyGenerators(final ShardingRuleConfiguration
shardingRuleConfig) {
+ if (!rule.isPresent()) {
+ return Collections.emptyList();
+ }
+ ShardingRuleConfiguration shardingRuleConfig =
(ShardingRuleConfiguration) rule.get().getConfiguration();
+ Collection<LocalDataQueryResultRow> result = new LinkedList<>();
Collection<String> inUsedKeyGenerators =
getUsedKeyGenerators(shardingRuleConfig);
- Map<String, AlgorithmConfiguration> map = new HashMap<>();
for (Entry<String, AlgorithmConfiguration> entry :
shardingRuleConfig.getKeyGenerators().entrySet()) {
if (!inUsedKeyGenerators.contains(entry.getKey())) {
- map.put(entry.getKey(), entry.getValue());
+ result.add(new LocalDataQueryResultRow(entry.getKey(),
entry.getValue().getType(), buildProps(entry.getValue().getProps())));
}
}
- data = map.entrySet().iterator();
+ return result;
}
private Collection<String> getUsedKeyGenerators(final
ShardingRuleConfiguration shardingRuleConfig) {
@@ -81,24 +76,6 @@ public final class UnusedShardingKeyGeneratorResultSet
implements DatabaseDistSQ
return Arrays.asList("name", "type", "props");
}
- @Override
- public boolean next() {
- return data.hasNext();
- }
-
- @Override
- public Collection<Object> getRowData() {
- return buildTableRowData(data.next());
- }
-
- private Collection<Object> buildTableRowData(final Entry<String,
AlgorithmConfiguration> data) {
- Collection<Object> result = new LinkedList<>();
- result.add(data.getKey());
- result.add(data.getValue().getType());
- result.add(buildProps(data.getValue().getProps()));
- return result;
- }
-
private Object buildProps(final Properties props) {
return Objects.nonNull(props) ? PropertiesConverter.convert(props) :
"";
}
diff --git
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
index d0ef5baad1b..9c1ed65855b 100644
---
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
+++
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
@@ -25,3 +25,4 @@
org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableRulesU
org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableRulesUsedAuditorExecutor
org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableNodesExecutor
org.apache.shardingsphere.sharding.distsql.handler.query.ShowUnusedShardingAlgorithmsExecutor
+org.apache.shardingsphere.sharding.distsql.handler.query.ShowUnusedShardingKeyGeneratorExecutor
diff --git
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
index 51b174a22ca..8dc6f9999dc 100644
---
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
+++
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
@@ -17,6 +17,5 @@
org.apache.shardingsphere.sharding.distsql.handler.query.ShardingTableReferenceRuleResultSet
org.apache.shardingsphere.sharding.distsql.handler.query.BroadcastTableRuleResultSet
-org.apache.shardingsphere.sharding.distsql.handler.query.UnusedShardingKeyGeneratorResultSet
org.apache.shardingsphere.sharding.distsql.handler.query.UnusedShardingAuditorsResultSet
org.apache.shardingsphere.sharding.distsql.handler.query.CountShardingRuleResultSet
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/UnusedShardingKeyGeneratorResultSetTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java
similarity index 70%
rename from
features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/UnusedShardingKeyGeneratorResultSetTest.java
rename to
features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java
index b8220aa8a43..d86ac61616d 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/UnusedShardingKeyGeneratorResultSetTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java
@@ -17,21 +17,23 @@
package org.apache.shardingsphere.sharding.distsql.query;
+import org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+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.sharding.api.config.ShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.distsql.handler.query.UnusedShardingKeyGeneratorResultSet;
-import
org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingAlgorithmsStatement;
+import
org.apache.shardingsphere.sharding.distsql.handler.query.ShowUnusedShardingKeyGeneratorExecutor;
+import
org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingKeyGeneratorsStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.Test;
-import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
-import java.util.List;
+import java.util.Iterator;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
@@ -40,17 +42,29 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class UnusedShardingKeyGeneratorResultSetTest {
+public final class ShowUnusedShardingKeyGeneratorExecutorTest {
@Test
public void assertGetRowData() {
- UnusedShardingKeyGeneratorResultSet resultSet = new
UnusedShardingKeyGeneratorResultSet();
- resultSet.init(mockDatabase(),
mock(ShowShardingAlgorithmsStatement.class));
- List<Object> actual = new ArrayList<>(resultSet.getRowData());
- assertThat(actual.size(), is(3));
- assertThat(actual.get(0), is("uuid_key_generator"));
- assertThat(actual.get(1), is("UUID"));
- assertThat(actual.get(2).toString(), is(""));
+ RQLExecutor<ShowUnusedShardingKeyGeneratorsStatement> executor = new
ShowUnusedShardingKeyGeneratorExecutor();
+ Collection<LocalDataQueryResultRow> actual =
executor.getRows(mockDatabase(),
mock(ShowUnusedShardingKeyGeneratorsStatement.class));
+ assertThat(actual.size(), is(1));
+ Iterator<LocalDataQueryResultRow> iterator = actual.iterator();
+ LocalDataQueryResultRow row = iterator.next();
+ assertThat(row.getCell(1), is("uuid_key_generator"));
+ assertThat(row.getCell(2), is("UUID"));
+ assertThat(row.getCell(3), is(""));
+ }
+
+ @Test
+ public void assertGetColumnNames() {
+ RQLExecutor<ShowUnusedShardingKeyGeneratorsStatement> executor = new
ShowUnusedShardingKeyGeneratorExecutor();
+ Collection<String> columns = executor.getColumnNames();
+ assertThat(columns.size(), is(3));
+ Iterator<String> iterator = columns.iterator();
+ assertThat(iterator.next(), is("name"));
+ assertThat(iterator.next(), is("type"));
+ assertThat(iterator.next(), is("props"));
}
private ShardingSphereDatabase mockDatabase() {
