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

expression: support handle two collation cannot substituted to each other (#19036) #22582

Merged
merged 8 commits into from
Jan 28, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jan 27, 2021

cherry-pick #19036 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/22582

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

git push git@github.com:ti-srebot/tidb.git pr/22582:release-4.0-8bbeceb5ee42

What problem does this PR solve?

current collation strictness cannot handle situation if two collation cannot substituted to each other
e.g. a != b in collation A, a=b in collation B and c=d in collation A, c!=d in collation B

What is changed and how it works?

group collation by strictness, two collation can be substituted each other if they are in same group.
store strictnessship in a map with group id, collation group id in value is stricter than collation group id in key

Release note

  • refine CollationStrictness to support incompatible strictnessship

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

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

Copy link
Contributor

@qw4990 qw4990 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 Jan 28, 2021
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

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 28, 2021
@xiongjiwei
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 28, 2021
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@xiongjiwei
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@xiongjiwei
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@bb7133
Copy link
Member

bb7133 commented Jan 28, 2021

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@xiongjiwei
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@xiongjiwei
Copy link
Contributor

/merge

@bb7133
Copy link
Member

bb7133 commented Jan 28, 2021

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

/run-all-tests

1 similar comment
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@xiongjiwei
Copy link
Contributor

/run-mybatis-test

@xiongjiwei
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@xiongjiwei
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@bb7133
Copy link
Member

bb7133 commented Jan 28, 2021

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@qw4990
Copy link
Contributor

qw4990 commented Jan 28, 2021

/run-unit-test

@qw4990
Copy link
Contributor

qw4990 commented Jan 28, 2021

/run-all-tests

@qw4990 qw4990 merged commit 9715e5c into pingcap:release-4.0 Jan 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression contribution This PR is from a community contributor. sig/sql-infra SIG: SQL Infra status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants