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.

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

executor: skip lock key if lock key is empty (#23188) #24312

Merged
merged 2 commits into from
Apr 30, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 27, 2021

cherry-pick #23188 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/24312

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

git push git@github.com:ti-srebot/tidb.git pr/24312:release-4.0-bdfcaf883e62

Signed-off-by: lysu sulifx@gmail.com

What problem does this PR solve?

Issue Number: close #23179

Problem Summary:

e.idxKey may be nil

err = e.lockKeyIfNeeded(ctx, e.idxKey)

when query condition overflow column's define bound

return nil, kv.ErrNotExist

then cause panic that described in issue

What is changed and how it works?

Proposal: xxx

What's Changed, How it Works:

add nil check for lockKeyIfNeeded

Related changes

  • n/a

Check List

Tests

  • Unit test

Side effects

  • n/a

Release note

  • n/a

This change is Reviewable

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/execution SIG execution sig/sql-infra SIG: SQL Infra sig/transaction SIG:Transaction size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Apr 27, 2021
@ti-srebot ti-srebot added this to the v4.0.13 milestone Apr 27, 2021
@ti-srebot
Copy link
Contributor Author

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

@lysu lysu requested a review from cfzjywxk April 27, 2021 07:37
@coocood
Copy link
Member

coocood commented Apr 27, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 27, 2021
@lysu
Copy link
Contributor

lysu commented Apr 27, 2021

/run-mybatis-test

@jackysp
Copy link
Member

jackysp commented Apr 27, 2021

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • coocood
  • jackysp

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

lysu commented Apr 27, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: bc1cce4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 27, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 30, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@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.

@ti-chi-bot ti-chi-bot merged commit ae80ec2 into pingcap:release-4.0 Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution sig/sql-infra SIG: SQL Infra sig/transaction SIG:Transaction 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/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants