This is an automated email from the ASF dual-hosted git repository.
yx9o 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 4df922296c2 Use DistSQLDatabaseRuleQueryExecutorAssert in
ShowUnusedShardingKeyGeneratorExecutorTest (#34938)
4df922296c2 is described below
commit 4df922296c2d3e8e20bb5974fb13b4bad890b648
Author: ilyas ahsan <meilyasah...@gmail.com>
AuthorDate: Mon Mar 10 07:26:50 2025 +0700
Use DistSQLDatabaseRuleQueryExecutorAssert in
ShowUnusedShardingKeyGeneratorExecutorTest (#34938)
* Use DistSQLDatabaseRuleQueryExecutorAssert in
ShowShardingTableRulesUsedAuditorExecutorTest
* Use DistSQLDatabaseRuleQueryExecutorAssert in
ShowUnusedShardingKeyGeneratorExecutorTest
---
...ShowUnusedShardingKeyGeneratorExecutorTest.java | 66 ++++------------------
...used-sharding-key-generator-current-config.yaml | 39 +++++++++++++
.../cases/show-unused-sharding-key-generator.xml | 27 +++++++++
3 files changed, 76 insertions(+), 56 deletions(-)
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutorTest.java
index df71e2ae619..68d6d6a0268 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutorTest.java
@@ -18,73 +18,27 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
-import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import
org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
-import
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
-import
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
-import
org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingKeyGeneratorsStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-import
org.apache.shardingsphere.test.it.distsql.handler.engine.query.DistSQLDatabaseRuleQueryExecutorTest;
-import org.junit.jupiter.api.extension.ExtensionContext;
+import
org.apache.shardingsphere.test.it.distsql.handler.engine.query.DistSQLDatabaseRuleQueryExecutorAssert;
+import
org.apache.shardingsphere.test.it.distsql.handler.engine.query.DistSQLRuleQueryExecutorSettings;
+import
org.apache.shardingsphere.test.it.distsql.handler.engine.query.DistSQLRuleQueryExecutorTestCaseArgumentsProvider;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import java.sql.SQLException;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Properties;
-import java.util.stream.Stream;
import static org.mockito.Mockito.mock;
-class ShowUnusedShardingKeyGeneratorExecutorTest extends
DistSQLDatabaseRuleQueryExecutorTest {
+@DistSQLRuleQueryExecutorSettings("cases/show-unused-sharding-key-generator.xml")
+class ShowUnusedShardingKeyGeneratorExecutorTest {
- ShowUnusedShardingKeyGeneratorExecutorTest() {
- super(mock(ShardingRule.class));
- }
-
- @ParameterizedTest(name = "{0}")
- @ArgumentsSource(TestCaseArgumentsProvider.class)
- void assertExecuteQuery(final String name, final DatabaseRuleConfiguration
ruleConfig, final DistSQLStatement sqlStatement,
- final Collection<LocalDataQueryResultRow>
expected) throws SQLException {
- assertQueryResultRows(ruleConfig, sqlStatement, expected);
- }
-
- private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
-
- @Override
- public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return Stream.of(Arguments.arguments("normal",
createRuleConfiguration(), new ShowUnusedShardingKeyGeneratorsStatement(null),
- Collections.singleton(new
LocalDataQueryResultRow("uuid_key_generator", "UUID", ""))));
- }
-
- private ShardingRuleConfiguration createRuleConfiguration() {
- ShardingRuleConfiguration result = new ShardingRuleConfiguration();
- result.getKeyGenerators().put("snowflake_key_generator", new
AlgorithmConfiguration("SNOWFLAKE", new Properties()));
- result.getKeyGenerators().put("uuid_key_generator", new
AlgorithmConfiguration("UUID", null));
- result.getTables().add(createShardingTableRuleConfiguration());
- result.getTables().add(new
ShardingTableRuleConfiguration("bar_table", null));
-
result.getAutoTables().add(createShardingAutoTableRuleConfiguration());
- result.getAutoTables().add(new
ShardingAutoTableRuleConfiguration("bar_auto_table", null));
- result.setDefaultKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration(null, "snowflake_key_generator"));
- return result;
- }
-
- private ShardingTableRuleConfiguration
createShardingTableRuleConfiguration() {
- ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("foo_tbl", null);
- result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("foo_col", "snowflake_key_generator"));
- return result;
- }
-
- private ShardingAutoTableRuleConfiguration
createShardingAutoTableRuleConfiguration() {
- ShardingAutoTableRuleConfiguration result = new
ShardingAutoTableRuleConfiguration("foo_auto_table", null);
- result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("foo_col", "snowflake_key_generator"));
- return result;
- }
+ @ParameterizedTest(name = "DistSQL -> {0}")
+ @ArgumentsSource(DistSQLRuleQueryExecutorTestCaseArgumentsProvider.class)
+ void assertExecuteQuery(@SuppressWarnings("unused") final String distSQL,
final DistSQLStatement sqlStatement,
+ final ShardingRuleConfiguration currentRuleConfig,
final Collection<LocalDataQueryResultRow> expected) throws SQLException {
+ new
DistSQLDatabaseRuleQueryExecutorAssert(mock(ShardingRule.class)).assertQueryResultRows(currentRuleConfig,
sqlStatement, expected);
}
}
diff --git
a/features/sharding/distsql/handler/src/test/resources/cases/show-unused-sharding-key-generator-current-config.yaml
b/features/sharding/distsql/handler/src/test/resources/cases/show-unused-sharding-key-generator-current-config.yaml
new file mode 100644
index 00000000000..aea0c66db7a
--- /dev/null
+++
b/features/sharding/distsql/handler/src/test/resources/cases/show-unused-sharding-key-generator-current-config.yaml
@@ -0,0 +1,39 @@
+#
+# 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.
+#
+
+rules:
+ - !SHARDING
+ tables:
+ t_order:
+ actualDataNodes: ds_${0..1}.t_order_${0..1}
+ tableStrategy:
+ standard:
+ shardingColumn: order_id
+ shardingAlgorithmName: t_order_inline
+ keyGenerateStrategy:
+ column: order_id
+ keyGeneratorName: snowflake
+ auditStrategy:
+ auditorNames:
+ - sharding_key_required_auditor
+ allowHintDisable: true
+
+ keyGenerators:
+ snowflake:
+ type: SNOWFLAKE
+ uuid:
+ type: UUID
diff --git
a/features/sharding/distsql/handler/src/test/resources/cases/show-unused-sharding-key-generator.xml
b/features/sharding/distsql/handler/src/test/resources/cases/show-unused-sharding-key-generator.xml
new file mode 100644
index 00000000000..1db8b0833c3
--- /dev/null
+++
b/features/sharding/distsql/handler/src/test/resources/cases/show-unused-sharding-key-generator.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<distsql-rule-query-executor-test-cases>
+ <test-case dist-sql="SHOW UNUSED SHARDING KEY GENERATORS"
current-rule-config-yaml-file="cases/show-unused-sharding-key-generator-current-config.yaml">
+ <expected-query-result-rows>
+ <expected-query-result-row>
+ uuid|UUID|
+ </expected-query-result-row>
+ </expected-query-result-rows>
+ </test-case>
+</distsql-rule-query-executor-test-cases>
