This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 9d473f75601 Fix mask e2e integration test error since props can not
guarantee order (#26048)
9d473f75601 is described below
commit 9d473f756011a239a93c855a2b91dfba7b08868a
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Mon Jun 5 14:27:30 2023 +0800
Fix mask e2e integration test error since props can not guarantee order
(#26048)
* Fix mask e2e integration test error since props can not guarantee order
* add sort for PropertiesConverter
* add sort for PropertiesConverter
---
...23_02_17_Dynamic_Data_Masking_ShardingSphere_5.3.1_Deep_Dive.en.md | 2 +-
.../apache/shardingsphere/infra/util/props/PropertiesConverter.java | 2 +-
.../resources/cases/rdl/dataset/rdl_empty_rules/alter_mask_rule.xml | 2 +-
.../test/resources/cases/rql/dataset/mask/cluster/show_mask_rule.xml | 2 +-
.../resources/cases/rql/dataset/mask/standalone/show_mask_rule.xml | 4 ++--
.../cases/rql/dataset/mask_encrypt/cluster/show_mask_rule.xml | 2 +-
.../test/resources/cases/rql/dataset/mask_encrypt/show_mask_rule.xml | 4 ++--
.../cases/rql/dataset/mask_encrypt/standalone/show_mask_rule.xml | 4 ++--
.../rql/dataset/mask_encrypt_sharding/cluster/show_mask_rule.xml | 2 +-
.../rql/dataset/mask_encrypt_sharding/standalone/show_mask_rule.xml | 4 ++--
.../cases/rql/dataset/mask_sharding/cluster/show_mask_rule.xml | 2 +-
.../cases/rql/dataset/mask_sharding/standalone/show_mask_rule.xml | 4 ++--
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/docs/blog/content/material/2023_02_17_Dynamic_Data_Masking_ShardingSphere_5.3.1_Deep_Dive.en.md
b/docs/blog/content/material/2023_02_17_Dynamic_Data_Masking_ShardingSphere_5.3.1_Deep_Dive.en.md
index e4e4092807a..8fdda623c10 100644
---
a/docs/blog/content/material/2023_02_17_Dynamic_Data_Masking_ShardingSphere_5.3.1_Deep_Dive.en.md
+++
b/docs/blog/content/material/2023_02_17_Dynamic_Data_Masking_ShardingSphere_5.3.1_Deep_Dive.en.md
@@ -250,7 +250,7 @@ mysql> SHOW MASK RULES FROM mask_db;
+--------+-----------+---------------------------+-----------------------------------+
| t_user | password | MD5 |
|
| t_user | email | MASK_BEFORE_SPECIAL_CHARS |
replace-char=*,special-chars=@ |
-| t_user | telephone | KEEP_FIRST_N_LAST_M |
first-n=3,replace-char=*,last-m=4 |
+| t_user | telephone | KEEP_FIRST_N_LAST_M |
first-n=3,last-m=4,replace-char=* |
+--------+-----------+---------------------------+-----------------------------------+
3 rows in set (0.01 sec)
diff --git
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/props/PropertiesConverter.java
b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/props/PropertiesConverter.java
index cceae465f28..519a96867b6 100644
---
a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/props/PropertiesConverter.java
+++
b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/props/PropertiesConverter.java
@@ -36,6 +36,6 @@ public final class PropertiesConverter {
* @return converted string content
*/
public static String convert(final Properties props) {
- return props.entrySet().stream().map(entry -> String.join("=",
entry.getKey().toString(),
entry.getValue().toString())).collect(Collectors.joining(","));
+ return props.entrySet().stream().map(entry -> String.join("=",
entry.getKey().toString(),
entry.getValue().toString())).sorted().collect(Collectors.joining(","));
}
}
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 e40f2b2e210..0f7bc437a10 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|
to-y=2,from-x=1,replace-char=*" />
+ <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/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 0654800c268..b77f67b2286 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|
special-chars=@,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 d3090160de3..b77f67b2286 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|
special-chars=@,replace-char=*" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,replace-char=*,last-m=4" />
+ <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 0654800c268..b77f67b2286 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|
special-chars=@,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 d3090160de3..b77f67b2286 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|
special-chars=@,replace-char=*" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,replace-char=*,last-m=4" />
+ <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 d3090160de3..b77f67b2286 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|
special-chars=@,replace-char=*" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,replace-char=*,last-m=4" />
+ <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 0654800c268..b77f67b2286 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|
special-chars=@,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 d3090160de3..b77f67b2286 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|
special-chars=@,replace-char=*" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,replace-char=*,last-m=4" />
+ <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 0654800c268..b77f67b2286 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|
special-chars=@,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 d3090160de3..b77f67b2286 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|
special-chars=@,replace-char=*" />
- <row values="t_user| telephone| KEEP_FIRST_N_LAST_M|
first-n=3,replace-char=*,last-m=4" />
+ <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>
