Skip to content

executor: reset the related session vars for both INSERT and REPLACE (#40354)#40385

Merged
ti-chi-bot merged 6 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-40354-to-release-6.1
Jan 13, 2023
Merged

executor: reset the related session vars for both INSERT and REPLACE (#40354)#40385
ti-chi-bot merged 6 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-40354-to-release-6.1

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Jan 6, 2023

This is an automated cherry-pick of #40354

What problem does this PR solve?

Issue Number: close #40351

Problem Summary:

We only reset the CurrInsertBatchExtraCols in INSERT and forgot to reset it in REPLACE. So it will cause panic in a long session.

What is changed and how it works?

Move the reset to the func ResetContextOfStmt , making sure they are always reset.

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.

Fix the case that INSERT/REPLACE might panic in a long session connection

@winoros @ti-chi-bot
This is an automated cherry-pick of pingcap#40354
a3374ba 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 6, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • MyonKeminta
  • cfzjywxk

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Jan 6, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Jan 6, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 6, 2023
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 12, 2023
@cfzjywxk
Copy link
Contributor

cfzjywxk commented Jan 12, 2023

@winoros
Please help to fix the test case for v6.1 release branch.

@winoros
Copy link
Member

winoros commented Jan 12, 2023

/retest

@cfzjywxk
Copy link
Contributor

cfzjywxk commented Jan 12, 2023

@winoros
The test build needs some fix

executor/write_test.go:4381:11: cannot initialize 1 variables with 2 values (typecheck)

	store := testkit.CreateMockStore(t)

	         ^

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 12, 2023

@cfzjywxk: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

Details

In response to this:

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
Copy link
Member Author

ti-chi-bot commented Jan 12, 2023

@MyonKeminta: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

Details

In response to this:

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 added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 12, 2023
@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 Jan 12, 2023
@cfzjywxk
Copy link
Contributor

cfzjywxk commented Jan 12, 2023

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 12, 2023

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

DetailsCommit hash: f258c18

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 12, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 13, 2023
@cfzjywxk
Copy link
Contributor

cfzjywxk commented Jan 13, 2023

/merge

@cfzjywxk
Copy link
Contributor

cfzjywxk commented Jan 13, 2023

/retest-required

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jan 13, 2023

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

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 ee7b18f into pingcap:release-6.1 Jan 13, 2023
@ti-chi-bot ti-chi-bot deleted the cherry-pick-40354-to-release-6.1 branch April 15, 2025 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cfzjywxk cfzjywxk cfzjywxk approved these changes

@MyonKeminta MyonKeminta MyonKeminta approved these changes

Assignees

@winoros winoros

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-chi-bot @cfzjywxk @winoros @MyonKeminta @VelocityLight