You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/02/10 04:02:11 UTC
[shardingsphere] branch master updated: Revise #24062 (#24092)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 be9d8b2fb1b Revise #24062 (#24092)
be9d8b2fb1b is described below
commit be9d8b2fb1be4ea4c4b2987654e9d6d19b13fd55
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Fri Feb 10 12:02:02 2023 +0800
Revise #24062 (#24092)
* Revise #24062
* Fix IT failure
* Fix RDL IT
---
.../apache/shardingsphere/test/e2e/cases/SQLCommandType.java | 10 +++++-----
.../cases/ral/dataset/empty_rules/show_dist_variables.xml | 4 ++--
.../cases/ral/dataset/empty_rules/show_sharding_table_rule.xml | 2 +-
.../rdl/dataset/rdl_empty_rules/drop_single_table_rules.xml | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java
index 8a8fb710b3f..e87f4cf5eb2 100644
--- a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java
+++ b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java
@@ -53,14 +53,14 @@ public enum SQLCommandType {
*
* <p>Such as {@code INSERT}, {@code UPDATE}, {@code DELETE}.</p>
*/
- DML(DMLStatement.class, "dml-integration-test-cases", false, Arrays.asList("jdbc", "proxy")),
+ DML(DMLStatement.class, "dml-integration", false, Arrays.asList("jdbc", "proxy")),
/**
* Data Definition Language.
*
* <p>Such as {@code CREATE}, {@code ALTER}, {@code DROP}, {@code TRUNCATE}.</p>
*/
- DDL(DDLStatement.class, "ddl-integration-test-cases", false, Arrays.asList("jdbc", "proxy")),
+ DDL(DDLStatement.class, "ddl-integration", false, Arrays.asList("jdbc", "proxy")),
/**
* Transaction Control Language.
@@ -77,17 +77,17 @@ public enum SQLCommandType {
/**
* Database control Language.
*/
- DCL(DCLStatement.class, "dcl-integration-test-cases", false, Arrays.asList("jdbc", "proxy")),
+ DCL(DCLStatement.class, "dcl-integration", false, Arrays.asList("jdbc", "proxy")),
/**
* Resource & Rule Administration Language.
*/
- RAL(RALStatement.class, "ral-integration-test-cases", true, Collections.singletonList("proxy")),
+ RAL(RALStatement.class, "ral-integration", true, Collections.singletonList("proxy")),
/**
* Resource & Rule Definition Language.
*/
- RDL(RDLStatement.class, "rdl-integration-test-cases", true, Collections.singletonList("proxy")),
+ RDL(RDLStatement.class, "rdl-integration", true, Collections.singletonList("proxy")),
/**
* Resource & Rule Query Language.
diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
index 673ab2933b2..14fff35f330 100644
--- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
+++ b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
@@ -21,8 +21,6 @@
<column name="variable_value" />
</metadata>
<row values="system_log_level| INFO" />
- <row values="sql_show| false" />
- <row values="sql_simple| false" />
<row values="kernel_executor_size| 16" />
<row values="max_connections_size_per_query| 1" />
<row values="check_table_meta_data_enabled| false" />
@@ -41,4 +39,6 @@
<row values="agent_plugins_enabled| true" />
<row values="cached_connections| 0" />
<row values="transaction_type| LOCAL" />
+ <row values="sql_show| false" />
+ <row values="sql_simple| false" />
</dataset>
diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
index ad8b0dbee29..555adf6caad 100644
--- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
+++ b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
@@ -34,6 +34,6 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_user| | write_ds_${0..9}| | | | | STANDARD| user_id| MOD| sharding-count=40| user_id| IT.FIXTURE| | |" />
+ <row values="t_user| | write_ds_${0..9}| | | | | STANDARD| user_id| MOD| sharding-count=40| user_id| IT.FIXTURE|| IT.AUDITOR.FIXTURE| true" />
<row values="t_user_item| | write_ds_${0..9}| | | | |STANDARD| user_id| MOD| sharding-count=40| user_id| IT.FIXTURE| | |" />
</dataset>
diff --git a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_single_table_rules.xml b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_single_table_rules.xml
index 9ed72429c45..9e2d4b8f74a 100644
--- a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_single_table_rules.xml
+++ b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_single_table_rules.xml
@@ -22,6 +22,6 @@
</metadata>
<row values="t_country| ds_2" />
<row values="t_product_category| ds_2" />
- <row values="t_user| ds_0" />
+ <row values="t_user| readwrite_ds" />
</dataset>