Skip to content

execution: fix the incorrect use of cached plan for point get (#24749)#24765

Merged
ti-chi-bot merged 5 commits intopingcap:release-5.0from
ti-srebot:release-5.0-f71fbdb179f6
May 31, 2021
Merged

execution: fix the incorrect use of cached plan for point get (#24749)#24765
ti-chi-bot merged 5 commits intopingcap:release-5.0from
ti-srebot:release-5.0-f71fbdb179f6

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 19, 2021 •
edited
Loading

cherry-pick #24749 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/24765

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/24765:release-5.0-f71fbdb179f6

Signed-off-by: cfzjywxk lsswxrxr@163.com

What problem does this PR solve?

Issue Number: close #24741

Problem Summary:
The point get cached plan is used incorrectly for the in transaction prepare execution statement, which may change the transaction to invalid status unexpectedly and lead to panic or incorrect read.

What is changed and how it works?

What's Changed:
Use the autocommitTxn judge logic instead of autocommit.

How it Works:
The autocommit mode flag and the in txn flag are different. In the IsCachedExecOk logic, only autocommit primary key point get read could use the cached plan.

Related changes

Check List

Tests

  • Unit test

Side effects

Release note

  • Fix the issue point get cached plan of prepared statement is incorrectly used by in transaction point get statement.

@cfzjywxk @ti-srebot
cherry pick pingcap#24749 to release-5.0
ef22413 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

ti-srebot commented May 19, 2021

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request May 19, 2021
Merged
@ti-srebot ti-srebot added sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels May 19, 2021
@ti-chi-bot ti-chi-bot removed the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 19, 2021
@ti-srebot ti-srebot added this to the v5.0.1 milestone May 19, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented May 19, 2021

@cfzjywxk please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/tidb/invitations

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 19, 2021
jackysp
jackysp approved these changes May 19, 2021
View reviewed changes
Copy link
Contributor

@jackysp jackysp 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 the status/LGT1 Indicates that a PR has LGTM 1. label May 19, 2021
@lysu
Copy link
Contributor

lysu commented May 20, 2021

/lgtm

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 20, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • jackysp
  • lysu

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.

Details

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 May 20, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 26, 2021
@cfzjywxk
Copy link
Contributor

cfzjywxk commented May 31, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 31, 2021

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

DetailsCommit hash: a153d25

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 31, 2021
@zhouqiang-cl
Copy link
Contributor

zhouqiang-cl commented May 31, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 31, 2021

@ti-srebot: 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.

Details

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.

@ti-chi-bot ti-chi-bot merged commit d34be8a into pingcap:release-5.0 May 31, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.1, v5.0.2 Jun 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jackysp jackysp jackysp approved these changes

@ekexium ekexium Awaiting requested review from ekexium

@lysu lysu Awaiting requested review from lysu

@MyonKeminta MyonKeminta Awaiting requested review from MyonKeminta

Assignees

@cfzjywxk cfzjywxk

Labels

cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/M Denotes a PR that changes 30-99 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. type/bugfix This PR fixes a bug. type/5.0-cherry-pick

Projects

None yet

Milestone

v5.0.2

Development

Successfully merging this pull request may close these issues.

6 participants

@ti-srebot @lysu @ti-chi-bot @cfzjywxk @zhouqiang-cl @jackysp