This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 4e76a6723fe improve sharding_and_encrypt it (#19877)
4e76a6723fe is described below
commit 4e76a6723fe283ab0f1810d1fbe95044403577ea
Author: Chuxin Chen <[email protected]>
AuthorDate: Fri Aug 5 10:06:29 2022 +0800
improve sharding_and_encrypt it (#19877)
---
.github/workflows/it.yml | 4 +-
.../cases/dal/dal-integration-test-cases.xml | 2 +-
.../sharding_and_encrypt/mysql/show_databases.xml} | 16 +++++---
.../dataset/sharding_and_encrypt/alter_add.xml} | 16 +++++---
.../alter_add_encrypt_column.xml} | 15 ++++---
.../dataset/sharding_and_encrypt/alter_change.xml} | 15 ++++---
.../dataset/sharding_and_encrypt/alter_drop.xml} | 13 +++---
.../alter_modify_encrypt_column.xml} | 15 ++++---
.../dataset/sharding_and_encrypt/create_index.xml} | 16 +++++---
.../dataset/sharding_and_encrypt/create_table.xml} | 15 ++++---
.../sharding_and_encrypt/create_unique_index.xml} | 16 +++++---
.../dataset/sharding_and_encrypt/drop_table.xml} | 9 ++---
.../sharding_and_encrypt/unchanged_table.xml} | 15 ++++---
.../cases/ddl/ddl-integration-test-cases.xml | 26 ++++++------
.../sharding_and_encrypt/count_database_rules.xml} | 21 +++++++---
.../count_single_table_rule.xml} | 14 ++++---
.../sharding_and_encrypt/mysql/show_resources.xml | 43 ++++++++++++++++++++
.../postgresql/show_resources.xml | 43 ++++++++++++++++++++
.../show_default_sharding_strategy.xml} | 18 ++++++---
.../sharding_and_encrypt/show_encrypt_rule.xml} | 23 ++++++++---
.../sharding_and_encrypt/show_encrypt_rules.xml | 38 ++++++++++++++++++
.../show_sharding_algorithms.xml} | 17 +++++---
.../show_sharding_auditors.xml} | 13 +++---
.../show_sharding_binging_table_rules.xml} | 12 +++---
.../show_sharding_broadcast_rules.xml} | 11 +++---
.../show_sharding_generators.xml} | 14 ++++---
.../show_sharding_scaling_rules.xml} | 16 +++++---
.../show_sharding_table_algorithms.xml} | 15 ++++---
.../show_sharding_table_generator.xml} | 14 ++++---
.../show_sharding_table_nodes.xml | 29 ++++++++++++++
.../show_sharding_table_rule.xml | 36 +++++++++++++++++
.../show_sharding_table_rules.xml | 41 +++++++++++++++++++
.../sharding_and_encrypt/show_single_table.xml} | 13 +++---
.../show_single_table_rules.xml} | 12 +++---
.../sharding_and_encrypt/show_single_tables.xml} | 17 +++++---
.../show_unused_sharding_algorithms.xml} | 13 +++---
.../show_unused_sharding_generators.xml} | 13 +++---
.../cases/rql/rql-integration-test-cases.xml | 46 +++++++++++-----------
38 files changed, 518 insertions(+), 207 deletions(-)
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index 15e70b64449..4e27b9d3a4e 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -212,7 +212,7 @@ jobs:
env: [ docker ]
adapter: [ proxy, jdbc ]
database: [ MySQL, PostgreSQL ]
- scenario: [ dbtbl_with_readwrite_splitting,
dbtbl_with_readwrite_splitting_and_encrypt ]
+ scenario: [ dbtbl_with_readwrite_splitting,
dbtbl_with_readwrite_splitting_and_encrypt, sharding_and_encrypt ]
steps:
- uses: actions/checkout@v2
- name: Cache Maven Repos
@@ -247,7 +247,7 @@ jobs:
env: [ docker ]
adapter: [ proxy ]
database: [ MySQL, PostgreSQL ]
- scenario: [ dbtbl_with_readwrite_splitting,
dbtbl_with_readwrite_splitting_and_encrypt ]
+ scenario: [ dbtbl_with_readwrite_splitting,
dbtbl_with_readwrite_splitting_and_encrypt, sharding_and_encrypt ]
steps:
- uses: actions/checkout@v2
- name: Cache Maven Repos
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
index 8f9f1b406d6..a159918466a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_databases.xml" />
</test-case>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
index 8f9f1b406d6..7e9adf115dc 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
@@ -14,10 +14,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="schema_name" />
+ </metadata>
+ <row values="information_schema" />
+ <row values="performance_schema" />
+ <row values="sharding_and_encrypt" />
+ <row values="mysql" />
+ <row values="sys" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_add.xml
similarity index 64%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_add.xml
index 8f9f1b406d6..78e61879b67 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_add.xml
@@ -14,10 +14,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="number_plain" type="varchar" />
+ <column name="number_cipher" type="varchar" />
+ <column name="description" type="varchar" />
+ <column name="name" type="varchar" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_add_encrypt_column.xml
similarity index 67%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_add_encrypt_column.xml
index 8f9f1b406d6..db36d05c364 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_add_encrypt_column.xml
@@ -14,10 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="number_plain" type="varchar" />
+ <column name="number_cipher" type="varchar" />
+ <column name="description" type="varchar" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_change.xml
similarity index 66%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_change.xml
index 8f9f1b406d6..f38ec0cda7e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_change.xml
@@ -14,10 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="number_new_plain" type="varchar" />
+ <column name="number_new_cipher" type="varchar" />
+ <column name="description" type="varchar" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_drop.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_drop.xml
index 8f9f1b406d6..39807b3c4e9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_drop.xml
@@ -14,10 +14,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="description" type="varchar" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_modify_encrypt_column.xml
similarity index 67%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_modify_encrypt_column.xml
index 8f9f1b406d6..fa01c7c03aa 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/alter_modify_encrypt_column.xml
@@ -14,10 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="description" type="varchar" />
+ <column name="number_plain" type="integer" />
+ <column name="number_cipher" type="integer" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_index.xml
similarity index 62%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_index.xml
index 8f9f1b406d6..d2781e2129a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_index.xml
@@ -14,10 +14,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="number_plain" type="varchar" />
+ <column name="number_cipher" type="varchar" />
+ <column name="description" type="varchar" />
+ <index name="t_user_details_index_t_user_details" column="user_id"
unique="false" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_table.xml
similarity index 67%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_table.xml
index 8f9f1b406d6..51a994637d4 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_table.xml
@@ -14,10 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="number_cipher" type="varchar" />
+ <column name="number_plain" type="varchar" />
+ <column name="description" type="varchar" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_unique_index.xml
similarity index 62%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_unique_index.xml
index 8f9f1b406d6..5afd225ec4c 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/create_unique_index.xml
@@ -14,10 +14,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="number_plain" type="varchar" />
+ <column name="number_cipher" type="varchar" />
+ <column name="description" type="varchar" />
+ <index name="t_user_details_index_t_user_details" column="user_id"
unique="true" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/drop_table.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/drop_table.xml
index 8f9f1b406d6..701280d841a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/drop_table.xml
@@ -14,10 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/unchanged_table.xml
similarity index 67%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/unchanged_table.xml
index 8f9f1b406d6..db36d05c364 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/sharding_and_encrypt/unchanged_table.xml
@@ -14,10 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata table-name="t_user_details"
data-nodes="encrypt_ds_${0..9}.t_user_details_${0..9}">
+ <column name="user_id" type="integer" />
+ <column name="address_id" type="integer" />
+ <column name="number_plain" type="varchar" />
+ <column name="number_cipher" type="varchar" />
+ <column name="description" type="varchar" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
index bf299c813c8..3bf66239fe2 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
@@ -160,43 +160,43 @@
</assertion>
</test-case>
- <test-case sql="CREATE TABLE t_user_details (user_id INT NOT NULL,
address_id INT NOT NULL, number VARCHAR(45), description varchar(10))"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="CREATE TABLE t_user_details (user_id INT NOT NULL,
address_id INT NOT NULL, number VARCHAR(45), description varchar(10))"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="create_table.xml">
<initial-sql affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="CREATE INDEX t_user_details_index ON t_user_details
(user_id)" scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="CREATE INDEX t_user_details_index ON t_user_details
(user_id)"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<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_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="CREATE UNIQUE INDEX t_user_details_index ON t_user_details
(user_id)" scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="CREATE UNIQUE INDEX t_user_details_index ON t_user_details
(user_id)"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<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_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="ALTER TABLE t_user_details ADD name varchar(10)"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="ALTER TABLE t_user_details ADD name varchar(10)"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="alter_add.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="ALTER TABLE t_user_details ADD number VARCHAR(45) NULL
AFTER address_id"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt"
db-types="MySQL">
+ <test-case sql="ALTER TABLE t_user_details ADD number VARCHAR(45) NULL
AFTER address_id"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt"
db-types="MySQL">
<assertion expected-data-file="alter_add_encrypt_column.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, description varchar(10))"
affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="ALTER TABLE t_user_details MODIFY number INT NOT NULL
AFTER description"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt"
db-types="MySQL">
+ <test-case sql="ALTER TABLE t_user_details MODIFY number INT NOT NULL
AFTER description"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt"
db-types="MySQL">
<assertion expected-data-file="alter_modify_encrypt_column.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="ALTER TABLE t_user_details CHANGE number number_new
VARCHAR(50)" db-types="MySQL"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="ALTER TABLE t_user_details CHANGE number number_new
VARCHAR(50)" db-types="MySQL"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="alter_change.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
</assertion>
@@ -208,37 +208,37 @@
<!-- </assertion>-->
<!-- </test-case>-->
- <test-case sql="ALTER TABLE t_user_details DROP COLUMN number"
db-types="MySQL,SQLServer,PostgreSQL,Oracle"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="ALTER TABLE t_user_details DROP COLUMN number"
db-types="MySQL,SQLServer,PostgreSQL,Oracle"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="alter_drop.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details"/>
</assertion>
</test-case>
- <test-case sql="DROP TABLE t_user_details"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="DROP TABLE t_user_details"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="drop_table.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="DROP INDEX t_user_details_index on t_user_details"
db-types="MySQL,SQLServer,Oracle"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="DROP INDEX t_user_details_index on t_user_details"
db-types="MySQL,SQLServer,Oracle"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="unchanged_table.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10));CREATE INDEX t_user_details_index ON
t_user_details(description)" affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="DROP INDEX t_user_details_index" db-types="PostgreSQL"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="DROP INDEX t_user_details_index" db-types="PostgreSQL"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="unchanged_table.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10));CREATE INDEX t_user_details_index ON
t_user_details(description)" affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="TRUNCATE TABLE t_user_details"
db-types="MySQL,SQLServer,Oracle"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="TRUNCATE TABLE t_user_details"
db-types="MySQL,SQLServer,Oracle"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="unchanged_table.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
</assertion>
</test-case>
- <test-case sql="TRUNCATE t_user_details" db-types="PostgreSQL"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="TRUNCATE t_user_details" db-types="PostgreSQL"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="unchanged_table.xml">
<initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
</assertion>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_database_rules.xml
similarity index 63%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_database_rules.xml
index 8f9f1b406d6..8f6f2b59bfb 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_database_rules.xml
@@ -14,10 +14,19 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="rule_name"/>
+ <column name="count"/>
+ </metadata>
+ <row values="single_table| 5"/>
+ <row values="sharding_table| 6"/>
+ <row values="sharding_binding_table| 1"/>
+ <row values="sharding_broadcast_table| 0"/>
+ <row values="sharding_scaling| 0"/>
+ <row values="readwrite_splitting| 0"/>
+ <row values="db_discovery| 0"/>
+ <row values="encrypt| 4"/>
+ <row values="shadow| 0"/>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_single_table_rule.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_single_table_rule.xml
index 8f9f1b406d6..6416d7bf301 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_single_table_rule.xml
@@ -14,10 +14,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="rule_name"/>
+ <column name="database"/>
+ <column name="count"/>
+ </metadata>
+ <row values="single_table| sharding_and_encrypt| 5"/>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_resources.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_resources.xml
new file mode 100644
index 00000000000..098d3537da0
--- /dev/null
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_resources.xml
@@ -0,0 +1,43 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="host" />
+ <column name="port" />
+ <column name="db" />
+ <column name="connection_timeout_milliseconds" />
+ <column name="idle_timeout_milliseconds" />
+ <column name="max_lifetime_milliseconds" />
+ <column name="max_pool_size" />
+ <column name="min_pool_size" />
+ <column name="read_only" />
+ <column name="other_attributes" />
+ </metadata>
+ <row values="encrypt_ds_0| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_0| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_1| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_1| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_2| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_2| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_3| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_3| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_4| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_4| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_5| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_5| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_6| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_6| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_7| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_7| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_8| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_8| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+ <row values="encrypt_ds_9| MySQL| mysql.sharding_and_encrypt.host| 3306|
encrypt_ds_9| 30000| 60000| 1800000| 2| 2| false|
{"dataSourceProperties":{"cacheServerConfiguration":"true","elideSetAutoCommits":"true","useServerPrepStmts":"true","cachePrepStmts":"true","rewriteBatchedStatements":"true","cacheResultSetMetadat
[...]
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/postgresql/show_resources.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/postgresql/show_resources.xml
new file mode 100644
index 00000000000..dabc33fd635
--- /dev/null
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/postgresql/show_resources.xml
@@ -0,0 +1,43 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="host" />
+ <column name="port" />
+ <column name="db" />
+ <column name="connection_timeout_milliseconds" />
+ <column name="idle_timeout_milliseconds" />
+ <column name="max_lifetime_milliseconds" />
+ <column name="max_pool_size" />
+ <column name="min_pool_size" />
+ <column name="read_only" />
+ <column name="other_attributes" />
+ </metadata>
+ <row values="encrypt_ds_0| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_0| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-1","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_1| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_1| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-2","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_2| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_2| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-3","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_3| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_3| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-4","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_4| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_4| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-5","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_5| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_5| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-6","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_6| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_6| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-7","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_7| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_7| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-8","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_8| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_8| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-9","registerMbeans":false,"all
[...]
+ <row values="encrypt_ds_9| PostgreSQL|
postgresql.sharding_and_encrypt.host| 5432| encrypt_ds_9| 30000| 60000|
1800000| 2| 2| false|
{"dataSourceProperties":{},"healthCheckProperties":{},"initializationFailTimeout":1,"validationTimeout":5000,"leakDetectionThreshold":0,"poolName":"HikariPool-10","registerMbeans":false,"al
[...]
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_default_sharding_strategy.xml
similarity index 67%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_default_sharding_strategy.xml
index 8f9f1b406d6..b85a6d3cc64 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_default_sharding_strategy.xml
@@ -14,10 +14,16 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="sharding_column" />
+ <column name="sharding_algorithm_name" />
+ <column name="sharding_algorithm_type" />
+ <column name="sharding_algorithm_props" />
+ </metadata>
+ <row values="TABLE| NONE| | | | "/>
+ <row values="DATABASE| NONE| | | | "/>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
similarity index 55%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
index 8f9f1b406d6..e327a3c2780 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
@@ -14,10 +14,21 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="table" />
+ <column name="logic_column" />
+ <column name="logic_data_type" />
+ <column name="cipher_column" />
+ <column name="cipher_data_type" />
+ <column name="plain_column" />
+ <column name="plain_data_type" />
+ <column name="assisted_query_column" />
+ <column name="assisted_query_data_type" />
+ <column name="encryptor_type" />
+ <column name="encryptor_props" />
+ <column name="query_with_cipher_column" />
+ </metadata>
+ <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| true" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
new file mode 100644
index 00000000000..e06a94ee029
--- /dev/null
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
@@ -0,0 +1,38 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="table" />
+ <column name="logic_column" />
+ <column name="logic_data_type" />
+ <column name="cipher_column" />
+ <column name="cipher_data_type" />
+ <column name="plain_column" />
+ <column name="plain_data_type" />
+ <column name="assisted_query_column" />
+ <column name="assisted_query_data_type" />
+ <column name="encryptor_type" />
+ <column name="encryptor_props" />
+ <column name="query_with_cipher_column" />
+ </metadata>
+ <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| true" />
+ <row values="t_user_details| number| | number_cipher| | number_plain| | |
| AES| aes-key-value=123456abc| true" />
+ <row values="t_user_details| number_new| | number_new_cipher| |
number_new_plain| | | | AES| aes-key-value=123456abc| true" />
+ <row values="t_user_encrypt_federate| pwd| | cipher_pwd| | plain_pwd| | |
| AES| aes-key-value=123456abc| true" />
+ <row values="t_user_encrypt_federate_sharding| pwd| | cipher_pwd| |
plain_pwd| | | | AES| aes-key-value=123456abc| true" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_algorithms.xml
similarity index 57%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_algorithms.xml
index 8f9f1b406d6..cb963be61f0 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_algorithms.xml
@@ -14,10 +14,15 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="props" />
+ </metadata>
+ <row values="it_standard_fixture| IT.STANDARD.FIXTURE| " />
+ <row values="table_inline_item_id| INLINE|
algorithm-expression=t_order_item_federate_sharding_${item_id % 2}" />
+ <row values="table_inline_order_id| INLINE|
algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2}" />
+ <row values="table_inline_user_id| INLINE|
algorithm-expression=t_user_encrypt_federate_sharding_${user_id %
2},allow-range-query-with-inline-sharding=true" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_auditors.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_auditors.xml
index 8f9f1b406d6..8af51b212cc 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_auditors.xml
@@ -14,10 +14,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="props" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_binging_table_rules.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_binging_table_rules.xml
index 8f9f1b406d6..cdbeb5f8cbc 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_binging_table_rules.xml
@@ -14,10 +14,10 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="sharding_binding_tables" />
+ </metadata>
+ <row values="t_user,t_user_item,t_user_details" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_broadcast_rules.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_broadcast_rules.xml
index 8f9f1b406d6..53ecd548097 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_broadcast_rules.xml
@@ -14,10 +14,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="sharding_broadcast_tables" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_generators.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_generators.xml
index 8f9f1b406d6..442a18aa3a6 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_generators.xml
@@ -14,10 +14,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="props" />
+ </metadata>
+ <row values="constant| IT.FIXTURE| {}" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_scaling_rules.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_scaling_rules.xml
index 8f9f1b406d6..ac1e9af960e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_scaling_rules.xml
@@ -14,10 +14,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="name"/>
+ <column name="input"/>
+ <column name="output"/>
+ <column name="stream_channel"/>
+ <column name="completion_detector"/>
+ <column name="data_consistency_checker"/>
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_algorithms.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_algorithms.xml
index 8f9f1b406d6..624f7f4e78e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_algorithms.xml
@@ -14,10 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="type" />
+ <column name="name" />
+ </metadata>
+ <row values="table| t_user_item" />
+ <row values="table| t_user" />
+ <row values="table| t_user_details" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_generator.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_generator.xml
index 8f9f1b406d6..d4a6fdee9de 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_generator.xml
@@ -14,10 +14,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="type" />
+ <column name="name" />
+ </metadata>
+ <row values="table| t_user_item" />
+ <row values="table| t_user" />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_nodes.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_nodes.xml
new file mode 100644
index 00000000000..46e57acd7d1
--- /dev/null
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_nodes.xml
@@ -0,0 +1,29 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="nodes" />
+ </metadata>
+ <row values="t_user_item| encrypt_ds_0.t_user_item_0,
encrypt_ds_0.t_user_item_1, encrypt_ds_0.t_user_item_2,
encrypt_ds_0.t_user_item_3, encrypt_ds_0.t_user_item_4,
encrypt_ds_0.t_user_item_5, encrypt_ds_0.t_user_item_6,
encrypt_ds_0.t_user_item_7, encrypt_ds_0.t_user_item_8,
encrypt_ds_0.t_user_item_9, encrypt_ds_1.t_user_item_0,
encrypt_ds_1.t_user_item_1, encrypt_ds_1.t_user_item_2,
encrypt_ds_1.t_user_item_3, encrypt_ds_1.t_user_item_4,
encrypt_ds_1.t_user_item_5, encrypt_ds_1.t [...]
+ <row values="t_user| encrypt_ds_0.t_user_0, encrypt_ds_0.t_user_1,
encrypt_ds_0.t_user_2, encrypt_ds_0.t_user_3, encrypt_ds_0.t_user_4,
encrypt_ds_0.t_user_5, encrypt_ds_0.t_user_6, encrypt_ds_0.t_user_7,
encrypt_ds_0.t_user_8, encrypt_ds_0.t_user_9, encrypt_ds_1.t_user_0,
encrypt_ds_1.t_user_1, encrypt_ds_1.t_user_2, encrypt_ds_1.t_user_3,
encrypt_ds_1.t_user_4, encrypt_ds_1.t_user_5, encrypt_ds_1.t_user_6,
encrypt_ds_1.t_user_7, encrypt_ds_1.t_user_8, encrypt_ds_1.t_user_9, encrypt
[...]
+ <row values="t_user_details| encrypt_ds_0.t_user_details_0,
encrypt_ds_0.t_user_details_1, encrypt_ds_0.t_user_details_2,
encrypt_ds_0.t_user_details_3, encrypt_ds_0.t_user_details_4,
encrypt_ds_0.t_user_details_5, encrypt_ds_0.t_user_details_6,
encrypt_ds_0.t_user_details_7, encrypt_ds_0.t_user_details_8,
encrypt_ds_0.t_user_details_9, encrypt_ds_1.t_user_details_0,
encrypt_ds_1.t_user_details_1, encrypt_ds_1.t_user_details_2,
encrypt_ds_1.t_user_details_3, encrypt_ds_1.t_user_detai [...]
+ <row values="t_order_item_federate_sharding|
encrypt_ds_1.t_order_item_federate_sharding_0,
encrypt_ds_1.t_order_item_federate_sharding_1"/>
+ <row values="t_order_federate_sharding|
encrypt_ds_1.t_order_federate_sharding_0,
encrypt_ds_1.t_order_federate_sharding_1"/>
+ <row values="t_user_encrypt_federate_sharding|
encrypt_ds_1.t_user_encrypt_federate_sharding_0,
encrypt_ds_1.t_user_encrypt_federate_sharding_1"/>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rule.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rule.xml
new file mode 100644
index 00000000000..5c3e2b4881b
--- /dev/null
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rule.xml
@@ -0,0 +1,36 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="table" />
+ <column name="actual_data_nodes" />
+ <column name="actual_data_sources" />
+ <column name="database_strategy_type" />
+ <column name="database_sharding_column" />
+ <column name="database_sharding_algorithm_type" />
+ <column name="database_sharding_algorithm_props" />
+ <column name="table_strategy_type" />
+ <column name="table_sharding_column" />
+ <column name="table_sharding_algorithm_type" />
+ <column name="table_sharding_algorithm_props" />
+ <column name="key_generate_column" />
+ <column name="key_generator_type" />
+ <column name="key_generator_props" />
+ </metadata>
+ <row values="t_user| encrypt_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| IT.STANDARD.FIXTURE| | STANDARD| user_id| IT.STANDARD.FIXTURE| |
user_id| IT.FIXTURE| " />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rules.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rules.xml
new file mode 100644
index 00000000000..9c2c0a596e8
--- /dev/null
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_rules.xml
@@ -0,0 +1,41 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="table" />
+ <column name="actual_data_nodes" />
+ <column name="actual_data_sources" />
+ <column name="database_strategy_type" />
+ <column name="database_sharding_column" />
+ <column name="database_sharding_algorithm_type" />
+ <column name="database_sharding_algorithm_props" />
+ <column name="table_strategy_type" />
+ <column name="table_sharding_column" />
+ <column name="table_sharding_algorithm_type" />
+ <column name="table_sharding_algorithm_props" />
+ <column name="key_generate_column" />
+ <column name="key_generator_type" />
+ <column name="key_generator_props" />
+ </metadata>
+ <row values="t_user_item| encrypt_ds_${0..9}.t_user_item_${0..9}| |
STANDARD| user_id| IT.STANDARD.FIXTURE| | STANDARD| item_id|
IT.STANDARD.FIXTURE| | item_id| IT.FIXTURE| " />
+ <row values="t_user| encrypt_ds_${0..9}.t_user_${0..9}| | STANDARD|
address_id| IT.STANDARD.FIXTURE| | STANDARD| user_id| IT.STANDARD.FIXTURE| |
user_id| IT.FIXTURE| " />
+ <row values="t_user_details| encrypt_ds_${0..9}.t_user_details_${0..9}| |
STANDARD| address_id| IT.STANDARD.FIXTURE| | STANDARD| user_id|
IT.STANDARD.FIXTURE| | | | " />
+ <row values="t_order_item_federate_sharding|
encrypt_ds_1.t_order_item_federate_sharding_${0..1}| | | | | | STANDARD|
item_id| INLINE| algorithm-expression=t_order_item_federate_sharding_${item_id
% 2}| | | " />
+ <row values="t_order_federate_sharding|
encrypt_ds_1.t_order_federate_sharding_${0..1}| | | | | | STANDARD|
order_id_sharding| INLINE|
algorithm-expression=t_order_federate_sharding_${order_id_sharding % 2}| | | "
/>
+ <row values="t_user_encrypt_federate_sharding|
encrypt_ds_1.t_user_encrypt_federate_sharding_${0..1}| | | | | | STANDARD|
user_id| INLINE|
algorithm-expression=t_user_encrypt_federate_sharding_${user_id %
2},allow-range-query-with-inline-sharding=true| | | " />
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table.xml
index 8f9f1b406d6..0a78a935ed7 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table.xml
@@ -14,10 +14,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="table_name"/>
+ <column name="resource_name"/>
+ </metadata>
+ <row values="t_single_table| encrypt_ds_0"/>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table_rules.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table_rules.xml
index 8f9f1b406d6..af8c90693af 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table_rules.xml
@@ -14,10 +14,10 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="resource_name" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_tables.xml
similarity index 67%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_tables.xml
index 8f9f1b406d6..5531f66e830 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_tables.xml
@@ -14,10 +14,15 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="table_name"/>
+ <column name="resource_name"/>
+ </metadata>
+ <row values="t_single_table| encrypt_ds_0"/>
+ <row values="t_order_item_federate| encrypt_ds_1"/>
+ <row values="t_order_federate| encrypt_ds_0"/>
+ <row values="t_user_encrypt_federate| encrypt_ds_1"/>
+ <row values="t_user_info| encrypt_ds_1"/>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_unused_sharding_algorithms.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_unused_sharding_algorithms.xml
index 8f9f1b406d6..8af51b212cc 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_unused_sharding_algorithms.xml
@@ -14,10 +14,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="props" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_unused_sharding_generators.xml
similarity index 69%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_unused_sharding_generators.xml
index 8f9f1b406d6..8af51b212cc 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dal/dal-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_unused_sharding_generators.xml
@@ -14,10 +14,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<integration-test-cases>
- <test-case sql="SHOW DATABASES" db-types="MySQL"
scenario-types="dbtbl_with_readwrite_splitting,readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
- <assertion expected-data-file="show_databases.xml" />
- </test-case>
- <test-case sql="RESET ALL" db-types="PostgreSQL,openGauss" />
-</integration-test-cases>
+<dataset>
+ <metadata>
+ <column name="name" />
+ <column name="type" />
+ <column name="props" />
+ </metadata>
+</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
index de487c29d26..a7cf078d7d5 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/rql-integration-test-cases.xml
@@ -15,17 +15,17 @@
~ limitations under the License.
-->
<integration-test-cases>
- <test-case sql="SHOW DATABASE RESOURCES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW DATABASE RESOURCES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_resources.xml" />
</test-case>
<!--TODO Support dynamic input of scenario names-->
<!--FIXME db scenario have a problem. #18964-->
-<!-- <test-case sql="SHOW DATABASE RESOURCES FROM ?"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">-->
+<!-- <test-case sql="SHOW DATABASE RESOURCES FROM ?"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">-->
<!-- <assertion expected-data-file="show_resources.xml" />-->
<!-- </test-case>-->
- <test-case sql="SHOW SHARDING TABLE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING TABLE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_table_rules.xml" />
</test-case>
@@ -33,71 +33,71 @@
<assertion expected-data-file="show_sharding_table_rule.xml" />
</test-case>
- <test-case sql="SHOW SHARDING TABLE RULE t_user"
scenario-types="dbtbl_with_readwrite_splitting_and_encrypt,encrypt">
+ <test-case sql="SHOW SHARDING TABLE RULE t_user"
scenario-types="dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt">
<assertion expected-data-file="show_sharding_table_rule.xml" />
</test-case>
- <test-case sql="SHOW SHARDING ALGORITHMS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING ALGORITHMS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_algorithms.xml" />
</test-case>
- <test-case sql="SHOW UNUSED SHARDING ALGORITHMS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW UNUSED SHARDING ALGORITHMS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_unused_sharding_algorithms.xml" />
</test-case>
- <test-case sql="SHOW SHARDING TABLE RULES USED ALGORITHM
it_standard_fixture"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING TABLE RULES USED ALGORITHM
it_standard_fixture"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_table_algorithms.xml" />
</test-case>
- <test-case sql="SHOW SHARDING AUDITORS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING AUDITORS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_auditors.xml" />
</test-case>
- <test-case sql="SHOW SHARDING KEY GENERATORS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING KEY GENERATORS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_generators.xml" />
</test-case>
- <test-case sql="SHOW UNUSED SHARDING KEY GENERATORS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW UNUSED SHARDING KEY GENERATORS"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_unused_sharding_generators.xml" />
</test-case>
- <test-case sql="SHOW SHARDING TABLE RULES USED KEY GENERATOR constant"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING TABLE RULES USED KEY GENERATOR constant"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_table_generator.xml" />
</test-case>
- <test-case sql="SHOW DEFAULT SHARDING STRATEGY"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW DEFAULT SHARDING STRATEGY"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_default_sharding_strategy.xml" />
</test-case>
- <test-case sql="SHOW SHARDING TABLE NODES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING TABLE NODES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_table_nodes.xml" />
</test-case>
- <test-case sql="SHOW SHARDING BINDING TABLE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING BINDING TABLE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_binging_table_rules.xml"
/>
</test-case>
- <test-case sql="SHOW SHARDING BROADCAST TABLE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING BROADCAST TABLE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_broadcast_rules.xml" />
</test-case>
- <test-case sql="SHOW SHARDING SCALING RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SHARDING SCALING RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_sharding_scaling_rules.xml" />
</test-case>
- <test-case sql="SHOW SINGLE TABLE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SINGLE TABLE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_single_table_rules.xml" />
</test-case>
- <test-case sql="SHOW SINGLE TABLE t_single_table"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SINGLE TABLE t_single_table"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_single_table.xml" />
</test-case>
- <test-case sql="SHOW SINGLE TABLES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="SHOW SINGLE TABLES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="show_single_tables.xml" />
</test-case>
- <test-case sql="COUNT SINGLE_TABLE RULE"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="COUNT SINGLE_TABLE RULE"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="count_single_table_rule.xml" />
</test-case>
@@ -105,11 +105,11 @@
<assertion expected-data-file="show_readwrite_splitting_rules.xml" />
</test-case>
- <test-case sql="SHOW ENCRYPT RULES"
scenario-types="dbtbl_with_readwrite_splitting_and_encrypt,encrypt">
+ <test-case sql="SHOW ENCRYPT RULES"
scenario-types="dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt">
<assertion expected-data-file="show_encrypt_rules.xml" />
</test-case>
- <test-case sql="SHOW ENCRYPT TABLE RULE t_user"
scenario-types="dbtbl_with_readwrite_splitting_and_encrypt,encrypt">
+ <test-case sql="SHOW ENCRYPT TABLE RULE t_user"
scenario-types="dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt">
<assertion expected-data-file="show_encrypt_rule.xml" />
</test-case>
@@ -126,7 +126,7 @@
<assertion expected-data-file="show_discovery_heartbeats.xml" />
</test-case>
- <test-case sql="COUNT DATABASE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+ <test-case sql="COUNT DATABASE RULES"
scenario-types="db,tbl,readwrite_splitting,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt">
<assertion expected-data-file="count_database_rules.xml" />
</test-case>
</integration-test-cases>
