This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 8ad538cc4ba Fix e2e sql test error (#29100)
8ad538cc4ba is described below
commit 8ad538cc4baf6f96e66025ee4b600bf1c87a9e32
Author: jiangML <[email protected]>
AuthorDate: Tue Nov 21 15:30:05 2023 +0800
Fix e2e sql test error (#29100)
* Fix e2e sql test error
* Fix mask rule e2e sql test error
* Fix show dist variables test error
* Fix alter sharding rules test error
* Fix show encrypt rule test error
* Fix show dist variables test error
---
.../ral/dataset/empty_rules/show_dist_variables.xml | 1 +
.../ral/dataset/empty_rules/show_sharding_table_rule.xml | 4 ++--
.../rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml | 2 +-
.../rdl/dataset/rdl_empty_rules/alter_mask_rule.xml | 2 +-
.../rdl/dataset/rdl_empty_rules/alter_sharding_rules.xml | 2 +-
.../rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml | 2 +-
.../dataset/rdl_empty_rules/create_sharding_rules.xml | 2 +-
.../show_encrypt_rule.xml | 2 +-
.../show_encrypt_rules.xml | 6 +++---
.../cases/rql/dataset/encrypt/show_encrypt_rule.xml | 8 ++++----
.../cases/rql/dataset/encrypt/show_encrypt_rules.xml | 16 ++++++++--------
.../show_encrypt_rule.xml | 2 +-
.../show_encrypt_rules.xml | 10 +++++-----
.../cases/rql/dataset/mask/cluster/show_mask_rule.xml | 4 ++--
.../cases/rql/dataset/mask/standalone/show_mask_rule.xml | 4 ++--
.../rql/dataset/mask_encrypt/cluster/show_mask_rule.xml | 4 ++--
.../cases/rql/dataset/mask_encrypt/show_mask_rule.xml | 4 ++--
.../dataset/mask_encrypt/standalone/show_mask_rule.xml | 4 ++--
.../mask_encrypt_sharding/cluster/show_mask_rule.xml | 4 ++--
.../mask_encrypt_sharding/standalone/show_mask_rule.xml | 4 ++--
.../rql/dataset/mask_sharding/cluster/show_mask_rule.xml | 4 ++--
.../dataset/mask_sharding/standalone/show_mask_rule.xml | 4 ++--
.../dataset/sharding_and_encrypt/show_encrypt_rule.xml | 2 +-
.../dataset/sharding_and_encrypt/show_encrypt_rules.xml | 10 +++++-----
.../cases/rql/dataset/tbl/show_sharding_algorithms.xml | 2 +-
.../cases/rql/dataset/tbl/show_sharding_table_rules.xml | 2 +-
26 files changed, 56 insertions(+), 55 deletions(-)
diff --git
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
index ea5bc157fa9..c02a5b027e2 100644
---
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
+++
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
@@ -28,6 +28,7 @@
<row values="max_connections_size_per_query| 1" />
<row values="proxy_backend_query_fetch_size| -1" />
<row values="proxy_default_port| 3307" />
+ <row values="proxy_frontend_database_protocol_type| " />
<row values="proxy_frontend_executor_size| 0" />
<row values="proxy_frontend_flush_threshold| 128" />
<row values="proxy_frontend_max_connections| 0" />
diff --git
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
index d3002c8f057..c8d3387890f 100644
---
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
@@ -34,6 +34,6 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_user_item| | write_ds_${0..9}| | | | |STANDARD| user_id|
MOD| sharding-count=40| user_id| IT.FIXTURE| worker-id=1 | |" />
- <row values="t_user| | write_ds_${0..9}| | | | | STANDARD| user_id| MOD|
sharding-count=40| user_id| IT.FIXTURE| worker-id=1 | IT.AUDITOR.FIXTURE| true"
/>
+ <row values="t_user_item| | write_ds_${0..9}| | | | |STANDARD| user_id|
MOD| {"sharding-count":40}| user_id| IT.FIXTURE|
{"worker-id":1} | |" />
+ <row values="t_user| | write_ds_${0..9}| | | | | STANDARD| user_id| MOD|
{"sharding-count":40}| user_id| IT.FIXTURE| {"worker-id":1}
| IT.AUDITOR.FIXTURE| true" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
index c198bcecbc5..9d7cef4baad 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
@@ -29,5 +29,5 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| pwd| pwd_cipher| | | AES| aes-key-value=123456abcd| |
| | " />
+ <row values="t_user| pwd| pwd_cipher| | | AES|
{"aes-key-value":"123456abcd"}| | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_mask_rule.xml
index 0f7bc437a10..b202ad87f55 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_mask_rule.xml
@@ -22,5 +22,5 @@
<column name="algorithm_type" />
<column name="algorithm_props" />
</metadata>
- <row values="t_mask| order_id| MASK_FROM_X_TO_Y|
from-x=1,replace-char=*,to-y=2" />
+ <row values="t_mask| order_id| MASK_FROM_X_TO_Y|
{"from-x":"1","replace-char":"*","to-y":"2"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules.xml
index 7e7ca28af32..8c25dadeefc 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_sharding_rules.xml
@@ -34,5 +34,5 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| ds_2.t_order_${0..3} | | | | | | STANDARD |
order_id| inline| algorithm-expression=t_order_${order_id % 4} | | | | |" />
+ <row values="t_order| ds_2.t_order_${0..3} | | | | | | STANDARD |
order_id| inline| {"algorithm-expression":"t_order_${order_id %
4}"} | | | | |" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
index ba7e21933c9..78943c0ed8c 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
@@ -29,5 +29,5 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| pwd| pwd_cipher| | | AES| aes-key-value=123456abc| |
| | " />
+ <row values="t_user| pwd| pwd_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules.xml
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules.xml
index 3ac65df1c31..8b6e09c18f4 100644
---
a/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_sharding_rules.xml
@@ -34,5 +34,5 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_order| ds_2.t_order_${0..1} | | | | | | STANDARD |
order_id| inline| algorithm-expression=t_order_${order_id % 2} | | | | | " />
+ <row values="t_order| ds_2.t_order_${0..1} | | | | | | STANDARD |
order_id| inline| {"algorithm-expression":"t_order_${order_id %
2}"} | | | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
index ba7e21933c9..78943c0ed8c 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
@@ -29,5 +29,5 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| pwd| pwd_cipher| | | AES| aes-key-value=123456abc| |
| | " />
+ <row values="t_user| pwd| pwd_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
index 9d19c4a026f..eff9baef4d7 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
@@ -29,7 +29,7 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| pwd| pwd_cipher| | | AES| aes-key-value=123456abc| |
| | " />
- <row values="t_user_details| number| number_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user_details| number_new| number_new_cipher| | | AES|
aes-key-value=123456abc| | | | " />
+ <row values="t_user| pwd| pwd_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user_details| number| number_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user_details| number_new| number_new_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
index d94f7c2cc56..a613cd05a00 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
@@ -29,8 +29,8 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| user_name| user_name_cipher| | user_name_like| AES|
aes-key-value=123456abc| | | IT.ENCRYPT.LIKE.FIXTURE| mask=4093" />
- <row values="t_user| password| password_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user| email| email_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user| telephone| user_telephone_cipher| |
user_telephone_like| AES| aes-key-value=123456abc| | | IT.ENCRYPT.LIKE.FIXTURE|
mask=4093" />
+ <row values="t_user| user_name| user_name_cipher| | user_name_like| AES|
{"aes-key-value":"123456abc"}| | | IT.ENCRYPT.LIKE.FIXTURE|
{"mask":4093}" />
+ <row values="t_user| password| password_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user| email| email_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user| telephone| user_telephone_cipher| |
user_telephone_like| AES| {"aes-key-value":"123456abc"}| |
| IT.ENCRYPT.LIKE.FIXTURE| {"mask":4093}" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
index 1bbed24a732..7704ba6192f 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
@@ -29,12 +29,12 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| user_name| user_name_cipher| | user_name_like| AES|
aes-key-value=123456abc| | | IT.ENCRYPT.LIKE.FIXTURE| mask=4093" />
- <row values="t_user| password| password_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user| email| email_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user| telephone| user_telephone_cipher| |
user_telephone_like| AES| aes-key-value=123456abc| | | IT.ENCRYPT.LIKE.FIXTURE|
mask=4093" />
- <row values="t_user_details| number| number_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user_details| number_new| number_new_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_merchant| business_code| business_code_cipher| |
business_code_like| AES| aes-key-value=123456abc| | | IT.ENCRYPT.LIKE.FIXTURE |
mask=4093 " />
- <row values="t_merchant| telephone| merchant_telephone_cipher| |
merchant_telephone_like| AES| aes-key-value=123456abc| | |
IT.ENCRYPT.LIKE.FIXTURE | mask=4093 " />
+ <row values="t_user| user_name| user_name_cipher| | user_name_like| AES|
{"aes-key-value":"123456abc"}| | | IT.ENCRYPT.LIKE.FIXTURE|
{"mask":4093}" />
+ <row values="t_user| password| password_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user| email| email_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user| telephone| user_telephone_cipher| |
user_telephone_like| AES| {"aes-key-value":"123456abc"}| |
| IT.ENCRYPT.LIKE.FIXTURE| {"mask":4093}" />
+ <row values="t_user_details| number| number_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user_details| number_new| number_new_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_merchant| business_code| business_code_cipher| |
business_code_like| AES| {"aes-key-value":"123456abc"}| | |
IT.ENCRYPT.LIKE.FIXTURE | {"mask":4093} " />
+ <row values="t_merchant| telephone| merchant_telephone_cipher| |
merchant_telephone_like| AES|
{"aes-key-value":"123456abc"}| | | IT.ENCRYPT.LIKE.FIXTURE
| {"mask":4093} " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
index ba7e21933c9..78943c0ed8c 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
@@ -29,5 +29,5 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| pwd| pwd_cipher| | | AES| aes-key-value=123456abc| |
| | " />
+ <row values="t_user| pwd| pwd_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
index 99d5cbc1aab..d55eca20239 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
@@ -29,9 +29,9 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| pwd| pwd_cipher| | | AES| aes-key-value=123456abc| |
| | " />
- <row values="t_user_details| number| number_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user_details| number_new| number_new_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_merchant| business_code| business_code_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_merchant| telephone| telephone_cipher| | | AES|
aes-key-value=123456abc| | | | " />
+ <row values="t_user| pwd| pwd_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user_details| number| number_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user_details| number_new| number_new_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_merchant| business_code| business_code_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_merchant| telephone| telephone_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask/cluster/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask/cluster/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask/cluster/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask/cluster/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask/standalone/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask/standalone/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask/standalone/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask/standalone/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/cluster/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/cluster/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/cluster/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/cluster/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/standalone/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/standalone/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/standalone/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt/standalone/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt_sharding/cluster/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt_sharding/cluster/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt_sharding/cluster/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt_sharding/cluster/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt_sharding/standalone/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt_sharding/standalone/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt_sharding/standalone/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_encrypt_sharding/standalone/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_sharding/cluster/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_sharding/cluster/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_sharding/cluster/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_sharding/cluster/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_sharding/standalone/show_mask_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_sharding/standalone/show_mask_rule.xml
index b77f67b2286..743ff6de548 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_sharding/standalone/show_mask_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/mask_sharding/standalone/show_mask_rule.xml
@@ -23,6 +23,6 @@
<column name="algorithm_props" />
</metadata>
<row values="t_user| password| MD5| " />
- <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
replace-char=*,special-chars=@" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,last-m=4,replace-char=*" />
+ <row values="t_user| email| MASK_BEFORE_SPECIAL_CHARS|
{"replace-char":"*","special-chars":"@"}"
/>
+ <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
{"first-n":3,"last-m":4,"replace-char":"*"}"
/>
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
index ba7e21933c9..78943c0ed8c 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
@@ -29,5 +29,5 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| pwd| pwd_cipher| | | AES| aes-key-value=123456abc| |
| | " />
+ <row values="t_user| pwd| pwd_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
index 99d5cbc1aab..d55eca20239 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
@@ -29,9 +29,9 @@
<column name="like_query_type" />
<column name="like_query_props" />
</metadata>
- <row values="t_user| pwd| pwd_cipher| | | AES| aes-key-value=123456abc| |
| | " />
- <row values="t_user_details| number| number_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user_details| number_new| number_new_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_merchant| business_code| business_code_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_merchant| telephone| telephone_cipher| | | AES|
aes-key-value=123456abc| | | | " />
+ <row values="t_user| pwd| pwd_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user_details| number| number_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_user_details| number_new| number_new_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_merchant| business_code| business_code_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
+ <row values="t_merchant| telephone| telephone_cipher| | | AES|
{"aes-key-value":"123456abc"}| | | | " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_algorithms.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_algorithms.xml
index abe5ca4ab53..f91354c56c0 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_algorithms.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_algorithms.xml
@@ -22,5 +22,5 @@
<column name="props" />
</metadata>
<row values="it_standard_fixture| IT.STANDARD.FIXTURE| " />
- <row values="t_product_hint_inline| HINT_INLINE|
algorithm-expression=t_product_${value}" />
+ <row values="t_product_hint_inline| HINT_INLINE|
{"algorithm-expression":"t_product_${value}"}" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rules.xml
index 7df56ad7710..15983e717ad 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_rules.xml
@@ -37,5 +37,5 @@
<row values="t_order| tbl.t_order_${0..9}| | | | | | STANDARD| order_id|
IT.STANDARD.FIXTURE| | | | | | " />
<row values="t_order_item| tbl.t_order_item_${0..9}| | | | | | STANDARD|
order_id| IT.STANDARD.FIXTURE| | item_id| IT.AUTO_INCREMENT.FIXTURE| |
IT.AUDITOR.FIXTURE| true" />
<row values="t_order_details| tbl.t_order_details_${0..9}| | | | | |
STANDARD| order_id| IT.STANDARD.FIXTURE| | | | | | " />
- <row values="t_product | tbl.t_product_${0..9}| | | | | | HINT| |
HINT_INLINE| algorithm-expression=t_product_${value}| | | | | " />
+ <row values="t_product | tbl.t_product_${0..9}| | | | | | HINT| |
HINT_INLINE| {"algorithm-expression":"t_product_${value}"}|
| | | | " />
</dataset>
