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

infoschema, executor: Add SQL Text to INFORMATION_SCHEMA.(CLUSTER_)DEADLOCKS table #26711

Merged
merged 34 commits into from
Aug 4, 2021
Merged

infoschema, executor: Add SQL Text to INFORMATION_SCHEMA.(CLUSTER_)DEADLOCKS table #26711

merged 34 commits into from
Aug 4, 2021

Conversation

MyonKeminta
Copy link
Contributor

What problem does this PR solve?

Problem Summary: This PR adds a column to the (CLUSTER_)DEADLOCKS table that shows the current blocked SQL statements.

What is changed and how it works?

What's Changed: This PR adds a column to the (CLUSTER_)DEADLOCKS table that shows the current blocked SQL statements.

Check List

Tests

  • Unit test

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory

Documentation

  • Affects user behaviors

Release note 

Add SQL text information to `INFORMATION_SCHEMA.DEADLOCKS` and `INFORMATION_SCHEMA.CLUSTER_DEADLOCKS` table

MyonKeminta and others added 26 commits July 19, 2021 13:53
@MyonKeminta
Support pruning columns before retrieving
0949cbc
@MyonKeminta
Support retrieving the SQL digest test
1e11c06
@MyonKeminta
fix test
4f0041d
@MyonKeminta
Merge branch 'master' of https://github.com/pingcap/tidb into m/lock-…
16acf7e 
…view-get-sql-test-2
@MyonKeminta
Add test for batchRetrieverHelper
e31b0a1
@MyonKeminta
Add tests
4a26c69
@MyonKeminta
Add comments
66e216a
@MyonKeminta
Remove deadcode
a9313d1
@MyonKeminta
Add a test case
23fd3c7
@MyonKeminta
Merge branch 'master' into m/lock-view-get-sql-test-2
60ddd1a
@MyonKeminta
Remove commented code
7ec2fc2
@MyonKeminta
Merge branch 'm/lock-view-get-sql-test-2' of https://github.com/MyonK…
fb4f9e7 
…eminta/tidb into m/lock-view-get-sql-test-2
@MyonKeminta
Merge branch 'master' of https://github.com/pingcap/tidb into m/data-…
df13b15 
…lock-waits-sql-text
@MyonKeminta
Merge branch 'master' of https://github.com/pingcap/tidb into m/lock-…
f2c160e 
…view-get-sql-test-2
@MyonKeminta
Address comments
4f5a8b6
@MyonKeminta
Fix test
2be4ef5
@MyonKeminta
prune columns for cluster_tidb_trx
e424dfa
@MyonKeminta @youjiali1995
Update executor/utils.go
95d3589 
Co-authored-by: Lei Zhao <[email protected]>
@MyonKeminta
Add SQL text to deadlocks table
46f957d
@MyonKeminta
Fix privilege check
bdd5a22
@MyonKeminta
Fix test
8b527f8
@ti-chi-bot
Merge branch 'master' into m/lock-view-get-sql-test-2
3ee2aae
@ti-chi-bot
Merge branch 'master' into m/lock-view-get-sql-test-2
910850a
@MyonKeminta
Merge remote-tracking branch 'origin/m/lock-view-get-sql-test-2' into…
a809221 
… m/deadlocks-sql-text
@MyonKeminta
Merge commit '89e5ce068653576ad38ef4627649137a5b63ec17' into m/deadlo…
2002ec0 
…cks-sql-text
@MyonKeminta
Merge branch 'master' of https://github.com/pingcap/tidb into m/deadl…
be21bac 
…ocks-sql-text
@MyonKeminta MyonKeminta added the sig/transaction SIG:Transaction label Jul 28, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 28, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • youjiali1995

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 the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 28, 2021
@github-actions github-actions bot added sig/execution SIG execution sig/sql-infra SIG: SQL Infra labels Jul 28, 2021
@MyonKeminta MyonKeminta marked this pull request as ready for review August 3, 2021 08:21
@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 Aug 3, 2021
youjiali1995
youjiali1995 approved these changes Aug 4, 2021
View reviewed changes
Copy link
Contributor

@youjiali1995 youjiali1995 left a comment

Choose a reason for hiding this comment

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

LGTM

executor/infoschema_reader.go
for i := start; i < end; i++ {
sqlRetriever.SQLDigestsMap[r.deadlocks[idx].WaitChain[waitChainIdx].SQLDigest] = ""
// Step to the next entry
idx, waitChainIdx = r.nextIndexPair(idx, waitChainIdx)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can it cause index-out-of-range? nextIndexPair can return a idx which equals len(r.deadlocks).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should be broken by the for loop condition. But maybe I can add an additional check here for safety.

Copy link
Contributor

Choose a reason for hiding this comment

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

As long as you have confidence in safety, needn't add the check. 😂

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 4, 2021
cfzjywxk
cfzjywxk approved these changes Aug 4, 2021
View reviewed changes
Copy link
Contributor

@cfzjywxk cfzjywxk left a comment

Choose a reason for hiding this comment

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

/lgtm

@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 Aug 4, 2021
@youjiali1995
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1877f9f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 4, 2021
@ti-chi-bot
Copy link
Member

@MyonKeminta: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@MyonKeminta
Copy link
Contributor Author

/merge

@ti-chi-bot ti-chi-bot merged commit c3f92c2 into pingcap:master Aug 4, 2021
@MyonKeminta MyonKeminta deleted the m/deadlocks-sql-text branch August 4, 2021 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@cfzjywxk cfzjywxk cfzjywxk 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. sig/execution SIG execution sig/sql-infra SIG: SQL Infra sig/transaction SIG:Transaction size/XL Denotes a PR that changes 500-999 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.
4 participants
@MyonKeminta @ti-chi-bot @youjiali1995 @cfzjywxk