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

Merged
merged 8 commits into from
Sep 22, 2022
Merged

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

merged 8 commits into from
Sep 22, 2022

Conversation

Reminiscent
Copy link
Contributor

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 Reminiscent added type/bugfix This PR fixes a bug. sig/planner SIG: Planner labels Sep 19, 2022
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • time-and-fate
  • winoros

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 19, 2022
Reminiscent
Reminiscent commented Sep 19, 2022
View reviewed changes
planner/core/planbuilder.go Outdated
@@ -3821,13 +3821,13 @@ func (b *PlanBuilder) buildSelectPlanOfInsert(ctx context.Context, insert *ast.I
if err != nil {
return err
}
actualColLen := -1
actualColLen := insert.ColLen
Copy link
Contributor Author

@Reminiscent Reminiscent Sep 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Because the initialization value for insert.ColLen is 0. And it's impossible for the variable actualColLen's end value be zero(I guess. In code, it will be assigned to actualColLen = selectPlan.Schema().Len()). So we change the actualColLen's initiation value to 0.

qw4990
qw4990 reviewed Sep 21, 2022
View reviewed changes
planner/core/planbuilder.go Outdated
@@ -3821,13 +3821,13 @@ func (b *PlanBuilder) buildSelectPlanOfInsert(ctx context.Context, insert *ast.I
if err != nil {
return err
}
actualColLen := -1
actualColLen := insert.ColLen
Copy link
Contributor

Choose a reason for hiding this comment

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

How about adding some comments like see issue #37187 here?

@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. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-6.3 and removed do-not-merge/needs-triage-completed labels Sep 22, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 22, 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 Sep 22, 2022
@Reminiscent
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 7af05a6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 22, 2022
@ti-chi-bot ti-chi-bot merged commit d5b2c9b into pingcap:master Sep 22, 2022
@ti-srebot ti-srebot mentioned this pull request Sep 22, 2022
Merged
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 22, 2022
@Reminiscent @ti-srebot
cherry pick pingcap#37924 to release-5.3
6719529 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #38102

@ti-srebot ti-srebot mentioned this pull request Sep 22, 2022
Merged
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 22, 2022
@Reminiscent @ti-srebot
cherry pick pingcap#37924 to release-5.4
ec18707 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #38103

@ti-srebot ti-srebot mentioned this pull request Sep 22, 2022
Merged
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 22, 2022
@Reminiscent @ti-srebot
cherry pick pingcap#37924 to release-6.1
d9c7f4b 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.1 in PR #38104

@ti-srebot ti-srebot mentioned this pull request Sep 22, 2022
Closed
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 22, 2022
@Reminiscent @ti-srebot
cherry pick pingcap#37924 to release-6.3
9df1a63 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.3 in PR #38105

@sre-bot
Copy link
Contributor

sre-bot commented Sep 22, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test 🔴 failed 1, success 5, total 6 24 min Existing failure
idc-jenkins-ci/integration-cdc-test ✅ all 37 tests passed 33 min Fixed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 16 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 9 min 42 sec Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 9 min 30 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 8 min 22 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 7 min 8 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 26 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 2 min 50 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

ti-chi-bot pushed a commit that referenced this pull request Sep 23, 2022
@ti-srebot
planner: fix panic when prepare and execute the insert on duplicate (#…
f26c0d0 
…37924) (#38103)

close #37187
ti-chi-bot pushed a commit that referenced this pull request Oct 11, 2022
@ti-srebot
planner: fix panic when prepare and execute the insert on duplicate (#…
56fd9ea 
…37924) (#38104)

close #37187
ti-chi-bot pushed a commit that referenced this pull request Nov 9, 2022
@ti-srebot
planner: fix panic when prepare and execute the insert on duplicate (#…
4d1a71c 
…37924) (#38102)

close #37187
@Reminiscent
Copy link
Contributor Author

/run-cherry-picker

@ti-chi-bot ti-chi-bot mentioned this pull request Dec 12, 2022
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-5.1: #39841.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Dec 12, 2022
@Reminiscent @ti-chi-bot
This is an automated cherry-pick of pingcap#37924
cf370d3 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot added a commit that referenced this pull request Dec 12, 2022
@ti-chi-bot
planner: fix panic when prepare and execute the insert on duplicate (#…
5a7a495 
…37924) (#39841)

close #37187
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qw4990 qw4990 qw4990 left review comments

@time-and-fate time-and-fate time-and-fate approved these changes

@winoros winoros winoros approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.1 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. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Column count doesn't match value count when executing insert SQL using prepare + execute
7 participants
@Reminiscent @ti-chi-bot @ti-srebot @sre-bot @qw4990 @winoros @time-and-fate