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

function result name should contain collator info (#2808) #3018

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #2808

What problem does this PR solve?

Issue Number: close #2793

Problem Summary:
As the issue described.

What is changed and how it works?

Proposal: xxx

What's Changed:

The root cause is, the join other condition of query is
eq(test.t1.col_varchar_20_key_signed, test.t2.col_char_20_key_signed) with ci collator
and
not(in(test.t1.col_varchar_20_key_signed, test.t1.col_varbinary_20_key_signed, test.t1.col_varbinary_20_undef_signed, test.t2.col_varchar_20_undef_signed, test.t2.col_char_20_key_signed)) with bin collator

And for patterns like col in (col_1, col_2), since TiFlash does not support this directly, it will be rewritten to col = col_1 or col = col_2, so in TiFlash, the join other condition is actually:
eq(test.t1.col_varchar_20_key_signed, test.t2.col_char_20_key_signed) with ci collator
and
not (eq(test.t1.col_varchar_20_key_signed, test.t1.col_varbinary_20_key_signed) with bin collator or eq(test.t1.col_varchar_20_key_signed, test.t1.col_varbinary_20_undef_signed) with bin collator or eq(test.t1.col_varchar_20_key_signed, test.t2.col_varchar_20_undef_signed) with bin collator or eq(test.t1.col_varchar_20_key_signed, test.t2.col_char_20_key_signed) with bin collator))

And in TiFlash, if a function is already calucated, it will try to reuse the result to avoid redundancy calculation, and the result name for a function is generated by genFuncString, it just concat the function name and all its arguments' name, for eq(test.t1.col_varchar_20_key_signed, test.t2.col_char_20_key_signed) with ci collator and eq(test.t1.col_varchar_20_key_signed, test.t2.col_char_20_key_signed) with bin collator, they will have the same result name, so only one of them will be executed, and the other will result the result, this will clearly cause a collation related bug.

This pr add collation related info in genFuncString

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch:

Check List

Tests

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

Side effects

Release note

Please add a release note, or a 'None' if it is not needed.

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Sep 6, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • windtalker

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-4.0 labels Sep 6, 2021
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 6, 2021
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 6, 2021
Copy link
Contributor

@windtalker windtalker 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 6, 2021
@JaySon-Huang JaySon-Huang added this to the v4.0.15 milestone Sep 8, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Sep 13, 2021
Copy link
Contributor

@ilovesoup ilovesoup left a comment

Choose a reason for hiding this comment

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

lgtm

@JaySon-Huang
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@JaySon-Huang: 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 Author

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

Commit hash: d5ba8cb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 13, 2021
@JaySon-Huang
Copy link
Contributor

/run-all-tests

@JaySon-Huang
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@JaySon-Huang: 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.

@JaySon-Huang
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@JaySon-Huang: 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.

@JaySon-Huang
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot merged commit ed1fecd into pingcap:release-4.0 Sep 13, 2021
@JaySon-Huang JaySon-Huang deleted the cherry-pick-2808-to-release-4.0 branch September 13, 2021 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-4.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants