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.

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

planner/core: fix the 'for update' condition for the point get query #11771

Merged
merged 5 commits into from
Aug 19, 2019

Conversation

tiancaiamao
Copy link
Contributor

@tiancaiamao tiancaiamao commented Aug 19, 2019

What problem does this PR solve?

Fix bug introduced in #11715

Sometimes, InTxn() is not precise, so we should check both InTxn() and autocommit

// We should set the 'for update' flag in this case.
set @@auto_commit = 0;
select * from t where id = 6 for update;  // This is not InTxn() when the planner run here, because it's still in the plan phase.

What is changed and how it works?

The check condition is changed from InTxn() to IsAutocommit() || InTxn()

Check List

Tests

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

Related changes

  • Need to cherry-pick to the release branch

@tiancaiamao tiancaiamao added type/bugfix This PR fixes a bug. sig/planner SIG: Planner labels Aug 19, 2019
@codecov
Copy link

codecov bot commented Aug 19, 2019

Codecov Report

Merging #11771 into master will decrease coverage by 0.0212%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##            master     #11771        +/-   ##
===============================================
- Coverage   81.478%   81.4567%   -0.0213%     
===============================================
  Files          434        434                
  Lines        93381      93274       -107     
===============================================
- Hits         76085      75978       -107     
- Misses       11858      11869        +11     
+ Partials      5438       5427        -11

@codecov
Copy link

codecov bot commented Aug 19, 2019

Codecov Report

Merging #11771 into master will decrease coverage by 0.2305%.
The diff coverage is 100%.

@@               Coverage Diff                @@
##             master     #11771        +/-   ##
================================================
- Coverage   81.6663%   81.4358%   -0.2306%     
================================================
  Files           435        434         -1     
  Lines         93964      93368       -596     
================================================
- Hits          76737      76035       -702     
- Misses        11789      11891       +102     
- Partials       5438       5442         +4

Copy link
Member

@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

@jackysp jackysp added status/LGT1 Indicates that a PR has LGTM 1. needs-cherry-pick-3.0 labels Aug 19, 2019
@coocood
Copy link
Member

coocood commented Aug 19, 2019

LGTM

@coocood coocood added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 19, 2019
@coocood coocood added the status/can-merge Indicates a PR has been approved by a committer. label Aug 19, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Aug 19, 2019

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Aug 19, 2019

cherry pick to release-3.0 in PR #11775

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/planner SIG: Planner 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants