This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 0428363452d Refactor db, tbl e2e case (#35021)
0428363452d is described below
commit 0428363452d6bc6dfabfadc02fc245b27a4f70c6
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Tue Mar 18 09:11:37 2025 +0800
Refactor db, tbl e2e case (#35021)
---
.../cases/ddl/dataset/db/create_broadcast_index.xml | 2 +-
.../ddl/dataset/db/create_broadcast_unique_index.xml | 2 +-
.../resources/cases/ddl/dataset/db/create_index.xml | 2 +-
.../cases/ddl/dataset/db/create_unique_index.xml | 2 +-
.../create_broadcast_index.xml | 2 +-
.../create_broadcast_unique_index.xml | 2 +-
.../dbtbl_with_readwrite_splitting/create_index.xml | 2 +-
.../create_unique_index.xml | 2 +-
.../create_broadcast_unique_index.xml | 2 +-
.../ddl/dataset/readwrite_splitting/create_index.xml | 2 +-
.../readwrite_splitting/create_unique_index.xml | 2 +-
.../cases/ddl/dataset/shadow/create_index.xml | 2 +-
.../cases/ddl/dataset/shadow/create_unique_index.xml | 2 +-
.../ddl/dataset/sharding_governance/create_index.xml | 2 +-
.../sharding_governance/create_unique_index.xml | 2 +-
.../cases/ddl/dataset/tbl/create_broadcast_index.xml | 2 +-
.../resources/cases/ddl/dataset/tbl/create_index.xml | 2 +-
.../cases/ddl/dataset/tbl/create_unique_index.xml | 2 +-
.../test/resources/cases/ddl/e2e-ddl-create-index.xml | 12 ++++++------
.../test/resources/cases/ddl/e2e-ddl-drop-index.xml | 18 +++++++++---------
.../resources/cases/dql/e2e-dql-select-order-by.xml | 12 ++++--------
.../src/test/resources/cases/dql/e2e-dql-select.xml | 15 +++++----------
22 files changed, 42 insertions(+), 51 deletions(-)
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_broadcast_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_broadcast_index.xml
index 1f2778d37c9..1e08d95da6e 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_broadcast_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_broadcast_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_broadcast_table_for_ddl"
data-nodes="db_${0..9}.t_broadcast_table_for_ddl">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index
name="t_broadcast_table_for_ddl_index_t_broadcast_table_for_ddl" column="id"
unique="false" />
+ <index name="t_broadcast_table_for_ddl_idx_t_broadcast_table_for_ddl"
column="id" unique="false" />
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_broadcast_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_broadcast_unique_index.xml
index 94fbb26b525..19f77268f55 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_broadcast_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_broadcast_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_broadcast_table_for_ddl"
data-nodes="db_${0..9}.t_broadcast_table_for_ddl">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index
name="t_broadcast_table_for_ddl_index_t_broadcast_table_for_ddl" column="id"
unique="true" />
+ <index name="t_broadcast_table_for_ddl_idx_t_broadcast_table_for_ddl"
column="id" unique="true" />
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_index.xml
index d3bdabb3351..3ebe8059e41 100644
--- a/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_index.xml
+++ b/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="db_${0..9}.t_order_details">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="false" />
+ <index name="t_details_idx_t_order_details" column="id" unique="false"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_unique_index.xml
index 2a0822195a4..b821cdf888c 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/db/create_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="db_${0..9}.t_order_details">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="true" />
+ <index name="t_details_idx_t_order_details" column="id" unique="true"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_broadcast_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_broadcast_index.xml
index c30ea9f2a5b..efa85659657 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_broadcast_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_broadcast_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_broadcast_table_for_ddl"
data-nodes="write_ds_${0..9}.t_broadcast_table_for_ddl,read_ds_${0..9}.t_broadcast_table_for_ddl">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index
name="t_broadcast_table_for_ddl_index_t_broadcast_table_for_ddl" column="id"
unique="false" />
+ <index name="t_broadcast_table_for_ddl_idx_t_broadcast_table_for_ddl"
column="id" unique="false" />
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_broadcast_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_broadcast_unique_index.xml
index 88f54fdc1ea..46874ac4e4f 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_broadcast_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_broadcast_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_broadcast_table_for_ddl"
data-nodes="write_ds_${0..9}.t_broadcast_table_for_ddl,read_ds_${0..9}.t_broadcast_table_for_ddl">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index
name="t_broadcast_table_for_ddl_index_t_broadcast_table_for_ddl" column="id"
unique="true" />
+ <index name="t_broadcast_table_for_ddl_idx_t_broadcast_table_for_ddl"
column="id" unique="true" />
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_index.xml
index 1227a99b5e6..8f5f6c82556 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="write_ds_${0..9}.t_order_details_${0..9},read_ds_${0..9}.t_order_details_${0..9}">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="false" />
+ <index name="t_details_idx_t_order_details" column="id" unique="false"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_unique_index.xml
index c7954b1eff6..dc4c9b21f82 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting/create_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="write_ds_${0..9}.t_order_details_${0..9},read_ds_${0..9}.t_order_details_${0..9}">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="true" />
+ <index name="t_details_idx_t_order_details" column="id" unique="true"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_broadcast_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_broadcast_unique_index.xml
index aebc917f0af..ce194983e70 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_broadcast_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_broadcast_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_broadcast_table_for_ddl"
data-nodes="write_ds.t_broadcast_table_for_ddl,read_${0..1}.t_broadcast_table_for_ddl">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index
name="t_broadcast_table_for_ddl_index_t_broadcast_table_for_ddl" column="id"
unique="true" />
+ <index name="t_broadcast_table_for_ddl_idx_t_broadcast_table_for_ddl"
column="id" unique="true" />
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_index.xml
index ba2064cad62..503ef8c4f47 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="write_ds.t_order_details,read_${0..1}.t_order_details">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="false" />
+ <index name="t_details_idx_t_order_details" column="id" unique="false"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_unique_index.xml
index d84fbaf7523..f7726c26c03 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/readwrite_splitting/create_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="write_ds.t_order_details,read_${0..1}.t_order_details">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="true" />
+ <index name="t_details_idx_t_order_details" column="id" unique="true"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/shadow/create_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/shadow/create_index.xml
index 99a7030aed9..0bd14179469 100644
--- a/test/e2e/sql/src/test/resources/cases/ddl/dataset/shadow/create_index.xml
+++ b/test/e2e/sql/src/test/resources/cases/ddl/dataset/shadow/create_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details" data-nodes="db.t_order_details">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index" column="id" unique="false" />
+ <index name="t_details_idx" column="id" unique="false" />
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/shadow/create_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/shadow/create_unique_index.xml
index 330b4cece5f..9fcc68a7f83 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/shadow/create_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/shadow/create_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details" data-nodes="db.t_order_details">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index" column="id" unique="true" />
+ <index name="t_details_idx" column="id" unique="true" />
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/sharding_governance/create_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/sharding_governance/create_index.xml
index 13ec02732e6..2d0857d27c5 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/sharding_governance/create_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/sharding_governance/create_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="governance_db.t_order_details">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="false" />
+ <index name="t_details_idx_t_order_details" column="id" unique="false"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/sharding_governance/create_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/sharding_governance/create_unique_index.xml
index 52c66916645..0093fbd6474 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/sharding_governance/create_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/sharding_governance/create_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="governance_db.t_order_details">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="true" />
+ <index name="t_details_idx_t_order_details" column="id" unique="true"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_broadcast_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_broadcast_index.xml
index e7a7d786a2c..1be78e3bf1c 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_broadcast_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_broadcast_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_broadcast_table_for_ddl"
data-nodes="tbl.t_broadcast_table_for_ddl">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index
name="t_broadcast_table_for_ddl_index_t_broadcast_table_for_ddl" column="id"
unique="false" />
+ <index name="t_broadcast_table_for_ddl_idx_t_broadcast_table_for_ddl"
column="id" unique="false" />
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_index.xml
index 2da3e39e556..765b9e30335 100644
--- a/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_index.xml
+++ b/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="tbl.t_order_details_${0..9}">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="false" />
+ <index name="t_details_idx_t_order_details" column="id" unique="false"
/>
</metadata>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_unique_index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_unique_index.xml
index f2ddb2c52a7..0537c1baf3a 100644
---
a/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_unique_index.xml
+++
b/test/e2e/sql/src/test/resources/cases/ddl/dataset/tbl/create_unique_index.xml
@@ -19,6 +19,6 @@
<metadata table-name="t_order_details"
data-nodes="tbl.t_order_details_${0..9}">
<column name="id" type="integer" />
<column name="description" type="varchar" />
- <index name="t_order_details_index_t_order_details" column="id"
unique="true" />
+ <index name="t_details_idx_t_order_details" column="id" unique="true"
/>
</metadata>
</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/ddl/e2e-ddl-create-index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/e2e-ddl-create-index.xml
index 0d1c6c28e46..2dbcac93e9b 100644
--- a/test/e2e/sql/src/test/resources/cases/ddl/e2e-ddl-create-index.xml
+++ b/test/e2e/sql/src/test/resources/cases/ddl/e2e-ddl-create-index.xml
@@ -17,20 +17,20 @@
-->
<e2e-test-cases>
- <test-case sql="CREATE INDEX t_order_details_index ON t_order_details
(id)" db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
+ <test-case sql="CREATE INDEX t_details_idx ON t_order_details (id)"
db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-file="create_index.xml">
<initial-sql sql="CREATE TABLE t_order_details(id int, description
varchar(10))" affected-table="t_order_details" />
<destroy-sql sql="DROP TABLE t_order_details" />
</assertion>
</test-case>
- <test-case sql="CREATE INDEX t_broadcast_table_for_ddl_index ON
t_broadcast_table_for_ddl (id)" db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting">
+ <test-case sql="CREATE INDEX t_broadcast_table_for_ddl_idx ON
t_broadcast_table_for_ddl (id)" db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting">
<assertion expected-data-file="create_broadcast_index.xml">
<initial-sql sql="CREATE TABLE t_broadcast_table_for_ddl(id int,
description varchar(10))" affected-table="t_broadcast_table_for_ddl" />
<destroy-sql sql="DROP TABLE t_broadcast_table_for_ddl" />
</assertion>
</test-case>
-
+
<test-case sql="CREATE INDEX t_user_details_index ON t_user_details
(user_id)" db-types="MySQL,PostgreSQL,openGauss"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
<assertion expected-data-file="create_index.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_cipher VARCHAR(45) NULL, description
varchar(10))" affected-table="t_user_details" />
@@ -38,20 +38,20 @@
</assertion>
</test-case>
- <test-case sql="CREATE UNIQUE INDEX t_broadcast_table_for_ddl_index ON
t_broadcast_table_for_ddl (id)" db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
+ <test-case sql="CREATE UNIQUE INDEX t_broadcast_table_for_ddl_idx ON
t_broadcast_table_for_ddl (id)" db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-file="create_broadcast_unique_index.xml">
<initial-sql sql="CREATE TABLE t_broadcast_table_for_ddl(id int,
description varchar(10))" affected-table="t_broadcast_table_for_ddl" />
<destroy-sql sql="DROP TABLE t_broadcast_table_for_ddl" />
</assertion>
</test-case>
- <test-case sql="CREATE UNIQUE INDEX t_order_details_index ON
t_order_details (id)" db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
+ <test-case sql="CREATE UNIQUE INDEX t_details_idx ON t_order_details (id)"
db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-file="create_unique_index.xml">
<initial-sql sql="CREATE TABLE t_order_details(id int, description
varchar(10))" affected-table="t_order_details" />
<destroy-sql sql="DROP TABLE t_order_details" />
</assertion>
</test-case>
-
+
<test-case sql="CREATE UNIQUE INDEX t_user_details_index ON t_user_details
(user_id)" db-types="MySQL,PostgreSQL,openGauss"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
<assertion expected-data-file="create_unique_index.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_cipher VARCHAR(45) NULL, description
varchar(10))" affected-table="t_user_details" />
diff --git a/test/e2e/sql/src/test/resources/cases/ddl/e2e-ddl-drop-index.xml
b/test/e2e/sql/src/test/resources/cases/ddl/e2e-ddl-drop-index.xml
index b65735f4cfa..d1109eeb82d 100644
--- a/test/e2e/sql/src/test/resources/cases/ddl/e2e-ddl-drop-index.xml
+++ b/test/e2e/sql/src/test/resources/cases/ddl/e2e-ddl-drop-index.xml
@@ -30,31 +30,31 @@
<destroy-sql sql="DROP TABLE t_user_details" />
</assertion>
</test-case>
-
- <test-case sql="DROP INDEX t_broadcast_table_for_ddl_index ON
t_broadcast_table_for_ddl" db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
+
+ <test-case sql="DROP INDEX t_broadcast_table_for_ddl_idx ON
t_broadcast_table_for_ddl" db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-file="unchanged_broadcast_table.xml">
- <initial-sql sql="CREATE TABLE t_broadcast_table_for_ddl(id int,
description varchar(10));CREATE INDEX t_broadcast_table_for_ddl_index ON
t_broadcast_table_for_ddl(description)"
affected-table="t_broadcast_table_for_ddl" />
+ <initial-sql sql="CREATE TABLE t_broadcast_table_for_ddl(id int,
description varchar(10));CREATE INDEX t_broadcast_table_for_ddl_idx ON
t_broadcast_table_for_ddl(description)"
affected-table="t_broadcast_table_for_ddl" />
<destroy-sql sql="DROP TABLE t_broadcast_table_for_ddl" />
</assertion>
</test-case>
- <test-case sql="DROP INDEX t_broadcast_table_for_ddl_index"
db-types="PostgreSQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
+ <test-case sql="DROP INDEX t_broadcast_table_for_ddl_idx"
db-types="PostgreSQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-file="unchanged_broadcast_table.xml">
- <initial-sql sql="CREATE TABLE t_broadcast_table_for_ddl(id int,
description varchar(10));CREATE INDEX t_broadcast_table_for_ddl_index ON
t_broadcast_table_for_ddl(description)"
affected-table="t_broadcast_table_for_ddl" />
+ <initial-sql sql="CREATE TABLE t_broadcast_table_for_ddl(id int,
description varchar(10));CREATE INDEX t_broadcast_table_for_ddl_idx ON
t_broadcast_table_for_ddl(description)"
affected-table="t_broadcast_table_for_ddl" />
<destroy-sql sql="DROP TABLE t_broadcast_table_for_ddl" />
</assertion>
</test-case>
- <test-case sql="DROP INDEX t_order_details_index ON t_order_details"
db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
+ <test-case sql="DROP INDEX t_details_idx ON t_order_details"
db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-file="unchanged_table.xml">
- <initial-sql sql="CREATE TABLE t_order_details(id int, description
varchar(10));CREATE INDEX t_order_details_index ON
t_order_details(description)" affected-table="t_order_details" />
+ <initial-sql sql="CREATE TABLE t_order_details(id int, description
varchar(10));CREATE INDEX t_details_idx ON t_order_details(description)"
affected-table="t_order_details" />
<destroy-sql sql="DROP TABLE t_order_details" />
</assertion>
</test-case>
- <test-case sql="DROP INDEX t_order_details_index" db-types="PostgreSQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
+ <test-case sql="DROP INDEX t_details_idx" db-types="PostgreSQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-file="unchanged_table.xml">
- <initial-sql sql="CREATE TABLE t_order_details(id int, description
varchar(10));CREATE INDEX t_order_details_index ON
t_order_details(description)" affected-table="t_order_details" />
+ <initial-sql sql="CREATE TABLE t_order_details(id int, description
varchar(10));CREATE INDEX t_details_idx ON t_order_details(description)"
affected-table="t_order_details" />
<destroy-sql sql="DROP TABLE t_order_details" />
</assertion>
</test-case>
diff --git
a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-order-by.xml
b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-order-by.xml
index b2d57231648..0fd5e11af46 100644
--- a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-order-by.xml
+++ b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-order-by.xml
@@ -67,11 +67,7 @@
<test-case sql="SELECT o.* FROM t_order o ORDER BY o.order_id"
db-types="H2,MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-source-name="read_dataset" />
</test-case>
-
- <test-case sql="SELECT o.* FROM t_order o ORDER BY o.order_id"
db-types="H2,MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
- <assertion expected-data-source-name="read_dataset" />
- </test-case>
-
+
<test-case sql="SELECT * FROM t_order o ORDER BY order_id"
db-types="H2,MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-source-name="read_dataset" />
</test-case>
@@ -84,11 +80,11 @@
<!--<test-case sql="SELECT * FROM t_order o ORDER BY ?"
db-types="H2,MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">-->
<!--<assertion parameters="order_id:String"
expected-data-source-name="read_dataset" />-->
<!--</test-case>-->
-
+
<test-case sql="SELECT * FROM t_order ORDER BY order_id"
db-types="H2,MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-source-name="read_dataset" />
</test-case>
-
+
<test-case sql="SELECT * FROM "t_order_item" WHERE
"item_id" != ? ORDER BY "item_id"" db-types="PostgreSQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion parameters="100001:int"
expected-data-source-name="read_dataset" />
</test-case>
@@ -104,7 +100,7 @@
</test-case>-->
<test-case sql="SELECT o.item_id, o.order_id, o.creation_date, s.id FROM
t_order_item o INNER JOIN t_single_table s ON o.order_id = s.id ORDER BY
o.item_id " db-types="MySQL,PostgreSQL,openGauss" scenario-types="db,tbl" />
-
+
<test-case sql="SELECT * FROM t_order ORDER BY merchant_id ASC, order_id
ASC" db-types="MySQL,PostgreSQL,openGauss" scenario-types="db">
<assertion expected-data-source-name="read_dataset" />
</test-case>
diff --git a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select.xml
b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select.xml
index f21655fd040..3f2029bed13 100644
--- a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select.xml
+++ b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select.xml
@@ -29,7 +29,7 @@
<assertion parameters="10:int, 1000:int"
expected-data-source-name="read_dataset" />
<assertion parameters="12:int, 1000:int" />
</test-case>
-
+
<test-case sql="SELECT t_order.order_id,t_order.user_id,status FROM
t_order t_order WHERE t_order.user_id = ? AND order_id = ?" db-types="MySQL,H2"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion parameters="10:int, 1000:int"
expected-data-source-name="read_dataset" />
<assertion parameters="12:int, 1000:int"
expected-data-source-name="read_dataset" />
@@ -43,11 +43,11 @@
<test-case sql="SELECT * FROM t_order WHERE order_id = ? AND order_id = ?"
db-types="MySQL,PostgreSQL,openGauss"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion parameters="1000:int, 1001:int"
expected-data-source-name="read_dataset" />
</test-case>
-
+
<test-case sql="SELECT * /* this is 
 block comment */ FROM
