Skip to content

collation: fix wrong compare result for unicode collate (#18785)#18790

Merged
ti-chi-bot[bot] merged 3 commits intotikv:release-7.5from
ti-chi-bot:cherry-pick-18785-to-release-7.5
Aug 8, 2025
Merged

collation: fix wrong compare result for unicode collate (#18785)#18790
ti-chi-bot[bot] merged 3 commits intotikv:release-7.5from
ti-chi-bot:cherry-pick-18785-to-release-7.5

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #18785

What is changed and how it works?

Issue Number: Close #18784

What's Changed:

Follow tidb code, see https://github.com/pingcap/tidb/blob/2a522358ceb60095eea898503682595dd3612492/pkg/util/collate/ucaimpl/unicode_ci.go.tpl#L50 to get more informations.

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

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

Release note

None

Signed-off-by: mohangjie <mohangjie1995@gmail.com>
Signed-off-by: mohangjie <mohangjie1995@gmail.com>

update

Signed-off-by: mohangjie <mohangjie1995@gmail.com>
@ti-chi-bot ti-chi-bot added contribution This PR is from a community contributor. dco-signoff: yes Indicates the PR's author has signed the dco. needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Aug 5, 2025
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Aug 6, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: breezewish, wjhuang2016

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

The pull request process is described here

Details 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

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 6, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 6, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-08-06 02:01:19.896603929 +0000 UTC m=+406390.039365094: ☑️ agreed by breezewish.
  • 2025-08-06 08:27:48.879627053 +0000 UTC m=+429579.022388218: ☑️ agreed by wjhuang2016.

@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Aug 6, 2025
@Defined2014
Copy link
Contributor

/retest

@ti-chi-bot ti-chi-bot bot added dco-signoff: no Indicates the PR's author has not signed dco. and removed dco-signoff: yes Indicates the PR's author has signed the dco. labels Aug 7, 2025
Signed-off-by: mohangjie <mohangjie1995@gmail.com>
@Defined2014 Defined2014 force-pushed the cherry-pick-18785-to-release-7.5 branch from 4f6642a to 12f2fa2 Compare August 7, 2025 13:06
@ti-chi-bot ti-chi-bot bot added dco-signoff: yes Indicates the PR's author has signed the dco. and removed dco-signoff: no Indicates the PR's author has not signed dco. labels Aug 7, 2025
@Defined2014
Copy link
Contributor

/retest

@ti-chi-bot ti-chi-bot bot merged commit efe98e6 into tikv:release-7.5 Aug 8, 2025
4 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-18785-to-release-7.5 branch August 8, 2025 01:59
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. contribution This PR is from a community contributor. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants