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: Fix incorrect behavior of greatest/least when mixed temporal type with others #31037

Merged
merged 30 commits into from
Dec 30, 2021
Merged

expression: Fix incorrect behavior of greatest/least when mixed temporal type with others #31037

merged 30 commits into from
Dec 30, 2021

Conversation

yibin87
Copy link
Contributor

@yibin87 yibin87 commented Dec 27, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: close #30264 #30261

Problem Summary:

What is changed and how it works?

Change Greatest/Least builtin function's behavior according to MySQL's.

  1. Handle different type mixtures: Date/Time/DateTime/String/Int.
  2. Separate Date Comparison from Time Comparison, since they return different types.

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 27, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • guo-shaoge

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-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 27, 2021
@sre-bot
Copy link
Contributor

sre-bot commented Dec 27, 2021 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/2fabae472dd2b36ada93cc3566eb6c8d919845e5

@yibin87
Copy link
Contributor Author

yibin87 commented Dec 27, 2021

/run-unit-test

@yibin87
Copy link
Contributor Author

yibin87 commented Dec 27, 2021

\run-all-tests

@yibin87
Copy link
Contributor Author

yibin87 commented Dec 27, 2021

/run-all-tests

1 similar comment
@yibin87
Copy link
Contributor Author

yibin87 commented Dec 27, 2021

/run-all-tests

@yibin87
Copy link
Contributor Author

yibin87 commented Dec 27, 2021

/cc @XuHuaiyu @guo-shaoge , create this new PR, since previous forked repo was deleted by mistake.

@SeaRise SeaRise mentioned this pull request Dec 27, 2021
Closed
12 tasks
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 27, 2021
@yibin87
Copy link
Contributor Author

yibin87 commented Dec 28, 2021

/merge

@ti-chi-bot
Copy link
Member

@yibin87: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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.

@yibin87
Copy link
Contributor Author

yibin87 commented Dec 28, 2021

/assign @XuHuaiyu , please help to merge this PR

@XuHuaiyu XuHuaiyu added the type/bugfix This PR fixes a bug. label Dec 28, 2021
XuHuaiyu
XuHuaiyu reviewed Dec 28, 2021
View reviewed changes
expression/builtin_compare.go Outdated
// cmpStringMode: 0 for cmp string directly; 1 for cmp string as date 'yyyy-mm-dd'; 2 for cmp string
// as datetime 'yyyy-mm-dd hh:mm:ss'
// fieldTimeType: the return type, 0 for non-temporary time; 1 for date type; 2 for datetime type
func resolveType4Extremum(args []Expression) (_ types.EvalType, fieldTimeType byte, cmpStringMode int) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
func resolveType4Extremum(args []Expression) (_ types.EvalType, fieldTimeType byte, cmpStringMode int) {
type CmpStringMode uint8
const (
CmpStringDirectly CmpStringMode = iota
CmpStringAsDate // 'yyyy-mm-dd'
CmpStringAsDatetime // 'yyyy-mm-dd hh:mm:ss'
)
func resolveType4Extremum(args []Expression) (_ types.EvalType, fieldTimeType byte, cmpStringMode CmpStringMode) {

Copy link
Contributor

Choose a reason for hiding this comment

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

the fieldTimeType can also be extracted as an individual type definition

XuHuaiyu
XuHuaiyu reviewed Dec 28, 2021
View reviewed changes
expression/builtin_compare.go
@@ -945,11 +1014,13 @@ func (b *builtinLeastCmpStringAsTimeSig) evalString(row chunk.Row) (strRes strin

type builtinLeastTimeSig struct {
Copy link
Contributor

Choose a reason for hiding this comment

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

The vecEvalxxx of the sig also needs to be fixed.

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Dec 30, 2021
@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2fabae4

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

yibin87 commented Dec 30, 2021

/run-all-tests

@ti-chi-bot ti-chi-bot merged commit a8ce4af into pingcap:master Dec 30, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Dec 30, 2021
@yibin87 @ti-srebot
cherry pick pingcap#31037 to release-4.0
adcef25 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 30, 2021
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #31157

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Dec 30, 2021
@yibin87 @ti-srebot
cherry pick pingcap#31037 to release-5.0
bfdcba1 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 30, 2021
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #31158

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Dec 30, 2021
@yibin87 @ti-srebot
cherry pick pingcap#31037 to release-5.1
7f7d0b9 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 30, 2021
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #31159

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Dec 30, 2021
@yibin87 @ti-srebot
cherry pick pingcap#31037 to release-5.2
2b41a5c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 30, 2021
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #31160

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Dec 30, 2021
@yibin87 @ti-srebot
cherry pick pingcap#31037 to release-5.3
9809b8c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 30, 2021
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #31161

This was referenced Feb 9, 2022
Closed
Merged
@windtalker windtalker mentioned this pull request May 21, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@guo-shaoge guo-shaoge guo-shaoge approved these changes

Assignees

@XuHuaiyu XuHuaiyu

@yibin87 yibin87

Labels
needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 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.

GREATEST function with plus operations to time/date type gives wrong result.
6 participants
@yibin87 @ti-chi-bot @sre-bot @XuHuaiyu @ti-srebot @guo-shaoge