/* this is another 
 block comment */ t_order where status='1'"
db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-source-name="read_dataset" />
</test-case>
-
+
<test-case sql="SELECT * -- this is an line comment 
 FROM
-- this is another line comment 
 t_order where status='1'"
db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-source-name="read_dataset" />
</test-case>
@@ -63,7 +63,7 @@
<test-case sql="SELECT status as 'status' FROM t_order" db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion expected-data-source-name="read_dataset" />
</test-case>
-
+
<test-case sql="SELECT INTERVAL(status,1,5) func_status FROM t_order WHERE
user_id = ? AND order_id = ?" db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
<assertion parameters="12:int, 1000:int"
expected-data-source-name="read_dataset" />
</test-case>
@@ -168,12 +168,7 @@
scenario-comments="Test single table's LIKE operator percentage
wildcard in simple select statement when use sharding feature.|Test encrypt
table's LIKE operator percentage wildcard in simple select statement when use
encrypt feature.">
<assertion expected-data-source-name="read_dataset" />
</test-case>
-
- <test-case sql="SELECT * FROM t_merchant WHERE business_code like '%18'"
db-types="MySQL,PostgreSQL,openGauss" scenario-types="db,encrypt"
- scenario-comments="Test single table's lower case like operator
percentage wildcard in simple select statement when use sharding feature.|Test
encrypt table's lower case like operator percentage wildcard in simple select
statement when use encrypt feature.">
- <assertion expected-data-source-name="read_dataset" />
- </test-case>
-
+
<test-case sql="SELECT * FROM t_merchant WHERE business_code LIKE
'_1000018'" db-types="MySQL,PostgreSQL,openGauss" scenario-types="db,encrypt"
scenario-comments="Test single table's LIKE operator underscore
wildcard in simple select statement when use sharding feature.|Test encrypt
table's LIKE operator underscore wildcard in simple select statement when use
encrypt feature.">
<assertion expected-data-source-name="read_dataset" />
