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: Fix wrong charset and collation for case when function #26663

Merged
merged 9 commits into from
Jul 27, 2021

Conversation

wshwsh12
Copy link
Contributor

@wshwsh12 wshwsh12 commented Jul 27, 2021

What problem does this PR solve?

Issue Number: close #26662

Problem Summary:

Wrong collation will lead expression.ColumnSubstitute can't generate newFilter for LogicalProjection in ppdSolver.
Because there is a collation check in ColumnSubstitute.

tidb/expression/util.go

Lines 234 to 245 in b073d6b

if collate.NewCollationEnabled() {
// Make sure the collation used by the ScalarFunction isn't changed and its result collation is not weaker than the collation used by the ScalarFunction.
if changed {
changed = false
tmpArgs := make([]Expression, 0, len(v.GetArgs()))
_ = append(append(append(tmpArgs, refExprArr.Result()[0:idx]...), refExprArr.Result()[idx+1:]...), newFuncExpr)
_, newColl := DeriveCollationFromExprs(v.GetCtx(), append(v.GetArgs(), newFuncExpr)...)
if coll == newColl {
changed = checkCollationStrictness(coll, newFuncExpr.GetType().Collate)
}
}
}

What is changed and how it works?

What's Changed:
Use function DeriveCollationFromExprs to get collation for caseWhen function

How it Works:

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

Fix wrong charset and collation for case when function

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 27, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • bb7133

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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 27, 2021
@sre-bot
Copy link
Contributor

sre-bot commented Jul 27, 2021

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what's changed

Or if the count of mainly changed packages are more than 3, use

  • *: what's changed

@wshwsh12 wshwsh12 changed the title Fix wrong charset and collation for case when function expresssion: Fix wrong charset and collation for case when function Jul 27, 2021
@wshwsh12 wshwsh12 changed the title expresssion: Fix wrong charset and collation for case when function expression: Fix wrong charset and collation for case when function Jul 27, 2021
@wshwsh12
Copy link
Contributor Author

/run-integration-tests

@wshwsh12
Copy link
Contributor Author

/run-integration-tests

@wshwsh12
Copy link
Contributor Author

/run-integration-tests

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 27, 2021
Copy link
Contributor

@XuHuaiyu XuHuaiyu left a comment

Choose a reason for hiding this comment

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

LGTM

expression/builtin_control.go Show resolved Hide resolved
@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 Jul 27, 2021
@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 5a4bf46

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 27, 2021
@ichn-hu ichn-hu mentioned this pull request Jul 27, 2021
@wshwsh12
Copy link
Contributor Author

/rebuild

@ti-chi-bot ti-chi-bot merged commit 6421cec into pingcap:master Jul 27, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 27, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #26671

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 27, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #26672

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 27, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #26673

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 release-note size/S Denotes a PR that changes 10-29 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/bug-fix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't find column using case when function with union.
7 participants