expression: fix getIntervalFromDecimal in DATE_ADD() #11297

wshwsh12 · 2019-07-17T12:13:32Z

What problem does this PR solve?

#11286
Before this pr:

mysql> select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 MINUTE_MICROSECOND);
+------------------------------------------------------------------+
| DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 MINUTE_MICROSECOND) |
+------------------------------------------------------------------+
| 2007-03-28 22:08:30.200000                                       |
+------------------------------------------------------------------+
1 row in set (0.00 sec)

mysql> select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 HOUR_MICROSECOND);
+----------------------------------------------------------------+
| DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 HOUR_MICROSECOND) |
+----------------------------------------------------------------+
| 2007-03-28 22:08:30.200000                                     |
+----------------------------------------------------------------+
1 row in set (0.01 sec)

mysql> select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 DAY_MICROSECOND);
+---------------------------------------------------------------+
| DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 DAY_MICROSECOND) |
+---------------------------------------------------------------+
| 2007-03-28 22:08:30.200000                                    |
+---------------------------------------------------------------+
1 row in set (0.00 sec)

This pr:

mysql> select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 MINUTE_MICROSECOND);
+------------------------------------------------------------------+
| DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 MINUTE_MICROSECOND) |
+------------------------------------------------------------------+
| 2007-03-28 22:08:25.800000                                       |
+------------------------------------------------------------------+
1 row in set (0.00 sec)

mysql> select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 HOUR_MICROSECOND);
+----------------------------------------------------------------+
| DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 HOUR_MICROSECOND) |
+----------------------------------------------------------------+
| 2007-03-28 22:08:25.800000                                     |
+----------------------------------------------------------------+
1 row in set (0.00 sec)

mysql> select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 DAY_MICROSECOND);
+---------------------------------------------------------------+
| DATE_ADD('2007-03-28 22:08:28',INTERVAL -2.2 DAY_MICROSECOND) |
+---------------------------------------------------------------+
| 2007-03-28 22:08:25.800000                                    |
+---------------------------------------------------------------+
1 row in set (0.00 sec)

What is changed and how it works?

When use getIntervalFromDecimal to get interval, It will convert the Decimal to Interval(the type is string).
Before the pr, the func don't consider that the decimal may be a negative number. It get a wrong result.
e.g.
1 DAY_MICROSECOND => 0 00:00:1
-2.2 DAY_MICROSECOND => 0 00:00:-2.2 (wrong)

This pr, before the converting, I judge whether the decimal is negative first.
-2.2 DAY_MICROSECOND => -0 00:00:2.2

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)

Code changes

Side effects

Increased code complexity

Related changes

Need to cherry-pick to the release branch

wshwsh12 · 2019-07-17T12:13:55Z

/run-all-tests

expression/builtin_time.go

qw4990

LGTM

SunRunAway · 2019-07-18T06:02:49Z

expression/builtin_time.go

@@ -2697,6 +2701,10 @@ func (du *baseDateArithmitical) getIntervalFromDecimal(ctx sessionctx.Context, a
 		}
 	}

