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

*: fix a bug that collation is not handle for text type #23045

Merged
merged 13 commits into from
Mar 3, 2021
Merged

*: fix a bug that collation is not handle for text type #23045

merged 13 commits into from
Mar 3, 2021

Conversation

wjhuang2016
Copy link
Member

What problem does this PR solve?

Issue Number: close #23032

Problem Summary:
Need to handle collation for text type.

What is changed and how it works?

Take blob as string. Use the collation to distinguish text from the real blob.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

Release note

  • fix a bug that collation is not handle for text type

@wjhuang2016
done
bc47481 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
done
d1930b3 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016 wjhuang2016 requested a review from a team as a code owner March 2, 2021 06:21
@wjhuang2016 wjhuang2016 requested review from XuHuaiyu and removed request for a team March 2, 2021 06:21
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 2, 2021
@wjhuang2016
fix
03181e4 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@ti-chi-bot
Copy link
Member

@AilinKid: Please use /LGTM instead of LGTM when you want to approve the pull request by comment.
If you use the GitHub review feature, please approve the PR directly, the comment will not take effect in the GitHub review feature.
If you have any qustions please refer to lgtm command help or lgtm plugin design.

If you have approved this PR, please ignore this reply. This reply is being used as a temporary reply during the migration of the new bot and will be removed on April 1.

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.

AilinKid
AilinKid reviewed Mar 3, 2021
View reviewed changes
Copy link
Contributor

@AilinKid AilinKid left a comment

Choose a reason for hiding this comment

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

LGTM

@AilinKid
Copy link
Contributor

AilinKid commented Mar 3, 2021

/LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 3, 2021
@ichn-hu ichn-hu mentioned this pull request Mar 3, 2021
Closed
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AilinKid
  • winoros

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 Mar 3, 2021
@wjhuang2016
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

@wjhuang2016: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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

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

Commit hash: 03181e4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 3, 2021
@ti-chi-bot ti-chi-bot merged commit 6f250b6 into pingcap:master Mar 3, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 3, 2021
@wjhuang2016 @ti-srebot
cherry pick pingcap#23045 to release-4.0
90c2ed4 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 3, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #23092

@xiongjiwei xiongjiwei mentioned this pull request Mar 8, 2021
Closed
ti-chi-bot pushed a commit that referenced this pull request Mar 12, 2021
@ti-srebot
*: fix a bug that collation is not handle for text type (#23045) (#23092
8b9ed63 
)
@wjhuang2016 wjhuang2016 mentioned this pull request Mar 31, 2021
Merged
This was referenced Mar 31, 2021
Merged
Merged
@wjhuang2016 wjhuang2016 deleted the fix_text 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

@AilinKid AilinKid AilinKid left review comments

@winoros winoros winoros approved these changes

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

Assignees
No one assigned
Labels
component/expression sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/M Denotes a PR that changes 30-99 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

inner join result is incorrect when new collation is enable
5 participants
@wjhuang2016 @ti-chi-bot @AilinKid @ti-srebot @winoros