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

planner: fix panic of merge join for tables with redundant indexes (#15840) #15920

Merged
merged 4 commits into from
Apr 1, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Mar 31, 2020

cherry-pick #15840 to release-3.1


What problem does this PR solve?

Issue Number: close #15813

Problem Summary:
MergeJoin for tables with redundant index would panic.

What is changed and how it works?

Proposal: xxx

What's Changed:
Use length of de-duplicated conditions instead of original length for declaring slice in moveEqualToOtherConditions.

How it Works:

Avoid the capacity of slice to be out of bound.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

N/A

Release note

@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 31, 2020

/run-all-tests

Copy link
Contributor

@lzmhhh123 lzmhhh123 left a comment

Choose a reason for hiding this comment

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

LGTM

@lzmhhh123 lzmhhh123 added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 1, 2020
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

@eurekaka
Copy link
Contributor

eurekaka commented Apr 1, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 1, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 1, 2020

Your auto merge job has been accepted, waiting for 15916, 15969

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 1, 2020

/run-all-tests

@sre-bot sre-bot merged commit 5854181 into pingcap:release-3.1 Apr 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/planner SIG: Planner status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug. type/3.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants