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 index join panic on prefix index on some cases (#24568) #24824

Merged
merged 8 commits into from
Jun 1, 2021
Merged

executor: fix index join panic on prefix index on some cases (#24568) #24824

merged 8 commits into from
Jun 1, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 21, 2021 •
edited
Loading

cherry-pick #24568 to release-5.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/24824

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

git push [email protected]:ti-srebot/tidb.git pr/24824:release-5.0-032d34c7508c

Signed-off-by: lzmhhh123 [email protected]

What problem does this PR solve?

Issue Number: close #24547, close #24716, close #24717

What is changed and how it works?

What's Changed:

How it Works:

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Release note

  • fix index join panic on prefix index on some cases

@ti-srebot ti-srebot requested a review from a team as a code owner May 21, 2021 08:10
@ti-srebot ti-srebot requested review from XuHuaiyu and removed request for a team May 21, 2021 08:10
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added the sig/execution SIG execution label May 21, 2021
@ti-srebot ti-srebot mentioned this pull request May 21, 2021
Merged
@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels May 21, 2021
@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 May 21, 2021
@ti-srebot ti-srebot added this to the v5.0.1 milestone May 21, 2021
@ti-srebot
Copy link
Contributor Author

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

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 26, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@zhouqiang-cl: /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.

@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@zhouqiang-cl: /merge in this pull request requires 2 approval(s).

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.

@lysu
Copy link
Contributor

lysu commented May 31, 2021

/lgtm

@ti-chi-bot
Copy link
Member

@lysu: Please use GitHub review feature instead of /lgtm [cancel] when you want to submit review to the pull request.
For how to use GitHub review feature, see also this document provided by GitHub.

For the reason we drop support to the commands, see also this page.
This reply is being used as a temporary reply during the migration of review process and will be removed on July 1st.

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 31, 2021

@qw4990 PTAL maybe we need it in next release

@lysu lysu mentioned this pull request May 31, 2021
Closed
@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 Jun 1, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 1, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • qw4990
  • wshwsh12

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 1, 2021
@wshwsh12
Copy link
Contributor

wshwsh12 commented Jun 1, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: b2b0439

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 1, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

1 similar comment
@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 d5f238f into pingcap:release-5.0 Jun 1, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.1, v5.0.2 Jun 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wshwsh12 wshwsh12 wshwsh12 approved these changes

@qw4990 qw4990 qw4990 approved these changes

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

@cfzjywxk cfzjywxk Awaiting requested review from cfzjywxk

@lysu lysu Awaiting requested review from lysu

@tangenta tangenta Awaiting requested review from tangenta

Assignees

@lzmhhh123 lzmhhh123

Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution 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/5.0-cherry-pick
Projects
None yet
Milestone
v5.0.2
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @zhouqiang-cl @ti-chi-bot @lysu @wshwsh12 @qw4990 @lzmhhh123