You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/02/20 12:15:43 UTC
[shardingsphere] branch master updated: simplify authority.xml
(#9457)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 f3b5622 simplify authority.xml (#9457)
f3b5622 is described below
commit f3b56221be5616e783b5e4e0d8b4ca0b980e510f
Author: Jieker <ji...@163.com>
AuthorDate: Sat Feb 20 20:15:16 2021 +0800
simplify authority.xml (#9457)
---
.../src/test/resources/env/db/authority.xml | 10 --
.../env/dbtbl_with_replica_query/authority.xml | 110 ++-------------------
.../src/test/resources/env/encrypt/authority.xml | 2 -
.../test/resources/env/replica_query/authority.xml | 1 -
.../src/test/resources/env/shadow/authority.xml | 1 -
.../src/test/resources/env/tbl/authority.xml | 10 --
6 files changed, 10 insertions(+), 124 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/authority.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/authority.xml
index 7840000..6cc8076 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/authority.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/authority.xml
@@ -60,16 +60,6 @@
<sql>GRANT select,update,insert,delete on db_7.* to user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on db_8.* to user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on db_9.* to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_0.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_1.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_2.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_3.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_4.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_5.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_6.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_7.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_8.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on db_9.t_order to user_dev@localhost</sql>
</user-create>
<user-drop>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/authority.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/authority.xml
index 587b830..842ffd9 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/authority.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/authority.xml
@@ -60,106 +60,16 @@
<sql>GRANT select,update,insert,delete on primary_ds_7.* to user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on primary_ds_8.* to user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on primary_ds_9.* to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_0.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_1.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_2.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_3.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_4.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_5.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_6.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_7.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_8.t_order_9 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds_9.t_order_9 to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_0.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_1.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_2.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_3.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_4.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_5.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_6.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_7.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_8.* to user_dev@localhost</sql>
+ <sql>GRANT select,update,insert,delete on replica_ds_9.* to user_dev@localhost</sql>
</user-create>
<user-drop>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/encrypt/authority.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/encrypt/authority.xml
index 9116d10..e9c37bb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/encrypt/authority.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/encrypt/authority.xml
@@ -51,8 +51,6 @@
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt.* to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on encrypt.t_order to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on encrypt.t_user to user_dev@localhost</sql>
</user-create>
<user-drop>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/authority.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/authority.xml
index fa38af3..c1ad51b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/authority.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/authority.xml
@@ -51,7 +51,6 @@
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on primary_ds.* to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds.t_order to user_dev@localhost</sql>
</user-create>
<user-drop>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/shadow/authority.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/shadow/authority.xml
index fa38af3..c1ad51b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/shadow/authority.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/shadow/authority.xml
@@ -51,7 +51,6 @@
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on primary_ds.* to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on primary_ds.t_order to user_dev@localhost</sql>
</user-create>
<user-drop>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/tbl/authority.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/tbl/authority.xml
index 39109c3..d00cb43 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/tbl/authority.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/tbl/authority.xml
@@ -51,16 +51,6 @@
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on tbl.* to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_0 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_1 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_2 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_3 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_4 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_5 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_6 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_7 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_8 to user_dev@localhost</sql>
- <sql>GRANT select,update,insert,delete on t_order_9 to user_dev@localhost</sql>
</user-create>
<user-drop>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>