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

planner: make index-hash-join and index-merge-join consider collation #21201

Merged
merged 5 commits into from
Nov 23, 2020
Merged

planner: make index-hash-join and index-merge-join consider collation #21201

merged 5 commits into from
Nov 23, 2020

Conversation

wjhuang2016
Copy link
Member

Signed-off-by: wjhuang2016 huangwenjun1997@gmail.com

What problem does this PR solve?

Issue Number: close #20723

Problem Summary:
We didn't correct the collation for index-hash-join and index-merge-join.

What is changed and how it works?

Set all the collations to the result collation.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

Release note

  • Fix a bug that index-hash-join and index-merge-join doesn't consider collation

@wjhuang2016
done
c1efdd4 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016 wjhuang2016 requested review from a team as code owners November 23, 2020 06:08
@wjhuang2016 wjhuang2016 requested review from SunRunAway and removed request for a team November 23, 2020 06:08
@wjhuang2016
fix
1d0071a 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
lzmhhh123
lzmhhh123 reviewed Nov 23, 2020
View reviewed changes
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.

Rest LGTM

planner/core/exhaust_physical_plans.go Outdated Show resolved Hide resolved
@wjhuang2016
address comment
4f4466c 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
clean
85cc3c1 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
lzmhhh123
lzmhhh123 reviewed Nov 23, 2020
View reviewed changes
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

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 23, 2020
winoros
winoros reviewed Nov 23, 2020
View reviewed changes
Copy link
Member

@winoros winoros 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-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Nov 23, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Nov 23, 2020
@winoros
Copy link
Member

winoros commented Nov 23, 2020

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 21117

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 23, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit e6d7e7b into pingcap:master Nov 23, 2020
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Nov 23, 2020
@wjhuang2016 @ti-srebot
cherry pick pingcap#21201 to release-4.0
f2e6198 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Nov 23, 2020
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #21219

SunRunAway pushed a commit that referenced this pull request Nov 26, 2020
@ti-srebot
planner: make index-hash-join and index-merge-join consider collation (…
62f5dce 
…#21201) (#21219)
@lysu lysu mentioned this pull request May 25, 2021
Merged
@wjhuang2016 wjhuang2016 deleted the fix_join_coll branch November 17, 2022 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@winoros winoros winoros left review comments

@lzmhhh123 lzmhhh123 lzmhhh123 left review comments

@ti-srebot ti-srebot ti-srebot approved these changes

@SunRunAway SunRunAway Awaiting requested review from SunRunAway

Assignees
No one assigned
Labels
component/expression 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

join return wrong results when new collation enabled
4 participants
@wjhuang2016 @winoros @ti-srebot @lzmhhh123