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: make infer collation support the expressions with different charset #27863

Merged
merged 9 commits into from
Oct 11, 2021

Conversation

xiongjiwei
Copy link
Contributor

@xiongjiwei xiongjiwei commented Sep 7, 2021

What problem does this PR solve?

Problem Summary:

  • add a struct ExprCollation, it holds all the collation-related information to avoid function return to many values.
  • some tests only have collation but do not have charset, add the charset information into it.
  • add repertoire field into collationInfo, see https://dev.mysql.com/doc/refman/8.0/en/charset-repertoire.html.
  • refactor inferCollation logic, make it totally same with DTCollation::aggregate in MySQL.
  • add safeConvert after inferring collation to check if all the arguments can convert their charset to the derived charset safely

this PR changes a lot, but most of them are simply replace, reviewers should force on expression/collation.go

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 7, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tangenta
  • zimulala

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/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 7, 2021
@xiongjiwei xiongjiwei force-pushed the collation branch 3 times, most recently from d6b704a to 0d1d9ee Compare September 9, 2021 08:31
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 10, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2021
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 22, 2021
@xiongjiwei xiongjiwei force-pushed the collation branch 5 times, most recently from ae37137 to 327ccf3 Compare September 22, 2021 11:50
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Sep 23, 2021
@xiongjiwei xiongjiwei changed the title expression: Collation expression: make infer collation support infer the different charset expression Sep 23, 2021
@xiongjiwei xiongjiwei changed the title expression: make infer collation support infer the different charset expression expression: make infer collation support infer the expression with different charset Sep 23, 2021
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 23, 2021
@xiongjiwei xiongjiwei marked this pull request as ready for review September 23, 2021 07:21
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 23, 2021
expression/collation.go Outdated Show resolved Hide resolved
expression/collation.go Outdated Show resolved Hide resolved
expression/collation_test.go Outdated Show resolved Hide resolved
executor/executor_test.go Outdated Show resolved Hide resolved
Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

LGTM

@xiongjiwei xiongjiwei force-pushed the collation branch 2 times, most recently from d4833d4 to 52f1ab0 Compare October 11, 2021 03:10
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 11, 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 Oct 11, 2021
@zimulala
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: fa0c3b9

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 11, 2021
@ti-chi-bot
Copy link
Member

@xiongjiwei: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

use the original arguments to aggregate the collation if the expression is implicit cast
4 participants