+	if neg {
+		interval = "-" + interval


It will be an incorrect result in case "SECOND" and default parts in the switch statement above.

wshwsh12 · 2019-07-18T06:59:16Z

@SunRunAway PTAL

codecov · 2019-07-18T07:02:32Z

Codecov Report

Merging #11297 into master will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master     #11297   +/-   ##
===========================================
  Coverage   81.6571%   81.6571%           
===========================================
  Files           423        423           
  Lines         91818      91818           
===========================================
  Hits          74976      74976           
  Misses        11531      11531           
  Partials       5311       5311

SunRunAway · 2019-07-18T07:08:25Z

expression/builtin_time.go

@@ -2684,19 +2688,25 @@ func (du *baseDateArithmitical) getIntervalFromDecimal(ctx sessionctx.Context, a
 		/* keep interval as original decimal */
 	case "SECOND":
 		// Decimal's EvalString is like %f format.
+		neg = false


It would be better not to do the extra revise code in these paths.
Also, would you like to add a unit test to cover it?

wshwsh12 · 2019-07-18T10:54:03Z

/run-all-tests

wshwsh12 · 2019-07-18T11:01:08Z

@SunRunAway PTAL

SunRunAway

LGTM

zz-jason

LGTM

zz-jason · 2019-07-18T14:19:03Z

/run-all-tests

wshwsh12 · 2019-07-18T14:45:38Z

/run-all-tests

fixed

sre-bot · 2019-07-18T15:19:25Z

cherry pick to release-2.1 failed

sre-bot · 2019-07-18T15:20:02Z

cherry pick to release-3.0 in PR #11325

zz-jason requested a review from SunRunAway July 17, 2019 12:16

zz-jason reviewed Jul 17, 2019

View reviewed changes

expression/builtin_time.go Outdated Show resolved Hide resolved

qw4990 changed the title *: fix getIntervalFromDecimal in DATE_ADD() expression: fix getIntervalFromDecimal in DATE_ADD() Jul 18, 2019

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

qw4990 reviewed Jul 18, 2019

View reviewed changes

SunRunAway previously requested changes Jul 18, 2019

View reviewed changes

wshwsh12 force-pushed the fix_date_microsecond branch from 4919bda to 5cb495c Compare July 18, 2019 06:57

wshwsh12 requested a review from SunRunAway July 18, 2019 06:59

SunRunAway reviewed Jul 18, 2019

View reviewed changes

wshwsh12 requested a review from SunRunAway July 18, 2019 11:01

wshwsh12 added 4 commits July 18, 2019 19:07

fix_decimal_to_interval

e04f6e3

add tests

cad9ab5

fix second and default

727efab

add switch and add tests

ff0eb51

wshwsh12 force-pushed the fix_date_microsecond branch from cbf8901 to ff0eb51 Compare July 18, 2019 11:13

SunRunAway mentioned this pull request Jul 18, 2019

expression: fix date_add func in SECOND INTERVAL #11312

Merged

SunRunAway reviewed Jul 18, 2019

View reviewed changes

SunRunAway requested review from zz-jason and qw4990 July 18, 2019 13:27

wshwsh12 added the status/WIP label Jul 18, 2019

zz-jason previously approved these changes Jul 18, 2019

View reviewed changes

zz-jason removed the status/WIP label Jul 18, 2019

zz-jason added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 18, 2019

add tests

34496d0

wshwsh12 dismissed zz-jason’s stale review via 34496d0 July 18, 2019 14:44

wshwsh12 force-pushed the fix_date_microsecond branch from e5a3e2b to 34496d0 Compare July 18, 2019 14:44

Merge branch 'master' into fix_date_microsecond

8913be0

wshwsh12 added the status/all tests passed label Jul 18, 2019

zz-jason approved these changes Jul 18, 2019

View reviewed changes

SunRunAway approved these changes Jul 18, 2019

View reviewed changes

SunRunAway merged commit 5aef053 into pingcap:master Jul 18, 2019

sre-bot mentioned this pull request Jul 18, 2019

expression: fix getIntervalFromDecimal in DATE_ADD() (#11297) #11325

Merged

wshwsh12 added a commit to wshwsh12/tidb that referenced this pull request Jul 18, 2019

expression: fix getIntervalFromDecimal in DATE_ADD() (pingcap#11297)

e0b40e6

wshwsh12 mentioned this pull request Jul 18, 2019

expression: fix getIntervalFromDecimal in DATE_ADD() (#11297) #11326

Merged

zz-jason pushed a commit that referenced this pull request Jul 18, 2019

expression: fix getIntervalFromDecimal in DATE_ADD() (#11297) (#11325)

13aa832

zz-jason pushed a commit that referenced this pull request Jul 18, 2019

expression: fix getIntervalFromDecimal in DATE_ADD() (#11297) (#11326)

2fe5636

wshwsh12 deleted the fix_date_microsecond branch July 25, 2019 08:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

expression: fix getIntervalFromDecimal in DATE_ADD() #11297

expression: fix getIntervalFromDecimal in DATE_ADD() #11297

wshwsh12 commented Jul 17, 2019

wshwsh12 commented Jul 17, 2019

qw4990 left a comment

SunRunAway Jul 18, 2019 •

edited

Loading

wshwsh12 commented Jul 18, 2019

codecov bot commented Jul 18, 2019 •

edited

Loading

SunRunAway Jul 18, 2019

wshwsh12 commented Jul 18, 2019

wshwsh12 commented Jul 18, 2019

SunRunAway left a comment

zz-jason left a comment

zz-jason commented Jul 18, 2019

wshwsh12 commented Jul 18, 2019

sre-bot commented Jul 18, 2019

sre-bot commented Jul 18, 2019

expression: fix getIntervalFromDecimal in DATE_ADD() #11297

expression: fix getIntervalFromDecimal in DATE_ADD() #11297

Conversation

wshwsh12 commented Jul 17, 2019

What problem does this PR solve?

What is changed and how it works?

Check List

wshwsh12 commented Jul 17, 2019

qw4990 left a comment

Choose a reason for hiding this comment

SunRunAway Jul 18, 2019 • edited Loading

Choose a reason for hiding this comment

wshwsh12 commented Jul 18, 2019

codecov bot commented Jul 18, 2019 • edited Loading

Codecov Report

SunRunAway Jul 18, 2019

Choose a reason for hiding this comment

wshwsh12 commented Jul 18, 2019

wshwsh12 commented Jul 18, 2019

SunRunAway left a comment

Choose a reason for hiding this comment

zz-jason left a comment

Choose a reason for hiding this comment

zz-jason commented Jul 18, 2019

wshwsh12 commented Jul 18, 2019

sre-bot commented Jul 18, 2019

sre-bot commented Jul 18, 2019

SunRunAway Jul 18, 2019 •

edited

Loading

codecov bot commented Jul 18, 2019 •

edited

Loading