expression: fix date_add func in SECOND INTERVAL by yangwenmai · Pull Request #11312 · pingcap/tidb

yangwenmai · 2019-07-18T07:31:28Z

What problem does this PR solve?

What is changed and how it works?

The results of this PR like MySQL 5.7 has same result.

SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 MINUTE_MICROSECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 SECOND_MICROSECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 HOUR_MICROSECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 DAY_MICROSECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 SECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 HOUR_SECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 DAY_SECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 MINUTE_SECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 MINUTE);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 DAY_MINUTE);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 HOUR_MINUTE);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 DAY_HOUR);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 YEAR_MONTH);

SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 MINUTE_MICROSECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 SECOND_MICROSECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 HOUR_MICROSECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 DAY_MICROSECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 SECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 HOUR_SECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 DAY_SECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 MINUTE_SECOND);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 MINUTE);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 DAY_MINUTE);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 HOUR_MINUTE);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 DAY_HOUR);
SELECT DATE_ADD('2007-03-28 22:08:28',INTERVAL 2.2 YEAR_MONTH);

zz-jason · 2019-07-18T10:52:37Z

@yangwenmai Thanks for your contribution, it would be nice if you can:

follow the rules described in CONTRIBUTING.md to refine your PR title.
follow the rules described in Closing issues using keywords to refine the PR description so that the issue can be automated closed once this PR is merged.

SunRunAway · 2019-07-18T13:16:22Z

Is it duplicate to pr #11297?

SunRunAway · 2019-07-18T14:08:20Z

Consider fixing issue #11319? @yangwenmai

yangwenmai · 2019-07-18T14:45:58Z

I fixed the #11286 and #11319 in this PR.

wshwsh12 · 2019-07-18T14:52:17Z

I add some test cases in #11319 . You can have a look.

SunRunAway · 2019-07-19T05:10:33Z

I fixed the #11286 and #11319 in this PR.

@yangwenmai
#11286 is already fixed by another pull request. Will you consider modifying your code and pull request description to fix #11319 only?

yangwenmai · 2019-07-19T07:55:22Z

I fixed the #11286 and #11319 in this PR.

@yangwenmai
#11286 is already fixed by another pull request. Will you consider modifying your code and pull request description to fix #11319 only?

OK

SunRunAway · 2019-07-24T16:07:34Z

Please take a look at the code commented out above and it seems that something is duplicate.

SunRunAway · 2019-07-24T16:10:38Z

Please remove the redundant brackets.

If you prefer to just fix the SECOND unit problem, please change your pull request title more precisely and do not use neg for abbreviation.

SunRunAway · 2019-07-24T16:27:10Z

After another look, I think the problem occurs because of the incorrectness of dv.
Is it more reasonable to add a line dv *= sign below to solve this problem?

SunRunAway · 2019-07-29T02:36:29Z

@yangwenmai
Hi, please take a look again when you're free.

XuHuaiyu · 2019-07-29T02:47:16Z

Can we use iv *= -1 here?

zz-jason · 2019-08-03T07:59:05Z

@yangwenmai friendly ping, any update?

sre-bot · 2019-08-03T07:59:10Z

Hi contributor, thanks for your PR.

This patch needs to be approved by someone of admins. They should reply with "/ok-to-test" to accept this PR for running test automatically.

yangwenmai · 2019-08-05T03:56:53Z

@zz-jason @SunRunAway @XuHuaiyu PTAL

SunRunAway

reset LGTM

SunRunAway · 2019-08-05T04:47:02Z

