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

executor: fix batchget overflow lock panic (#23774) #23778

Merged
merged 4 commits into from
May 8, 2021
Merged

executor: fix batchget overflow lock panic (#23774) #23778

merged 4 commits into from
May 8, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 31, 2021 •
edited
Loading

cherry-pick #23774 to release-4.0
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/23778

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

git push git@github.com:ti-srebot/tidb.git pr/23778:release-4.0-d0291c802a86

What problem does this PR solve?

Issue Number: close #23753

Problem Summary:

batch point get will lock not exist key.

overflow value be treated as "not exist key" in batch/point get, but overflow value can not build an invalid key, and it leads to NPE

What is changed and how it works?

Proposal: xxx

What's Changed, How it Works:

should not lock for overflow value's key

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

  • n/a

Release note

  • Fix batch point lock maybe panic when condition value overflow

This change is Reviewable

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Mar 31, 2021
Merged
@ti-srebot ti-srebot added sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Mar 31, 2021
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 31, 2021
@ti-srebot ti-srebot added this to the v4.0.11 milestone Mar 31, 2021
@ti-srebot
Copy link
Contributor Author

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

@jackysp
Copy link
Member

jackysp commented Apr 27, 2021

Please resolve conflicts.

@lysu lysu requested a review from zimulala April 27, 2021 06:52
@lysu
Copy link
Contributor

lysu commented Apr 27, 2021

need merge #24312 first

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 30, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 1, 2021
@lysu lysu force-pushed the release-4.0-d0291c802a86 branch from ff9a5db to 1f3403c Compare May 6, 2021 04:36
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 6, 2021
@lysu
Copy link
Contributor

lysu commented May 6, 2021

/merge

@ti-chi-bot
Copy link
Member

@lysu: /merge in this pull request requires 2 /lgtm.

In response to this:

/merge

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.

@jackysp
Copy link
Member

jackysp commented May 6, 2021

/run-unit-test

@lysu
Copy link
Contributor

lysu commented May 7, 2021

@zimulala @wjhuang2016 @jackysp PTAL this cherry-pick, thx~

@jackysp
Copy link
Member

jackysp commented May 7, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 7, 2021
@wjhuang2016
Copy link
Member

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • jackysp
  • wjhuang2016

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 7, 2021
@lysu
Copy link
Contributor

lysu commented May 7, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d94afd1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 7, 2021
@ti-chi-bot
Copy link
Member

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

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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.

@lysu
Copy link
Contributor

lysu commented May 8, 2021

/merge

1 similar comment
@lysu
Copy link
Contributor

lysu commented May 8, 2021

/merge

@ti-chi-bot ti-chi-bot merged commit b8fb03c into pingcap:release-4.0 May 8, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.11, v4.0.13 May 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@coocood coocood Awaiting requested review from coocood

@jackysp jackysp Awaiting requested review from jackysp

@wjhuang2016 wjhuang2016 Awaiting requested review from wjhuang2016

@zimulala zimulala Awaiting requested review from zimulala

Assignees

@lysu lysu

Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 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/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.13
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @jackysp @lysu @ti-chi-bot @wjhuang2016 @zimulala @zhouqiang-cl