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 37e55bd7a5f Use DistSQLDatabaseRuleQueryExecutorAssert in
ShowDefaultShardingStrategyExecutorTest (#35104)
37e55bd7a5f is described below
commit 37e55bd7a5fccc39ba3a77599e995effa4ebe717
Author: ilyas ahsan <meilyasah...@gmail.com>
AuthorDate: Sat Mar 29 19:36:17 2025 +0700
Use DistSQLDatabaseRuleQueryExecutorAssert in
ShowDefaultShardingStrategyExecutorTest (#35104)
* Use DistSQLDatabaseRuleQueryExecutorAssert in
ShowShardingTableRulesUsedAuditorExecutorTest
* Use DistSQLDatabaseRuleQueryExecutorAssert in
ShowDefaultShardingStrategyExecutorTest
---
.../ShowDefaultShardingStrategyExecutorTest.java | 64 ++++------------------
...w-default-sharding-strategy-current-config.yaml | 46 ++++++++++++++++
.../cases/show-default-sharding-strategy.xml | 30 ++++++++++
3 files changed, 86 insertions(+), 54 deletions(-)
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutorTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutorTest.java
index 7fdba55973f..9610f51d1f5 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutorTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutorTest.java
@@ -18,71 +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.strategy.sharding.HintShardingStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
-import
org.apache.shardingsphere.sharding.distsql.statement.ShowDefaultShardingStrategyStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-import
org.apache.shardingsphere.test.it.distsql.handler.engine.query.DistSQLDatabaseRuleQueryExecutorTest;
-import org.apache.shardingsphere.test.util.PropertiesBuilder;
-import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
-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.Arrays;
import java.util.Collection;
-import java.util.stream.Stream;
import static org.mockito.Mockito.mock;
-class ShowDefaultShardingStrategyExecutorTest extends
DistSQLDatabaseRuleQueryExecutorTest {
+@DistSQLRuleQueryExecutorSettings("cases/show-default-sharding-strategy.xml")
+class ShowDefaultShardingStrategyExecutorTest {
- ShowDefaultShardingStrategyExecutorTest() {
- 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("withNullShardingStrategy",
new ShardingRuleConfiguration(), new ShowDefaultShardingStrategyStatement(null),
- Arrays.asList(new LocalDataQueryResultRow("TABLE", "", "",
"", "", ""), new LocalDataQueryResultRow("DATABASE", "", "", "", "", ""))),
- Arguments.arguments("withNoneShardingStrategyType",
createRuleConfigurationWithNoneShardingStrategyType(), new
ShowDefaultShardingStrategyStatement(null),
- Arrays.asList(new LocalDataQueryResultRow("TABLE",
"NONE", "", "", "", ""), new LocalDataQueryResultRow("DATABASE", "NONE", "",
"", "", ""))),
- Arguments.arguments("withShardingStrategyType",
createRuleConfigurationWithShardingStrategyType(), new
ShowDefaultShardingStrategyStatement(null),
- Arrays.asList(
- new LocalDataQueryResultRow("TABLE",
"STANDARD", "use_id", "database_inline", "INLINE",
"{\"algorithm-expression\":\"ds_${user_id % 2}\"}"),
- new LocalDataQueryResultRow("DATABASE",
"HINT", "", "database_inline", "INLINE",
"{\"algorithm-expression\":\"ds_${user_id % 2}\"}"))));
- }
-
- private ShardingRuleConfiguration
createRuleConfigurationWithNoneShardingStrategyType() {
- ShardingRuleConfiguration result = new ShardingRuleConfiguration();
- result.setDefaultTableShardingStrategy(new
NoneShardingStrategyConfiguration());
- result.setDefaultDatabaseShardingStrategy(new
NoneShardingStrategyConfiguration());
- return result;
- }
-
- private ShardingRuleConfiguration
createRuleConfigurationWithShardingStrategyType() {
- ShardingRuleConfiguration result = new ShardingRuleConfiguration();
- result.getShardingAlgorithms().put("database_inline", new
AlgorithmConfiguration("INLINE", PropertiesBuilder.build(new
Property("algorithm-expression", "ds_${user_id % 2}"))));
- result.setDefaultTableShardingStrategy(new
StandardShardingStrategyConfiguration("use_id", "database_inline"));
- result.setDefaultDatabaseShardingStrategy(new
HintShardingStrategyConfiguration("database_inline"));
- 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-default-sharding-strategy-current-config.yaml
b/features/sharding/distsql/handler/src/test/resources/cases/show-default-sharding-strategy-current-config.yaml
new file mode 100644
index 00000000000..5282e03fbaa
--- /dev/null
+++
b/features/sharding/distsql/handler/src/test/resources/cases/show-default-sharding-strategy-current-config.yaml
@@ -0,0 +1,46 @@
+#
+# 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: table_inline
+ keyGenerateStrategy:
+ column: order_id
+ keyGeneratorName: snowflake
+ defaultDatabaseStrategy:
+ standard:
+ shardingColumn: order_id
+ shardingAlgorithmName: database_inline
+ defaultTableStrategy:
+ standard:
+ shardingColumn: order_id
+ shardingAlgorithmName: table_inline
+ shardingAlgorithms:
+ database_inline:
+ type: INLINE
+ props:
+ algorithm-expression: ds_${order_id % 2}
+ table_inline:
+ type: INLINE
+ props:
+ algorithm-expression: t_order_${order_id % 2}
diff --git
a/features/sharding/distsql/handler/src/test/resources/cases/show-default-sharding-strategy.xml
b/features/sharding/distsql/handler/src/test/resources/cases/show-default-sharding-strategy.xml
new file mode 100644
index 00000000000..78c2e780872
--- /dev/null
+++
b/features/sharding/distsql/handler/src/test/resources/cases/show-default-sharding-strategy.xml
@@ -0,0 +1,30 @@
+<?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 DEFAULT SHARDING STRATEGY"
current-rule-config-yaml-file="cases/show-default-sharding-strategy-current-config.yaml">
+ <expected-query-result-rows>
+ <expected-query-result-row>
+
TABLE|STANDARD|order_id|table_inline|INLINE|{"algorithm-expression":"t_order_${order_id
% 2}"}
+ </expected-query-result-row>
+ <expected-query-result-row>
+
DATABASE|STANDARD|order_id|database_inline|INLINE|{"algorithm-expression":"ds_${order_id
% 2}"}
+ </expected-query-result-row>
+ </expected-query-result-rows>
+ </test-case>
+</distsql-rule-query-executor-test-cases>
