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) #29217

Merged
merged 5 commits into from
Nov 24, 2021
Merged

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

merged 5 commits into from
Nov 24, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Oct 28, 2021 •
edited by tiancaiamao
Loading

cherry-pick #24568 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/29217

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

git push git@github.com:ti-srebot/tidb.git pr/29217:release-4.0-032d34c7508c

Signed-off-by: lzmhhh123 lzmhhh123@gmail.com

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-chi-bot
Copy link
Member

ti-chi-bot commented Oct 28, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • tangenta

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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 28, 2021
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Oct 28, 2021
Merged
@ti-srebot ti-srebot added sig/execution SIG execution size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/4.0-cherry-pick type/bug-fix This PR fixes a bug. labels Oct 28, 2021
@ti-srebot
Copy link
Contributor Author

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

@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 Oct 28, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 19, 2021
@tiancaiamao
Copy link
Contributor

/run-check_dev

@lzmhhh123
fix fmt
400fc82 
Signed-off-by: lzmhhh123 <lzmhhh123@gmail.com>
@lzmhhh123
fix test
8a89e67 
Signed-off-by: lzmhhh123 <lzmhhh123@gmail.com>
@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 Nov 22, 2021
@lzmhhh123 lzmhhh123 removed the request for review from tangenta November 22, 2021 14:22
@lzmhhh123
Copy link
Contributor

/cc @tangenta @XuHuaiyu

@lzmhhh123
Copy link
Contributor

/cc @tangenta @XuHuaiyu

XuHuaiyu
XuHuaiyu approved these changes Nov 24, 2021
View reviewed changes
Copy link
Contributor

@XuHuaiyu XuHuaiyu left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 24, 2021
@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 Nov 24, 2021
@tiancaiamao
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 8a89e67

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 24, 2021
@tiancaiamao tiancaiamao removed the request for review from qw4990 November 24, 2021 11:52
@tiancaiamao
Copy link
Contributor

/merge

@ti-chi-bot ti-chi-bot added release-note and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 24, 2021
@tiancaiamao
Copy link
Contributor

/merge

@ti-chi-bot ti-chi-bot merged commit 421d819 into pingcap:release-4.0 Nov 24, 2021
@tiancaiamao tiancaiamao deleted the release-4.0-032d34c7508c branch November 24, 2021 12:36
@zhouqiang-cl zhouqiang-cl added this to the v4.0.16 milestone Dec 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@tangenta tangenta tangenta approved these changes

Assignees

@lzmhhh123 lzmhhh123

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note 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/bug-fix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.16
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @ti-chi-bot @tiancaiamao @lzmhhh123 @XuHuaiyu @tangenta @zhouqiang-cl