You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by yx...@apache.org on 2025/03/24 13:44:39 UTC
(shardingsphere) branch master updated: Use DistSQLDatabaseRuleQueryExecutorAssert in ShowDefaultSingleTableStorageUnitExecutorTest (#35066)
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 b6ca8f2f107 Use DistSQLDatabaseRuleQueryExecutorAssert in ShowDefaultSingleTableStorageUnitExecutorTest (#35066)
b6ca8f2f107 is described below
commit b6ca8f2f10770a75f3ada6e986460ccb2a8862c1
Author: ilyas ahsan <me...@gmail.com>
AuthorDate: Mon Mar 24 20:44:31 2025 +0700
Use DistSQLDatabaseRuleQueryExecutorAssert in ShowDefaultSingleTableStorageUnitExecutorTest (#35066)
* Use DistSQLDatabaseRuleQueryExecutorAssert in ShowShardingTableRulesUsedAuditorExecutorTest
* Use DistSQLDatabaseRuleQueryExecutorAssert in ShowDefaultSingleTableStorageUnitExecutorTest
---
...wDefaultSingleTableStorageUnitExecutorTest.java | 37 ++++++----------------
...t-single-table-storage-unit-current-config.yaml | 21 ++++++++++++
.../show-default-single-table-storage-unit.xml | 27 ++++++++++++++++
3 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutorTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutorTest.java
index 4d7ab13c063..9169327d854 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutorTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutorTest.java
@@ -18,44 +18,27 @@
package org.apache.shardingsphere.single.distsql.handler.query;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
-import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
-import org.apache.shardingsphere.single.distsql.statement.rql.ShowDefaultSingleTableStorageUnitStatement;
import org.apache.shardingsphere.single.rule.SingleRule;
-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.stream.Stream;
import static org.mockito.Mockito.mock;
-class ShowDefaultSingleTableStorageUnitExecutorTest extends DistSQLDatabaseRuleQueryExecutorTest {
+@DistSQLRuleQueryExecutorSettings("cases/show-default-single-table-storage-unit.xml")
+class ShowDefaultSingleTableStorageUnitExecutorTest {
- ShowDefaultSingleTableStorageUnitExecutorTest() {
- super(mock(SingleRule.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", new SingleRuleConfiguration(Collections.emptyList(), "foo_ds"), new ShowDefaultSingleTableStorageUnitStatement(null),
- Collections.singleton(new LocalDataQueryResultRow("foo_ds"))));
- }
+ @ParameterizedTest(name = "DistSQL -> {0}")
+ @ArgumentsSource(DistSQLRuleQueryExecutorTestCaseArgumentsProvider.class)
+ void assertExecuteQuery(@SuppressWarnings("unused") final String distSQL, final DistSQLStatement sqlStatement,
+ final SingleRuleConfiguration currentRuleConfig, final Collection<LocalDataQueryResultRow> expected) throws SQLException {
+ new DistSQLDatabaseRuleQueryExecutorAssert(mock(SingleRule.class)).assertQueryResultRows(currentRuleConfig, sqlStatement, expected);
}
}
diff --git a/kernel/single/distsql/handler/src/test/resources/cases/show-default-single-table-storage-unit-current-config.yaml b/kernel/single/distsql/handler/src/test/resources/cases/show-default-single-table-storage-unit-current-config.yaml
new file mode 100644
index 00000000000..ba57f46beb3
--- /dev/null
+++ b/kernel/single/distsql/handler/src/test/resources/cases/show-default-single-table-storage-unit-current-config.yaml
@@ -0,0 +1,21 @@
+#
+# 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:
+ - !SINGLE
+ tables:
+ - "*.*"
diff --git a/kernel/single/distsql/handler/src/test/resources/cases/show-default-single-table-storage-unit.xml b/kernel/single/distsql/handler/src/test/resources/cases/show-default-single-table-storage-unit.xml
new file mode 100644
index 00000000000..2bc6afc305f
--- /dev/null
+++ b/kernel/single/distsql/handler/src/test/resources/cases/show-default-single-table-storage-unit.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 DEFAULT SINGLE TABLE STORAGE UNIT" current-rule-config-yaml-file="cases/show-default-single-table-storage-unit-current-config.yaml">
+ <expected-query-result-rows>
+ <expected-query-result-row>
+ RANDOM
+ </expected-query-result-row>
+ </expected-query-result-rows>
+ </test-case>
+</distsql-rule-query-executor-test-cases>