Should we put this line into if decimalPointPos < lf { section?

OK, It's much better.

SunRunAway

LGTM && @XuHuaiyu @wshwsh12 PTAL

wshwsh12

LGTM

wshwsh12 · 2019-08-05T07:17:13Z

/run-all-tests

sre-bot · 2019-08-05T07:17:15Z

/run-all-tests

wshwsh12 · 2019-08-05T07:32:39Z

/run-cherry-picker

sre-bot · 2019-08-05T07:37:33Z

cherry pick to release-2.1 failed

you06 · 2019-08-05T08:43:10Z

/run-cherry-picker

sre-bot · 2019-08-05T08:46:25Z

cherry pick to release-3.0 in PR #11615

…upstream-release-2.1

yangwenmai changed the title ~~Fix date add neg~~ Fix(expression): fix date_add func in neg INTERVAL Jul 18, 2019

zz-jason added the contribution This PR is from a community contributor. label Jul 18, 2019

zz-jason requested review from XuHuaiyu and qw4990 July 18, 2019 10:49

zz-jason added component/expression needs-cherry-pick-2.1 type/bugfix This PR fixes a bug. labels Jul 18, 2019

yangwenmai force-pushed the fix_date_add_neg branch from 200fc50 to 5614270 Compare July 18, 2019 12:54

yangwenmai changed the title ~~Fix(expression): fix date_add func in neg INTERVAL~~ expression: fix date_add func in neg INTERVAL Jul 18, 2019

qw4990 requested review from SunRunAway and wshwsh12 July 22, 2019 05:24

yangwenmai force-pushed the fix_date_add_neg branch 2 times, most recently from 8dfbe7d to 1ea8ed1 Compare July 23, 2019 02:26

qw4990 removed their request for review July 23, 2019 07:12

SunRunAway reviewed Jul 24, 2019

View reviewed changes

SunRunAway mentioned this pull request Jul 29, 2019

Incompatible issues about scalar functions(help wanted) #11223

Open

37 tasks

XuHuaiyu reviewed Jul 29, 2019

View reviewed changes

Comment thread types/time.go Outdated

Copy link
Copy Markdown

Contributor

XuHuaiyu Jul 29, 2019

Choose a reason for hiding this comment

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

Can we use iv *= -1 here?

zz-jason added the status/ReqChange label Aug 3, 2019

yangwenmai changed the title ~~expression: fix date_add func in neg INTERVAL~~ expression: fix date_add func in SECOND INTERVAL Aug 5, 2019

SunRunAway reviewed Aug 5, 2019

View reviewed changes

SunRunAway requested a review from XuHuaiyu August 5, 2019 04:44

SunRunAway reviewed Aug 5, 2019

View reviewed changes

zz-jason assigned SunRunAway Aug 5, 2019

yangwenmai added 2 commits August 5, 2019 14:26

fix(types/time): deal negative number in second unit

b6b5d50

test(expression/integration_test): add test case

6a2a950

yangwenmai force-pushed the fix_date_add_neg branch from 66f41ea to 6a2a950 Compare August 5, 2019 06:27

SunRunAway reviewed Aug 5, 2019

View reviewed changes

SunRunAway added status/LGT1 Indicates that a PR has LGTM 1. and removed status/ReqChange labels Aug 5, 2019

wshwsh12 approved these changes Aug 5, 2019

View reviewed changes

Merge branch 'master' into fix_date_add_neg

d99bd9b

wshwsh12 added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 5, 2019

sre-bot merged commit ddafdff into pingcap:master Aug 5, 2019

sre-bot mentioned this pull request Aug 5, 2019

expression: fix date_add func in SECOND INTERVAL (#11312) #11615

Merged

sre-bot added a commit that referenced this pull request Aug 5, 2019

expression: fix date_add func in SECOND INTERVAL (#11312) (#11615)

b6643fe

SunRunAway mentioned this pull request Aug 5, 2019

expression: fix date_add func in SECOND INTERVAL (#11312) #11616

Merged

zz-jason added a commit to SunRunAway/tidb that referenced this pull request Aug 5, 2019

Merge branch 'release-2.1' into automated-cherry-pick-of-pingcap#11312-…

4141acd

…upstream-release-2.1

SunRunAway added a commit to SunRunAway/tidb that referenced this pull request Aug 6, 2019

Merge branch 'release-2.1' into automated-cherry-pick-of-pingcap#11312-…

e9a7ea6

…upstream-release-2.1

zz-jason pushed a commit that referenced this pull request Aug 6, 2019

expression: fix date_add func in SECOND INTERVAL (#11312) (#11616)

980f397

Conversation

yangwenmai commented Jul 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem does this PR solve?

What is changed and how it works?

Uh oh!

zz-jason commented Jul 18, 2019

Uh oh!

SunRunAway commented Jul 18, 2019

Uh oh!

SunRunAway commented Jul 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yangwenmai commented Jul 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wshwsh12 commented Jul 18, 2019

Uh oh!

SunRunAway commented Jul 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yangwenmai commented Jul 19, 2019

Uh oh!

SunRunAway Jul 24, 2019

Choose a reason for hiding this comment

Uh oh!

SunRunAway Jul 24, 2019

Choose a reason for hiding this comment

Uh oh!

SunRunAway Jul 24, 2019

Choose a reason for hiding this comment

Uh oh!

SunRunAway Jul 24, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SunRunAway commented Jul 29, 2019

Uh oh!

XuHuaiyu Jul 29, 2019

Choose a reason for hiding this comment

Uh oh!

zz-jason commented Aug 3, 2019

Uh oh!

sre-bot commented Aug 3, 2019

Uh oh!

yangwenmai commented Aug 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SunRunAway left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SunRunAway Aug 5, 2019

Choose a reason for hiding this comment

Uh oh!

yangwenmai Aug 5, 2019

Choose a reason for hiding this comment

Uh oh!

SunRunAway left a comment

Choose a reason for hiding this comment

Uh oh!

wshwsh12 left a comment

Choose a reason for hiding this comment

Uh oh!

wshwsh12 commented Aug 5, 2019

Uh oh!

sre-bot commented Aug 5, 2019

Uh oh!

wshwsh12 commented Aug 5, 2019

Uh oh!

sre-bot commented Aug 5, 2019

Uh oh!

you06 commented Aug 5, 2019

Uh oh!

sre-bot commented Aug 5, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

yangwenmai commented Jul 18, 2019 •

edited

Loading

SunRunAway commented Jul 18, 2019 •

edited

Loading

yangwenmai commented Jul 18, 2019 •

edited

Loading

SunRunAway commented Jul 19, 2019 •

edited

Loading

SunRunAway Jul 24, 2019 •

edited

Loading

yangwenmai commented Aug 5, 2019 •

edited

Loading

SunRunAway left a comment •

edited

Loading