executor: fix auto retry when transaction has select for update (#11714)#11718
Merged
Conversation
Contributor
Author
|
/run-all-tests |
Contributor
|
LGTM |
Contributor
Author
|
/run-all-tests |
ngaut
approved these changes
Aug 12, 2019
This file contains hidden or 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
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.
cherry-pick #11714 to release-3.0
What problem does this PR solve?
When
@@tidb_disable_txn_auto_retryis set to0, transactions will retry automatically when there are write conflicts, but when there are select for update statements, auto-retry should be prevented. A previous PR #10972 makespoint getplan supportsselect for update, but didn't setTransactionContext.ForUpdateto true, so the transaction will retry even it hasselect for updatestatements.What is changed and how it works?
extract a function
doLockKeysthat used by bothSelectLockexecutor andPointGetexecutor. In this function, setTransactionContext.ForUpdateto true.Check List
Tests
Code changes
Related changes