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.

Sign up for GitHub

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

Jump to bottom

expression: make count distinct multi column aware of new collation #27111

Merged
merged 3 commits into from
Aug 13, 2021
Merged

expression: make count distinct multi column aware of new collation #27111

merged 3 commits into from
Aug 13, 2021

Conversation

windtalker
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #27091

Problem Summary:

As the issue described.

What is changed and how it works?

Proposal: xxx

What's Changed:

How it Works:

Use the collation info when calling UpdatePartialResult in countOriginalWithDistinct and approxCountDistinctOriginal

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 bug that count disctinct on multi-columns return wrong result when new collation is on.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 11, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • qw4990
  • wjhuang2016

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 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 Aug 11, 2021
@sre-bot
Copy link
Contributor

sre-bot commented Aug 11, 2021

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

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

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@windtalker windtalker changed the title make count distinct multi column aware of new collation expression: make count distinct multi column aware of new collation Aug 11, 2021
@windtalker windtalker force-pushed the count_distinct_multi_column branch 2 times, most recently from 5f7e6ce to 44f0be7 Compare August 13, 2021 01:28
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 13, 2021
wjhuang2016
wjhuang2016 reviewed Aug 13, 2021
View reviewed changes
executor/aggfuncs/func_count_distinct.go Outdated
@@ -401,6 +405,7 @@ func evalAndEncode(
if err != nil || isNull {
break
}
val = string(collator.Key(val))
encodedBytes = codec.EncodeCompactBytes(encodedBytes, hack.Slice(val))
Copy link
Member

Choose a reason for hiding this comment

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

codec.EncodeCompactBytes(encodedBytes, collator.Key(val))

Copy link
Member

Choose a reason for hiding this comment

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

No need to bytes -> string -> bytes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, updated.

@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 Aug 13, 2021
@wjhuang2016
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: ef37727

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 13, 2021
@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.2

@ti-chi-bot
Copy link
Member

@windtalker: The label(s) needs-cherry-pick-5.2 cannot be applied. These labels are supported: CHANGELOG, challenge-program, compatibility-breaker, contribution, correctness, first-time-contributor, good-first-issue, hacktoberfest, high-performance, hptc, need-more-info, needs-cherry-pick-3.0, needs-cherry-pick-3.1, needs-cherry-pick-4.0, needs-cherry-pick-5.0, needs-cherry-pick-5.1, proposal, release-note, require-LGT3, security, tools.

In response to this:

/label needs-cherry-pick-5.2

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.

@windtalker
Copy link
Contributor Author

/run-check_dev_2

3 similar comments
@windtalker
Copy link
Contributor Author

/run-check_dev_2

@windtalker
Copy link
Contributor Author

/run-check_dev_2

@windtalker
Copy link
Contributor Author

/run-check_dev_2

@ti-chi-bot ti-chi-bot merged commit 08995d9 into pingcap:master Aug 13, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 13, 2021
@windtalker @ti-srebot
cherry pick pingcap#27111 to release-5.2
115aacb 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 13, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #27215

ti-chi-bot pushed a commit that referenced this pull request Aug 16, 2021
@ti-srebot
expression: make count distinct multi column aware of new collation (#…
14a46b4 
…27111) (#27215)
@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.1

@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.0

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 23, 2021
@windtalker @ti-srebot
cherry pick pingcap#27111 to release-5.1
84205e2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 23, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #27506

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 23, 2021
@windtalker @ti-srebot
cherry pick pingcap#27111 to release-5.0
23cfb61 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 23, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #27507

ti-chi-bot pushed a commit that referenced this pull request Aug 30, 2021
@ti-srebot
expression: make count distinct multi column aware of new collation (#…
80e91ec 
…27111) (#27507)
@guo-shaoge
Copy link
Collaborator

/label needs-cherry-pick-4.0

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 6, 2021
@windtalker @ti-srebot
cherry pick pingcap#27111 to release-4.0
7abbc1e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 6, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #27830

ti-chi-bot pushed a commit that referenced this pull request Sep 10, 2021
@ti-srebot
expression: make count distinct multi column aware of new collation (#…
916c686 
…27111) (#27830)
ti-chi-bot pushed a commit that referenced this pull request Sep 14, 2021
@ti-srebot
expression: make count distinct multi column aware of new collation (#…
7f2f1a7 
…27111) (#27506)
@windtalker windtalker deleted the count_distinct_multi_column branch November 16, 2021 01:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjhuang2016 wjhuang2016 wjhuang2016 approved these changes

@qw4990 qw4990 qw4990 approved these changes

Assignees
No one assigned
Labels
component/expression needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

count distinct with multiple column return wrong result under new collation
8 participants
@windtalker @ti-chi-bot @sre-bot @wjhuang2016 @ti-srebot @guo-shaoge @qw4990 @ichn-hu