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 panic when prepare and execute the insert on duplicate (#37924) #38104

Merged
merged 5 commits into from
Oct 11, 2022
Merged

planner: fix panic when prepare and execute the insert on duplicate (#37924) #38104

merged 5 commits into from
Oct 11, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Sep 22, 2022 •
edited
Loading

cherry-pick #37924 to release-6.1
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/38104

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

git push git@github.com:ti-srebot/tidb.git pr/38104:release-6.1-d5b2c9b17d44

What problem does this PR solve?

Issue Number: close #37187

Problem Summary:
The prepare and execute statements both will build the plan. But some code path in planBuilder have some assumptions about they only execute once.

What is changed and how it works?

  1. Record the actualColLen in last.InsertStmt for reusing.
  2. Initlizate the actualColLen to 0 not 1. Because it's safe and easy to handle.

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

@Reminiscent @ti-srebot
cherry pick pingcap#37924 to release-6.1
d9c7f4b 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 22, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • fixdb
  • qw4990

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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Sep 22, 2022
@ti-srebot ti-srebot mentioned this pull request Sep 22, 2022
Merged
12 tasks
@ti-srebot ti-srebot added sig/planner SIG: Planner size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/6.1-cherry-pick type/bugfix This PR fixes a bug. labels Sep 22, 2022
@ti-srebot ti-srebot added this to the v6.1.1 milestone Sep 22, 2022
@ti-srebot
Copy link
Contributor Author

@Reminiscent you're already a collaborator in bot's repo.

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Oct 2, 2022
fixdb
fixdb approved these changes Oct 8, 2022
View reviewed changes
Copy link
Contributor

@fixdb fixdb left a comment

Choose a reason for hiding this comment

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

+1

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 8, 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 Oct 8, 2022
@AilinKid
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 5d46f34

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 11, 2022
@ti-chi-bot ti-chi-bot merged commit 56fd9ea into pingcap:release-6.1 Oct 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qw4990 qw4990 qw4990 approved these changes

@fixdb fixdb fixdb approved these changes

@time-and-fate time-and-fate Awaiting requested review from time-and-fate

@winoros winoros Awaiting requested review from winoros

Assignees

@Reminiscent Reminiscent

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner size/S Denotes a PR that changes 10-29 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/6.1-cherry-pick
Projects
None yet
Milestone
v6.1.1
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @ti-chi-bot @AilinKid @fixdb @qw4990 @VelocityLight @Reminiscent