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 9040c3f60b2 Remove data types from `SHOW ENCRYPT RULES` (#23034)
9040c3f60b2 is described below
commit 9040c3f60b2db4c27187b711504121d59f2bc321
Author: Zichao <[email protected]>
AuthorDate: Thu Dec 22 23:09:04 2022 +1300
Remove data types from `SHOW ENCRYPT RULES` (#23034)
---
.../rql/rule-query/encrypt/show-encrypt-rule.cn.md | 59 ++++++++++------------
.../rql/rule-query/encrypt/show-encrypt-rule.en.md | 43 ++++++++--------
.../encrypt/show-encrypt-table-rule.cn.md | 53 ++++++++++---------
.../encrypt/show-encrypt-table-rule.en.md | 37 +++++++-------
.../distsql/syntax/rql/rule-query/encrypt.cn.md | 47 ++++++++---------
.../distsql/syntax/rql/rule-query/encrypt.en.md | 47 ++++++++---------
.../handler/query/EncryptRuleResultSet.java | 14 ++---
.../handler/query/EncryptRuleResultSetTest.java | 2 +-
.../dataset/rdl_empty_rules/alter_encrypt_rule.xml | 7 +--
.../rdl_empty_rules/create_encrypt_rule.xml | 7 +--
.../dataset/rdl_empty_rules/drop_encrypt_rule.xml | 5 --
.../show_encrypt_rule.xml | 7 +--
.../show_encrypt_rules.xml | 15 ++----
.../rql/dataset/encrypt/show_encrypt_rule.xml | 7 +--
.../rql/dataset/encrypt/show_encrypt_rules.xml | 15 ++----
.../show_encrypt_rule.xml | 7 +--
.../show_encrypt_rules.xml | 19 +++----
.../sharding_and_encrypt/show_encrypt_rule.xml | 7 +--
.../sharding_and_encrypt/show_encrypt_rules.xml | 15 ++----
19 files changed, 168 insertions(+), 245 deletions(-)
diff --git
a/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-rule.cn.md
b/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-rule.cn.md
index 657b7fdee84..f83ba40c3a9 100644
---
a/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-rule.cn.md
+++
b/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-rule.cn.md
@@ -24,19 +24,20 @@ databaseName ::=
### 返回值说明
| 列 | 说明 |
-| ------------------------- | ------------------ |
-| table | 逻辑表名 |
-| logic_column | 逻辑列名 |
-| logic_data_type | 逻辑列数据类型 |
-| cipher_column | 密文列名 |
-| cipher_data_type | 密文列数据类型 |
-| plain_column | 明文列名 |
-| plain_data_type | 明文列数据类型 |
-| assisted_query_column | 辅助查询列名 |
-| assisted_query_data_type | 辅助查询列数据类型 |
-| encryptor_type | 加密算法类型 |
-| encryptor_props | 加密算法参数 |
-| query_with_cipher_column | 是否使用加密列进行查询 |
+|--------------------------| ------------------ |
+| table | 逻辑表名 |
+| logic_column | 逻辑列名 |
+| cipher_column | 密文列名 |
+| plain_column | 明文列名 |
+| assisted_query_column | 辅助查询列名 |
+| like_query_column | 模糊查询列名 |
+| encryptor_type | 加密算法类型 |
+| encryptor_props | 加密算法参数 |
+| assisted_query_type | 辅助查询算法类型 |
+| assisted_query_props | 辅助查询算法参数 |
+| like_query_type | 模糊查询算法类型 |
+| like_query_props | 模糊查询算法参数 |
+| query_with_cipher_column | 是否使用加密列进行查询 |
### 示例
@@ -48,15 +49,13 @@ SHOW ENCRYPT RULES FROM test1;
```sql
mysql> SHOW ENCRYPT RULES FROM test1;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | false |
-| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | false |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-4 rows in set (0.00 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_user | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+2 rows in set (0.00 sec)
```
- 查询当前逻辑库中的数据加密规则
@@ -67,15 +66,13 @@ SHOW ENCRYPT RULES;
```sql
mysql> SHOW ENCRYPT RULES;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | false |
-| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | false |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-4 rows in set (0.00 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_user | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+2 rows in set (0.00 sec)
```
### 保留字
diff --git
a/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-rule.en.md
b/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-rule.en.md
index 1342e445ff9..67c0d854cfe 100644
---
a/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-rule.en.md
+++
b/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-rule.en.md
@@ -24,18 +24,19 @@ databaseName ::=
### Return value description
| Column | Description |
-| ------------------------- | ---------------------------------------- |
+| ------------------------- |-------------------------------------------|
| table | Logical table name |
| logic_column | Logical column name |
-| logic_data_type | Logical column data type |
| cipher_column | Ciphertext column name |
-| cipher_data_type | Ciphertext column data type |
| plain_column | Plaintext column name |
-| plain_data_type | Plaintext column data type |
| assisted_query_column | Assisted query column name |
-| assisted_query_data_type | Assisted query column data type |
+| like_query_column | Like query column name |
| encryptor_type | Encryption algorithm type |
| encryptor_props | Encryption algorithm parameter |
+| assisted_query_type | Assisted query algorithm type |
+| assisted_query_props | Assisted query algorithm parameter |
+| like_query_type | Like query algorithm type |
+| like_query_props | Like query algorithm parameter |
| query_with_cipher_column | Whether to use encrypted column for query |
@@ -51,15 +52,13 @@ SHOW ENCRYPT RULES FROM test1;
```sql
mysql> SHOW ENCRYPT RULES FROM test1;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | false |
-| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | false |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-4 rows in set (0.00 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_user | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+2 rows in set (0.00 sec)
```
- Query encrypt rules for current database.
@@ -70,15 +69,13 @@ SHOW ENCRYPT RULES;
```sql
mysql> SHOW ENCRYPT RULES;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | false |
-| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | false |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-4 rows in set (0.00 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_user | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+2 rows in set (0.00 sec)
```
### Reserved word
diff --git
a/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-table-rule.cn.md
b/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-table-rule.cn.md
index 07d9c4f47f5..c973148e26a 100644
---
a/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-table-rule.cn.md
+++
b/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-table-rule.cn.md
@@ -27,19 +27,20 @@ databaseName ::=
### 返回值说明
| 列 | 说明 |
-| ------------------------- | ------------------ |
-| table | 逻辑表名 |
-| logic_column | 逻辑列名 |
-| logic_data_type | 逻辑列数据类型 |
-| cipher_column | 密文列名 |
-| cipher_data_type | 密文列数据类型 |
-| plain_column | 明文列名 |
-| plain_data_type | 明文列数据类型 |
-| assisted_query_column | 辅助查询列名 |
-| assisted_query_data_type | 辅助查询列数据类型 |
-| encryptor_type | 加密算法类型 |
-| encryptor_props | 加密算法参数 |
-| query_with_cipher_column | 是否使用加密列进行查询 |
+|--------------------------| ------------------ |
+| table | 逻辑表名 |
+| logic_column | 逻辑列名 |
+| cipher_column | 密文列名 |
+| plain_column | 明文列名 |
+| assisted_query_column | 辅助查询列名 |
+| like_query_column | 模糊查询列名 |
+| encryptor_type | 加密算法类型 |
+| encryptor_props | 加密算法参数 |
+| assisted_query_type | 辅助查询算法类型 |
+| assisted_query_props | 辅助查询算法参数 |
+| like_query_type | 模糊查询算法类型 |
+| like_query_props | 模糊查询算法参数 |
+| query_with_cipher_column | 是否使用加密列进行查询 |
### 示例
@@ -51,13 +52,12 @@ SHOW ENCRYPT TABLE RULE t_encrypt FROM test1;
```sql
mysql> SHOW ENCRYPT TABLE RULE t_encrypt FROM test1;
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-2 rows in set (0.00 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+1 row in set (0.01 sec)
```
- 查询当前逻辑库中指定表的数据加密规则
@@ -68,13 +68,12 @@ SHOW ENCRYPT TABLE RULE t_encrypt;
```sql
mysql> SHOW ENCRYPT TABLE RULE t_encrypt;
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-2 rows in set (0.00 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+1 row in set (0.01 sec)
```
### 保留字
diff --git
a/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-table-rule.en.md
b/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-table-rule.en.md
index c9aaf2e3a8c..7b24ba60f32 100644
---
a/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-table-rule.en.md
+++
b/docs/document/content/reference/distsql/syntax/rql/rule-query/encrypt/show-encrypt-table-rule.en.md
@@ -27,18 +27,19 @@ databaseName ::=
### Return value description
| Column | Description |
-| ------------------------- | ---------------------------------------- |
+| ------------------------- |-------------------------------------------|
| table | Logical table name |
| logic_column | Logical column name |
-| logic_data_type | Logical column data type |
| cipher_column | Ciphertext column name |
-| cipher_data_type | Ciphertext column data type |
| plain_column | Plaintext column name |
-| plain_data_type | Plaintext column data type |
| assisted_query_column | Assisted query column name |
-| assisted_query_data_type | Assisted query column data type |
+| like_query_column | Like query column name |
| encryptor_type | Encryption algorithm type |
| encryptor_props | Encryption algorithm parameter |
+| assisted_query_type | Assisted query algorithm type |
+| assisted_query_props | Assisted query algorithm parameter |
+| like_query_type | Like query algorithm type |
+| like_query_props | Like query algorithm parameter |
| query_with_cipher_column | Whether to use encrypted column for query |
@@ -54,13 +55,12 @@ SHOW ENCRYPT TABLE RULE t_encrypt FROM test1;
```sql
mysql> SHOW ENCRYPT TABLE RULE t_encrypt FROM test1;
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-2 rows in set (0.00 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+1 row in set (0.01 sec)
```
- Query encrypt rules for specified table in current database.
@@ -71,13 +71,12 @@ SHOW ENCRYPT TABLE RULE t_encrypt;
```sql
mysql> SHOW ENCRYPT TABLE RULE t_encrypt;
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-2 rows in set (0.00 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+1 row in set (0.01 sec)
```
### Reserved word
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
index ad3e450b221..19aba9ebc4d 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
@@ -18,13 +18,10 @@ SHOW ENCRYPT TABLE RULE tableName [FROM databaseName]
|--------------------------| ------------------ |
| table | 逻辑表名 |
| logic_column | 逻辑列名 |
-| logic_data_type | 逻辑列数据类型 |
| cipher_column | 密文列名 |
-| cipher_data_type | 密文列数据类型 |
| plain_column | 明文列名 |
-| plain_data_type | 明文列数据类型 |
| assisted_query_column | 辅助查询列名 |
-| assisted_query_data_type | 辅助查询列数据类型 |
+| like_query_column | 模糊查询列名 |
| encryptor_type | 加密算法类型 |
| encryptor_props | 加密算法参数 |
| assisted_query_type | 辅助查询算法类型 |
@@ -38,34 +35,30 @@ SHOW ENCRYPT TABLE RULE tableName [FROM databaseName]
*显示加密规则*
```sql
mysql> SHOW ENCRYPT RULES FROM encrypt_db;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| AES | aes-key-value=123456abc | MD5 |
| CHAR_DIGEST_LIKE | | true
|
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true
|
-| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | |
| | | false
|
-| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | false
|
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-4 rows in set (0.03 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_user | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+2 rows in set (0.00 sec)
```
*显示加密表规则表名*
```sql
mysql> SHOW ENCRYPT TABLE RULE t_encrypt;
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| AES | aes-key-value=123456abc | MD5 |
| CHAR_DIGEST_LIKE | | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-2 rows in set (0.08 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+1 row in set (0.01 sec)
mysql> SHOW ENCRYPT TABLE RULE t_encrypt FROM encrypt_db;
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| AES | aes-key-value=123456abc | MD5 |
| CHAR_DIGEST_LIKE | | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-2 rows in set (0.03 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+1 row in set (0.01 sec)
```
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
index 2b5594f5ee7..1700c70f5db 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
@@ -18,13 +18,10 @@ SHOW ENCRYPT TABLE RULE tableName [FROM databaseName]
| ------------------------- |-------------------------------------------|
| table | Logical table name |
| logic_column | Logical column name |
-| logic_data_type | Logical column data type |
| cipher_column | Ciphertext column name |
-| cipher_data_type | Ciphertext column data type |
| plain_column | Plaintext column name |
-| plain_data_type | Plaintext column data type |
| assisted_query_column | Assisted query column name |
-| assisted_query_data_type | Assisted query column data type |
+| like_query_column | Like query column name |
| encryptor_type | Encryption algorithm type |
| encryptor_props | Encryption algorithm parameter |
| assisted_query_type | Assisted query algorithm type |
@@ -38,34 +35,30 @@ SHOW ENCRYPT TABLE RULE tableName [FROM databaseName]
*Show Encrypt Rules*
```sql
mysql> SHOW ENCRYPT RULES FROM encrypt_db;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| AES | aes-key-value=123456abc | MD5 |
| CHAR_DIGEST_LIKE | | true
|
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true
|
-| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | |
| | | false
|
-| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | false
|
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-4 rows in set (0.03 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_user | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+2 rows in set (0.00 sec)
```
*Show Encrypt Table Rule Table Name*
```sql
mysql> SHOW ENCRYPT TABLE RULE t_encrypt;
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| AES | aes-key-value=123456abc | MD5 |
| CHAR_DIGEST_LIKE | | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-2 rows in set (0.08 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+1 row in set (0.01 sec)
mysql> SHOW ENCRYPT TABLE RULE t_encrypt FROM encrypt_db;
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| AES | aes-key-value=123456abc | MD5 |
| CHAR_DIGEST_LIKE | | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true |
-+-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+----------------------+------------------+------------------+--------------------------+
-2 rows in set (0.03 sec)
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| table | logic_column | cipher_column | plain_column |
assisted_query_column | like_query_column | encryptor_type | encryptor_props
| assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+| t_encrypt | pwd | pwd_cipher | pwd_plain |
| | AES | aes-key-value=123456abc |
| | | | true
|
++-----------+--------------+---------------+--------------+-----------------------+-------------------+----------------+-------------------------+---------------------+----------------------+-----------------+------------------+--------------------------+
+1 row in set (0.01 sec)
```
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleResultSet.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleResultSet.java
index 5b8ae24c263..667c2f1ee7d 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleResultSet.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleResultSet.java
@@ -63,11 +63,11 @@ public final class EncryptRuleResultSet implements
DatabaseDistSQLResultSet {
AlgorithmConfiguration encryptorAlgorithmConfig =
algorithmMap.get(each.getEncryptorName());
AlgorithmConfiguration assistedQueryEncryptorAlgorithmConfig =
algorithmMap.get(each.getAssistedQueryEncryptorName());
AlgorithmConfiguration likeQueryEncryptorAlgorithmConfig =
algorithmMap.get(each.getLikeQueryEncryptorName());
- result.add(Arrays.asList(tableRuleConfig.getName(),
each.getLogicColumn(), nullToEmptyString(null),
- each.getCipherColumn(), nullToEmptyString(null),
- nullToEmptyString(each.getPlainColumn()),
nullToEmptyString(null),
- nullToEmptyString(each.getAssistedQueryColumn()),
nullToEmptyString(null),
- nullToEmptyString(each.getLikeQueryColumn()),
nullToEmptyString(null),
+ result.add(Arrays.asList(tableRuleConfig.getName(),
each.getLogicColumn(),
+ each.getCipherColumn(),
+ nullToEmptyString(each.getPlainColumn()),
+ nullToEmptyString(each.getAssistedQueryColumn()),
+ nullToEmptyString(each.getLikeQueryColumn()),
encryptorAlgorithmConfig.getType(),
PropertiesConverter.convert(encryptorAlgorithmConfig.getProps()),
Objects.isNull(assistedQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) : assistedQueryEncryptorAlgorithmConfig.getType(),
Objects.isNull(assistedQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) :
PropertiesConverter.convert(assistedQueryEncryptorAlgorithmConfig.getProps()),
@@ -94,8 +94,8 @@ public final class EncryptRuleResultSet implements
DatabaseDistSQLResultSet {
@Override
public Collection<String> getColumnNames() {
- return Arrays.asList("table", "logic_column", "logic_data_type",
"cipher_column", "cipher_data_type", "plain_column", "plain_data_type",
- "assisted_query_column", "assisted_query_data_type",
"like_query_column", "like_query_data_type", "encryptor_type",
"encryptor_props",
+ return Arrays.asList("table", "logic_column", "cipher_column",
"plain_column",
+ "assisted_query_column", "like_query_column",
"encryptor_type", "encryptor_props",
"assisted_query_type", "assisted_query_props",
"like_query_type", "like_query_props", "query_with_cipher_column");
}
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleResultSetTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleResultSetTest.java
index c75de9bfe7c..9ca0699ae88 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleResultSetTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleResultSetTest.java
@@ -48,7 +48,7 @@ public final class EncryptRuleResultSetTest {
DatabaseDistSQLResultSet resultSet = new EncryptRuleResultSet();
resultSet.init(database, mock(ShowEncryptRulesStatement.class));
Collection<Object> actual = resultSet.getRowData();
- assertThat(actual.size(), is(18));
+ assertThat(actual.size(), is(13));
assertTrue(actual.contains("t_encrypt"));
assertTrue(actual.contains("user_id"));
assertTrue(actual.contains("user_cipher"));
diff --git
a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
index b9903971410..5d9712911e5 100644
---
a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
+++
b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,5 +31,5 @@
<column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | | | AES|
aes-key-value=123456abcd| | | | | true" />
+ <row values="t_user| pwd| pwd_cipher| pwd_plain| | | AES|
aes-key-value=123456abcd| | | | | true" />
</dataset>
diff --git
a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
index 72e41da2b9b..d1b2998cb60 100644
---
a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
+++
b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,5 +31,5 @@
<column name="like_query_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| pwd| pwd_cipher| pwd_plain| | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
index d9b65e77c7b..e965e32b5e0 100644
---
a/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
+++
b/test/e2e/suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
diff --git
a/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
b/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
index 72e41da2b9b..d1b2998cb60 100644
---
a/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
+++
b/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,5 +31,5 @@
<column name="like_query_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| pwd| pwd_cipher| pwd_plain| | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
b/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
index 7a342f6b7fb..3db552c54d2 100644
---
a/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
+++
b/test/e2e/suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,9 +31,9 @@
<column name="like_query_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" />
+ <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/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
index 72e41da2b9b..d1b2998cb60 100644
---
a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
+++
b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,5 +31,5 @@
<column name="like_query_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| pwd| pwd_cipher| pwd_plain| | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
index c4f05dbfc15..57fab31789d 100644
---
a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
+++
b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,9 +31,9 @@
<column name="like_query_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_merchant| business_code| | business_code_cipher| |
business_code_plain| | | | business_code_like| | AES| aes-key-value=123456abc|
| | CHAR_DIGEST_LIKE | mask=4093 | true" />
- <row values="t_merchant| telephone| | telephone_cipher| | telephone_plain|
| | | telephone_like| | AES| aes-key-value=123456abc| | | CHAR_DIGEST_LIKE |
mask=4093 | true" />
+ <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_merchant| business_code| business_code_cipher|
business_code_plain| | business_code_like| AES| aes-key-value=123456abc| | |
CHAR_DIGEST_LIKE | mask=4093 | true" />
+ <row values="t_merchant| telephone| telephone_cipher| telephone_plain| |
telephone_like| AES| aes-key-value=123456abc| | | CHAR_DIGEST_LIKE | mask=4093
| true" />
</dataset>
diff --git
a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
index 72e41da2b9b..d1b2998cb60 100644
---
a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
+++
b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,5 +31,5 @@
<column name="like_query_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| pwd| pwd_cipher| pwd_plain| | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
index a402b05aaac..0c69f265e64 100644
---
a/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
+++
b/test/e2e/suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,11 +31,11 @@
<column name="like_query_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" />
- <row values="t_merchant| business_code| | business_code_cipher| |
business_code_plain| | | | | | AES| aes-key-value=123456abc| | | | | true" />
- <row values="t_merchant| telephone| | telephone_cipher| | telephone_plain|
| | | | | AES| aes-key-value=123456abc| | | | | true" />
+ <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" />
+ <row values="t_merchant| business_code| business_code_cipher|
business_code_plain| | | AES| aes-key-value=123456abc| | | | | true" />
+ <row values="t_merchant| telephone| telephone_cipher| telephone_plain| | |
AES| aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/e2e/suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
b/test/e2e/suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
index 72e41da2b9b..d1b2998cb60 100644
---
a/test/e2e/suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
+++
b/test/e2e/suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,5 +31,5 @@
<column name="like_query_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| pwd| pwd_cipher| pwd_plain| | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/e2e/suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
b/test/e2e/suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
index 7a342f6b7fb..3db552c54d2 100644
---
a/test/e2e/suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
+++
b/test/e2e/suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
@@ -19,15 +19,10 @@
<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="like_query_column" />
- <column name="like_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
<column name="assisted_query_type" />
@@ -36,9 +31,9 @@
<column name="like_query_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" />
+ <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>
