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: set a collation according to the arguments for ifnull in constant folding (#52119) #52124

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #52119

What problem does this PR solve?

Issue Number: close #51765

Problem Summary:

The ifnull has different behavior in inferring collation for constant folding and normal execution path.

What changed and how does it work?

Set the collation according to the first argument in the path of constant folding.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Release note

Fix the issue that the collation of `ifnull` expression is different with MySQL when constant folding applies.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: Yang Keao <yangkeao@chunibyo.icu>
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 27, 2024
@YangKeao
Copy link
Member

/retest

Copy link
Member

@YangKeao YangKeao left a comment

Choose a reason for hiding this comment

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

LGTM

tk.MustExec("insert into t values ()")
tk.MustExec(`insert into t1 values ("Hello World")`)

tk.MustQuery("select collation(ifnull(concat(NULL), '~'))").Check(testkit.Rows("utf8mb4_bin"))
Copy link
Member

Choose a reason for hiding this comment

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

The result is different from the original PR in integration test, because the connection collation of Go MySQL driver is utf8mb4_general_ci, but here it's the default value utf8mb4_bin. (For mysql cli client, it's utf8mb4_0900_ai_ci).

@ti-chi-bot ti-chi-bot bot added the lgtm label Mar 27, 2024
Copy link

ti-chi-bot bot commented Mar 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: YangKeao, zimulala

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

ti-chi-bot bot commented Mar 27, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-03-27 05:56:30.283902849 +0000 UTC m=+2047417.306149237: ☑️ agreed by YangKeao.
  • 2024-03-27 05:58:45.944568209 +0000 UTC m=+2047552.966814592: ☑️ agreed by zimulala.

Copy link

codecov bot commented Mar 27, 2024

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@9220d94). Click here to learn what that means.
The diff coverage is 100.0000%.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #52124   +/-   ##
================================================
  Coverage               ?   73.6379%           
================================================
  Files                  ?       1095           
  Lines                  ?     350925           
  Branches               ?          0           
================================================
  Hits                   ?     258414           
  Misses                 ?      75897           
  Partials               ?      16614           

@ti-chi-bot ti-chi-bot bot merged commit 137dc2f into pingcap:release-6.5 Mar 27, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants