From 435885477b5e408a472138bf43dea7dd7026503a Mon Sep 17 00:00:00 2001 From: glorv Date: Fri, 7 Apr 2023 18:01:03 +0800 Subject: [PATCH 1/6] add a example to reset user resource group to default value --- sql-statements/sql-statement-alter-user.md | 42 +++++++++++++++++++ .../sql-statement-create-resource-group.md | 1 + tidb-resource-control.md | 4 +- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/sql-statements/sql-statement-alter-user.md b/sql-statements/sql-statement-alter-user.md index 080874cdd45a..a87d1c87f103 100644 --- a/sql-statements/sql-statement-alter-user.md +++ b/sql-statements/sql-statement-alter-user.md @@ -62,6 +62,8 @@ SHOW CREATE USER 'newuser'; 1 row in set (0.00 sec) ``` +### 修改用户基本信息 + {{< copyable "sql" >}} ```sql @@ -165,6 +167,8 @@ ALTER USER 'newuser' PASSWORD REUSE INTERVAL 90 DAY; Query OK, 0 rows affected (0.02 sec) ``` +### 修改用户绑定的资源组 + 通过 `ALTER USER ... RESOURCE GROUP` 修改用户 `newuser` 的资源组到 `rg1`： ```sql @@ -175,6 +179,44 @@ ALTER USER 'newuser' RESOURCE GROUP rg1; Query OK, 0 rows affected (0.02 sec) ``` +查看当前用户绑定的资源组： +```sql +SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") from mysql.user WHERE user = "rg1"; +``` + +``` ++---------+---------------------------------------------------+ +| USER | JSON_EXTRACT(User_attributes, "$.resource_group") | ++---------+---------------------------------------------------+ +| newuser | "rg1" | ++---------+---------------------------------------------------+ +1 row in set (0.02 sec) +``` + +取消用户绑定的资源组（将用户绑定的资源组设置为空）： + +```sql +ALTER USER 'newuser' RESOURCE GROUP ``; +``` + +``` +Query OK, 0 rows affected (0.02 sec) +``` + +```sql +SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") from mysql.user WHERE user = "rg1"; +``` + +``` ++---------+---------------------------------------------------+ +| USER | JSON_EXTRACT(User_attributes, "$.resource_group") | ++---------+---------------------------------------------------+ +| newuser | "" | ++---------+---------------------------------------------------+ +1 row in set (0.02 sec) +``` + + ## 另请参阅 * [Security Compatibility with MySQL](/security-compatibility-with-mysql.md) diff --git a/sql-statements/sql-statement-create-resource-group.md b/sql-statements/sql-statement-create-resource-group.md index 4235a001cb7a..65651e5e50cc 100644 --- a/sql-statements/sql-statement-create-resource-group.md +++ b/sql-statements/sql-statement-create-resource-group.md @@ -104,4 +104,5 @@ MySQL 也支持 [CREATE RESOURCE GROUP](https://dev.mysql.com/doc/refman/8.0/en/ * [DROP RESOURCE GROUP](/sql-statements/sql-statement-drop-resource-group.md) * [ALTER RESOURCE GROUP](/sql-statements/sql-statement-alter-resource-group.md) +* [ALTER USER RESOURCE GROUP](/sql-statements/sql-statement-alter-user.md#修改用户绑定的资源组) * [RU](/tidb-resource-control.md#什么是-request-unit-ru) diff --git a/tidb-resource-control.md b/tidb-resource-control.md index d4fb17de587b..19eb1cae2891 100644 --- a/tidb-resource-control.md +++ b/tidb-resource-control.md @@ -104,9 +104,9 @@ Request Unit (RU) 是 TiDB 对 CPU、IO 等系统资源的统一抽象的单位, TiDB 支持如下三个级别的资源组设置： -- 用户级别。通过 [`CREATE USER`](/sql-statements/sql-statement-create-user.md) 或 [`ALTER USER`](/sql-statements/sql-statement-alter-user.md) 语句将用户绑定到特定的资源组。绑定后，对应的用户新创建的会话会自动绑定对应的资源组。 +- 用户级别。通过 [`CREATE USER`](/sql-statements/sql-statement-create-user.md) 或 [`ALTER USER`](/sql-statements/sql-statement-alter-user.md#修改用户绑定的资源组) 语句将用户绑定到特定的资源组。绑定后，对应的用户新创建的会话会自动绑定对应的资源组。 - 会话级别。通过 [`SET RESOURCE GROUP`](/sql-statements/sql-statement-set-resource-group.md) 设置当前会话使用的资源组。 -- 语句级别。通过 [`RESOURCE_GROUP()`](/optimizer-hints.md#resource_groupresource_group_name) 设置当前语句使用的资源组。 +- 语句级别。通过 [`RESOURCE_GROUP()`](/optimizer-hints.md#resource_groupresource_group_name) Optimizer Hint 设置当前语句使用的资源组。 #### 将用户绑定到资源组 From 3397711dd389af31fa45b438d04897d6ab5a59de Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Tue, 11 Apr 2023 10:58:25 +0800 Subject: [PATCH 2/6] Update sql-statements/sql-statement-alter-user.md --- sql-statements/sql-statement-alter-user.md | 1 - 1 file changed, 1 deletion(-) diff --git a/sql-statements/sql-statement-alter-user.md b/sql-statements/sql-statement-alter-user.md index a87d1c87f103..36cd5a215f05 100644 --- a/sql-statements/sql-statement-alter-user.md +++ b/sql-statements/sql-statement-alter-user.md @@ -216,7 +216,6 @@ SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") from mysql.user W 1 row in set (0.02 sec) ``` - ## 另请参阅 * [Security Compatibility with MySQL](/security-compatibility-with-mysql.md) From 42567c5c702b125480a48f452afcfd84a694b566 Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Tue, 11 Apr 2023 11:10:02 +0800 Subject: [PATCH 3/6] Update sql-statements/sql-statement-alter-user.md --- sql-statements/sql-statement-alter-user.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sql-statements/sql-statement-alter-user.md b/sql-statements/sql-statement-alter-user.md index 36cd5a215f05..81e5f012948f 100644 --- a/sql-statements/sql-statement-alter-user.md +++ b/sql-statements/sql-statement-alter-user.md @@ -180,6 +180,7 @@ Query OK, 0 rows affected (0.02 sec) ``` 查看当前用户绑定的资源组： + ```sql SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") from mysql.user WHERE user = "rg1"; ``` From a682ffbb42efdddd531a2d453be230639acd00ed Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Tue, 11 Apr 2023 16:52:54 +0800 Subject: [PATCH 4/6] Update sql-statements/sql-statement-alter-user.md --- sql-statements/sql-statement-alter-user.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-alter-user.md b/sql-statements/sql-statement-alter-user.md index 81e5f012948f..c10876ef778a 100644 --- a/sql-statements/sql-statement-alter-user.md +++ b/sql-statements/sql-statement-alter-user.md @@ -194,7 +194,7 @@ SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") from mysql.user W 1 row in set (0.02 sec) ``` -取消用户绑定的资源组（将用户绑定的资源组设置为空）： +取消用户绑定的资源组，即将用户绑定的资源组设置为空。取消后，用户会绑定到 `default` 资源组。 ```sql ALTER USER 'newuser' RESOURCE GROUP ``; From cd9e718b65676999a394c19f10c05ac41dce704f Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Wed, 12 Apr 2023 16:53:39 +0800 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: Aolin --- sql-statements/sql-statement-alter-user.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sql-statements/sql-statement-alter-user.md b/sql-statements/sql-statement-alter-user.md index c10876ef778a..63b88e9a2bdf 100644 --- a/sql-statements/sql-statement-alter-user.md +++ b/sql-statements/sql-statement-alter-user.md @@ -64,7 +64,7 @@ SHOW CREATE USER 'newuser'; ### 修改用户基本信息 -{{< copyable "sql" >}} +修改用户 `newuser` 的密码： ```sql ALTER USER 'newuser' IDENTIFIED BY 'newnewpassword'; @@ -182,7 +182,7 @@ Query OK, 0 rows affected (0.02 sec) 查看当前用户绑定的资源组： ```sql -SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") from mysql.user WHERE user = "rg1"; +SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") FROM mysql.user WHERE user = "newuser"; ``` ``` @@ -198,14 +198,7 @@ SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") from mysql.user W ```sql ALTER USER 'newuser' RESOURCE GROUP ``; -``` - -``` -Query OK, 0 rows affected (0.02 sec) -``` - -```sql -SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") from mysql.user WHERE user = "rg1"; +SELECT USER, JSON_EXTRACT(User_attributes, "$.resource_group") FROM mysql.user WHERE user = "newuser"; ``` ``` From 344d276564129e734e0bfa9826344331dbc0e08a Mon Sep 17 00:00:00 2001 From: xixirangrang <35301108+hfxsd@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:01:21 +0800 Subject: [PATCH 6/6] Update sql-statement-alter-user.md --- sql-statements/sql-statement-alter-user.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-alter-user.md b/sql-statements/sql-statement-alter-user.md index 63b88e9a2bdf..1113e85d1b85 100644 --- a/sql-statements/sql-statement-alter-user.md +++ b/sql-statements/sql-statement-alter-user.md @@ -89,7 +89,7 @@ SHOW CREATE USER 'newuser'; 1 row in set (0.00 sec) ``` -{{< copyable "sql" >}} +锁定用户 `newuser`： ```sql ALTER USER 'newuser' ACCOUNT LOCK;