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

util/ranger: support use like to build range for new collation columns | tidb-test=pr/2247 (#48522) #50907

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #48522

What problem does this PR solve?

Issue Number: close #48181 close #49138

What is changed and how it works?

  1. For the builder in pkg/util/ranger/points.go, we provide a new parameter convertToSortKey bool. If it's true, we can build ranges for new collation columns in newBuildFromPatternLike. The user of builder should specify if it should convert the string values to the sort key or keep the original value.
    • Here we use KeyWithoutTrimRightSpace() and then +1 to calculate the end key. The KeyWithoutTrimRightSpace prevents regression compared to the existing behavior for binary collations. For other details, please see the comments.
  2. Add two functions pointsConvertToSortKey, and pointConvertToSortKey to do the conversion work.
    • Previously, the convertPoint happens before converting to the sort key. Specifically, it's called in points2Ranges, appendPoints2Ranges, and points2TableRanges, which are right after build(). Now we try to keep this logic unchanged. So we do a convertPoint inside these two functions before the conversion to the sort key.
    • To implement 2., we need to pass the newTp into the builder. Therefore I merged it with the previous Collator parameter for the build().
  3. The previous convertPoint is not removed because it's needed to handle non-string cases. In such a case, we need to make the existing convertPoint able to correctly handle the new sort key cases. Specifically, we need to use the binary collation instead of the collation of the column for the FieldType passed into convertPoint.
    • I also added a convertStringFTToBinaryCollate() to reduce some repeated code.
  4. In pkg/util/ranger/checker.go, remove the limitation that we can't use LIKE function on new collation column to build ranges.

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.

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

Please refer to Release Notes Language Style Guide to write a quality release note.

Support using Range Scan on non-binary collation columns for `LIKE` functions.

@ti-chi-bot ti-chi-bot added 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. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Feb 1, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 1, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot force-pushed the cherry-pick-48522-to-release-7.5 branch from a9dfc55 to b700bf3 Compare February 1, 2024 10:58
@ti-chi-bot ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 3, 2024
Copy link

ti-chi-bot bot commented Feb 3, 2024

PR needs rebase.

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 kubernetes/test-infra repository.

Copy link
Contributor

@AilinKid AilinKid left a comment

Choose a reason for hiding this comment

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

should this be cherry-picked?

Copy link

ti-chi-bot bot commented Feb 9, 2024

@ti-chi-bot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
idc-jenkins-ci-tidb/unit-test b700bf3 link true /test unit-test
idc-jenkins-ci-tidb/check_dev_2 b700bf3 link true /test check-dev2
idc-jenkins-ci-tidb/check_dev b700bf3 link true /test check-dev
idc-jenkins-ci-tidb/build b700bf3 link true /test build
idc-jenkins-ci-tidb/mysql-test b700bf3 link true /test mysql-test

Full PR test history. Your PR dashboard.

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 kubernetes/test-infra repository. I understand the commands that are listed here.

Copy link
Contributor

@fixdb fixdb left a comment

Choose a reason for hiding this comment

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

+1

Copy link

ti-chi-bot bot commented Feb 20, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: fixdb
Once this PR has been reviewed and has the lgtm label, please ask for approval from time-and-fate. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Feb 20, 2024
Copy link

ti-chi-bot bot commented Feb 20, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-02-20 04:02:49.827295557 +0000 UTC m=+329858.574918667: ☑️ agreed by fixdb.

@time-and-fate
Copy link
Member

Manually cherry-pick in #51164.
Closing this PR.

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. needs-1-more-lgtm Indicates a PR needs 1 more LGTM. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. 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. 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