Skip to content

*: fix incorrect results about string cmp with collation#5429

Merged
ti-chi-bot merged 3 commits intopingcap:masterfrom
solotzg:fix-5366
Jul 20, 2022
Merged

*: fix incorrect results about string cmp with collation#5429
ti-chi-bot merged 3 commits intopingcap:masterfrom
solotzg:fix-5366

Conversation

@solotzg
Copy link
Contributor

@solotzg solotzg commented Jul 20, 2022

What problem does this PR solve?

Issue Number: close #5366

Problem Summary:

What is changed and 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 the issue of incorrect results when comparing string with collation

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 20, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • windtalker
  • zanmato1984

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.

Details

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 20, 2022
@solotzg solotzg added the type/bugfix This PR fixes a bug. label Jul 20, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Jul 20, 2022

/run-all-tests

windtalker
windtalker approved these changes Jul 20, 2022
View reviewed changes
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 Jul 20, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Jul 20, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
ColumnString.cpp                  140                60    57.14%          16                 7    56.25%         261               123    52.87%          82                39    52.44%
ColumnString.h                     77                28    63.64%          33                11    66.67%         191                96    49.74%          30                13    56.67%
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             217                88    59.45%          49                18    63.27%         452               219    51.55%         112                52    53.57%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18507      9567             48.31%    208741  96331        53.85%

full coverage report (for internal network access only)

@solotzg
Copy link
Contributor Author

solotzg commented Jul 20, 2022

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Jul 20, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
ColumnString.cpp                  140                59    57.86%          16                 7    56.25%         261               118    54.79%          82                38    53.66%
ColumnString.h                     77                25    67.53%          33                 9    72.73%         191                73    61.78%          30                12    60.00%
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             217                84    61.29%          49                16    67.35%         452               191    57.74%         112                50    55.36%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18631      9392             49.59%    212498  94890        55.35%

full coverage report (for internal network access only)

zanmato1984
zanmato1984 approved these changes Jul 20, 2022
View reviewed changes
Copy link
Contributor

@zanmato1984 zanmato1984 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 20, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Jul 20, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 20, 2022

@solotzg: 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.

Details

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

ti-chi-bot commented Jul 20, 2022

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

DetailsCommit hash: 3532aa6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 20, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Jul 20, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
ColumnString.cpp                  140                59    57.86%          16                 7    56.25%         261               118    54.79%          82                38    53.66%
ColumnString.h                     77                25    67.53%          33                 9    72.73%         191                73    61.78%          30                12    60.00%
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             217                84    61.29%          49                16    67.35%         452               191    57.74%         112                50    55.36%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18631      9393             49.58%    212498  94926        55.33%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit f99b74c into pingcap:master Jul 20, 2022
@solotzg solotzg deleted the fix-5366 branch July 21, 2022 02:12
solotzg added a commit to solotzg/tiflash that referenced this pull request Sep 19, 2022
@solotzg
Revert "*: fix incorrect results about string cmp with collation (pin…
66313b1 
…gcap#5429)"

This reverts commit f99b74c.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zanmato1984 zanmato1984 zanmato1984 approved these changes

@windtalker windtalker windtalker approved these changes

Assignees

No one assigned

Labels

release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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/bugfix This PR fixes a bug.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Wrong behavior when handle strcmp with default collation

5 participants

@solotzg @ti-chi-bot @sre-bot @zanmato1984 @windtalker