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

planner: fix wrong cached plan in cachedPlanExec #34579

Merged
merged 9 commits into from
May 12, 2022
Merged

planner: fix wrong cached plan in cachedPlanExec #34579

merged 9 commits into from
May 12, 2022

Conversation

qw4990
Copy link
Contributor

@qw4990 qw4990 commented May 11, 2022

What problem does this PR solve?

Issue Number: close #32371

Problem Summary: planner: fix wrong cached plan in cachedPlanExec

What is changed and how it works?

planner: fix wrong cached plan in cachedPlanExec

Check List

Tests

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

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@qw4990 qw4990 added type/bugfix This PR fixes a bug. sig/planner SIG: Planner labels May 11, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 11, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Reminiscent
  • chrysan

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 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-6.0 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 11, 2022
@qw4990
Copy link
Contributor Author

qw4990 commented May 11, 2022

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented May 11, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/7c03f748c793a46b94d57e407b23fb6d27c8379b

qw4990
qw4990 commented May 12, 2022
View reviewed changes
session/session.go
@@ -2272,7 +2272,7 @@ func (s *session) cachedPlanExec(ctx context.Context,

// run ExecStmt
var resultSet sqlexec.RecordSet
switch prepared.CachedPlan.(type) {
switch execPlan.(type) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should use the new-generated plan instead of the old cached plan.

qw4990
qw4990 commented May 12, 2022
View reviewed changes
session/session.go Outdated
if err != nil {
return nil, err
}
if ok { // fallback to preparedStmtExec if we cannot get a valid point select plan in cachedPlanExec
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fallback to the general path if we cannot get a valid plan in the short path.

@qw4990 qw4990 requested review from Reminiscent and chrysan May 12, 2022 06:41
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 12, 2022
@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 12, 2022
@qw4990
Copy link
Contributor Author

qw4990 commented May 12, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 7c03f74

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 12, 2022
@ti-chi-bot ti-chi-bot merged commit cd297b9 into pingcap:master May 12, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request May 12, 2022
@qw4990 @ti-srebot
cherry pick pingcap#34579 to release-5.3
2236712 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request May 12, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #34598

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request May 12, 2022
@qw4990 @ti-srebot
cherry pick pingcap#34579 to release-5.4
5dcfe68 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request May 12, 2022
Open
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #34599

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request May 12, 2022
@qw4990 @ti-srebot
cherry pick pingcap#34579 to release-6.0
67dd4d4 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request May 12, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-6.0 in PR #34600

@sre-bot
Copy link
Contributor

sre-bot commented May 12, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 34 tests passed 27 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 11 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 7 min 57 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 7 min 37 sec Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 7 min 30 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 24 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 7 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 11 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 1 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@qw4990 qw4990 mentioned this pull request Jun 10, 2022
Closed
@tiancaiamao tiancaiamao mentioned this pull request Jul 12, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrysan chrysan chrysan approved these changes

@Reminiscent Reminiscent Reminiscent approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Plan Cache get wrong result when reuse the PointGet plan with null parameter
6 participants
@qw4990 @ti-chi-bot @sre-bot @ti-srebot @chrysan @Reminiscent