txn: Add lock resolving to data_lock_waits #33993
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
ti-chi-bot
added
do-not-merge/needs-linked-issue
release-note-none
longfangsong
force-pushed
the
lock_waits_optimisic
branch
from
61095ae
to
114b022
Compare
ti-chi-bot
added
needs-rebase
ti-chi-bot
removed
the
do-not-merge/work-in-progress
longfangsong
force-pushed
the
lock_waits_optimisic
branch
from
32c69f2
to
f8b6d88
Compare
cfzjywxk
reviewed
May 13, 2022
| @@ -2420,7 +2445,43 @@ func (r *dataLockWaitsTableRetriever) retrieve(ctx context.Context, sctx session | |||
|
|
|||
| res = append(res, row) | |||
| } | |||
| for _, resolving := range r.resolvingLocks[resolvingStart:resolvingEnd] { | |||
There was a problem hiding this comment.
Better to add a test case to cover the optimistic lock situation.
ekexium
reviewed
May 19, 2022
executor/infoschema_reader.go
Outdated
| @@ -2354,6 +2358,9 @@ func (r *dataLockWaitsTableRetriever) retrieve(ctx context.Context, sctx session | |||
| digests[i] = hex.EncodeToString(digest) | |||
| } | |||
| } | |||
| // note: for resolving locks, it's not possible or necessary to calculate | |||
There was a problem hiding this comment.
Dumb question: if it's an auto-commit statement, how shall we know what SQL it is?
There was a problem hiding this comment.
We can always join with tidb_trx on start_ts to get all sql executed in one transaction.
longfangsong
force-pushed
the
lock_waits_optimisic
branch
from
f8b6d88
to
04cca20
Compare
ti-chi-bot
added
size/M
|
Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/043b158bfe471282aed8bcaad844903cb868a855 |
cfzjywxk
approved these changes
May 27, 2022
ekexium
approved these changes
May 27, 2022
ti-chi-bot
added
status/LGT2
|
@longfangsong |
Co-authored-by: ekexium <[email protected]>
Co-authored-by: cfzjywxk <[email protected]>
ti-chi-bot
removed
the
needs-rebase
|
/merge |
|
This pull request has been accepted and is ready to merge. Commit hash: 243e056
|
ti-chi-bot
added
the
status/can-merge
TiDB MergeCI notify
|
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: close #34609
Problem Summary:
What is changed and how it works?
Add optimisitc transaction's lock wait infomation by tracking lock resolving.
Check List
Tests
Side effects
Documentation
Release note
Please refer to Release Notes Language Style Guide to write a quality release note.
⚠️ ：DNM before we merge client-go#473 first