Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: support ATTRIBUTE and COMMENT in CREATE USER and ALTER USER statements #38201

Merged
merged 39 commits into from
Oct 20, 2022
Merged

*: support ATTRIBUTE and COMMENT in CREATE USER and ALTER USER statements #38201

merged 39 commits into from
Oct 20, 2022

Conversation

CbcWestwolf
Copy link
Member

@CbcWestwolf CbcWestwolf commented Sep 27, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #38172

Problem Summary:

MySQL 8.0.21 introduced ATTRIBUTE and COMMENT in CREATE USER and ALTER USER statements, TiDB hasn't implemented it yet.

What is changed and how it works?

Add a column user_attributes to mysql.user table to store ATTRIBUTE and COMMENT, and add a view information_schema.user_attributes for users to access user attributes.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

1. Support `ATTRIBUTE` and `COMMENT` in `CREATE USER` and `ALTER USER` statements
2. Add a new column `user_attributes` to `mysql.user`, and add a new view `information_schema.user_attributes`

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 27, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tangenta
  • xiongjiwei

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 27, 2022
@CbcWestwolf CbcWestwolf changed the title *: support attribute and comment in CREATE USER and ALTER USER statements *: support ATTRIBUTE and COMMENT in CREATE USER and ALTER USER statements Sep 27, 2022
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 28, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 28, 2022
CbcWestwolf
CbcWestwolf commented Sep 28, 2022
View reviewed changes
privilege/privileges/privileges.go Outdated
Comment on lines 175 to 178
// FIXME: add more privilege check
if strings.EqualFold(db, "mysql") && strings.EqualFold(table, "user") {
return true
}
Copy link
Member Author

@CbcWestwolf CbcWestwolf Sep 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would be deleted/modified later once we clear the privilege of this VIEW.

@CbcWestwolf CbcWestwolf marked this pull request as ready for review September 29, 2022 07:06
@CbcWestwolf CbcWestwolf requested a review from a team as a code owner September 29, 2022 07:06
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 29, 2022
@CbcWestwolf
Copy link
Member Author

/run-all-tests

@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 19, 2022
@CbcWestwolf
Copy link
Member Author

/cc tangenta

xiongjiwei
xiongjiwei reviewed Oct 20, 2022
View reviewed changes
executor/simple.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 20, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Oct 20, 2022
@xiongjiwei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: ef1532b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 20, 2022
@xiongjiwei
Copy link
Contributor

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 20, 2022
bb7133
bb7133 approved these changes Oct 20, 2022
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bb7133
Copy link
Member

bb7133 commented Oct 20, 2022

/merge

@CbcWestwolf
Copy link
Member Author

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 20, 2022
@CbcWestwolf
Copy link
Member Author

/run-build

@ti-chi-bot ti-chi-bot merged commit 4699c7d into pingcap:master Oct 20, 2022
@CbcWestwolf CbcWestwolf deleted the add_more_comments branch October 20, 2022 06:36
@sre-bot
Copy link
Contributor

sre-bot commented Oct 20, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test 🟥 failed 1, success 16, total 17 10 min New failing
idc-jenkins-ci/integration-cdc-test 🔴 failed 3, success 35, total 38 25 min Existing failure
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 22 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 9 min 32 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 8 min 1 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 11 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 22 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 2 min 52 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 42 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@CbcWestwolf CbcWestwolf mentioned this pull request Oct 21, 2022
Merged
13 tasks
@glorv glorv mentioned this pull request Mar 20, 2023
Merged
12 tasks
@dveeden dveeden mentioned this pull request Jul 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 approved these changes

@xiongjiwei xiongjiwei xiongjiwei approved these changes

@tangenta tangenta tangenta approved these changes

Assignees
No one assigned
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support commenting in CREATE USER and ALTER USER statements
6 participants
@CbcWestwolf @ti-chi-bot @xiongjiwei @bb7133 @sre-bot @tangenta