expression: fix the behavior when adding date with big interval | tidb-test=pr/2260 #49228

lcwangchao · 2023-12-06T12:26:28Z

What problem does this PR solve?

Issue Number: close #49227

What changed and how does it work?

date + interval X uint when X is a big value, we should get NULL
Fix some other interval cases to keep the same behavior with MySQL 8.0:
- date + interval "true" DAY should not add one day, only date + interval true DAY should be seen as add 1 time unit.
- date + interval "xxx1" uint, if an interval string does not start with +/- or a digit, it should be truncated as 0, not 1.
- The unit SECOND is special, it should accept string in in exponential format, for example: select "1900-01-01 00:00:00" + INTERVAL "1e2" second; should add 100 seconds.
- If the unit is SECOND , the interval string should be regarded as float, other units should be regarded as int.

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

To make some behaviors same with Mysql8.0:

fix the behavior when adding date with big interval
interval with an invalid prefix will be seen as a zero value after this PR
interval with a string "true" will be seen as a zero value after this PR

codecov · 2023-12-06T12:43:47Z

Codecov Report

Merging #49228 (d914219) into master (e62699c) will increase coverage by 0.7537%.
Report is 20 commits behind head on master.
The diff coverage is 72.0720%.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #49228        +/-   ##
================================================
+ Coverage   71.0591%   71.8128%   +0.7536%     
================================================
  Files          1368       1412        +44     
  Lines        401982     415363     +13381     
================================================
+ Hits         285645     298284     +12639     
- Misses        96472      98243      +1771     
+ Partials      19865      18836      -1029

Flag	Coverage Δ
integration	`43.7218% <72.0720%> (?)`
unit	`71.0604% <ø> (+0.0013%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`53.9663% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`47.7173% <ø> (-5.2442%)`	⬇️

lcwangchao · 2023-12-06T15:38:54Z

/retest

lcwangchao · 2023-12-06T15:47:22Z

/retest

pkg/expression/builtin_time.go

lcwangchao · 2023-12-07T04:49:11Z

pkg/expression/builtin_time.go

@@ -2754,7 +2754,7 @@ type baseDateArithmetical struct {

 func newDateArithmeticalUtil() baseDateArithmetical {
 	return baseDateArithmetical{
-		intervalRegexp: regexp.MustCompile(`-?[\d]+`),
+		intervalRegexp: regexp.MustCompile(`^[+-]?[\d]+`),


XXX1 should be parsed as "", not "1"

YangKeao

Rest LGTM

pkg/expression/builtin_time.go

YangKeao

LGTM

lcwangchao · 2023-12-07T12:36:40Z

/retest

lcwangchao · 2023-12-07T12:47:35Z

/retest

lcwangchao · 2023-12-07T13:31:40Z

/retest

lcwangchao · 2023-12-11T02:05:04Z

/retest

lcwangchao · 2023-12-11T02:45:28Z

/retest

lcwangchao · 2023-12-11T04:01:11Z

/retest

pkg/expression/builtin_time.go

windtalker

LGTM

ti-chi-bot · 2023-12-12T08:36:00Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: windtalker, YangKeao

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [YangKeao,windtalker]
~~pkg/expression/OWNERS~~ [windtalker]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ti-chi-bot · 2023-12-12T08:36:04Z

[LGTM Timeline notifier]

Timeline:

2023-12-07 11:41:34.36265917 +0000 UTC m=+1700523.027885365: ☑️ agreed by YangKeao.
2023-12-12 08:36:03.573809981 +0000 UTC m=+345254.611036893: ☑️ agreed by windtalker.

lcwangchao force-pushed the date_add_bigv branch from 069050c to 0fb94fd Compare December 6, 2023 12:30

lcwangchao force-pushed the date_add_bigv branch 3 times, most recently from 19e6df0 to 5bb3022 Compare December 6, 2023 14:34

lcwangchao changed the title ~~expression: fix the behavior when adding date with big interval~~ expression: fix the behavior when adding date with big interval | tidb-test=pr/2260 Dec 6, 2023

lcwangchao force-pushed the date_add_bigv branch from 5bb3022 to 2df7652 Compare December 7, 2023 04:37

ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 7, 2023

lcwangchao commented Dec 7, 2023

View reviewed changes

lcwangchao force-pushed the date_add_bigv branch 3 times, most recently from 209f67b to d33c99a Compare December 7, 2023 06:13

lcwangchao added compatibility-breaker Violation of forwards/backwards compatibility in a design-time piece. compatibility-mysql8 This is a compatibility issue with MySQL 8.0(but NOT 5.7) and removed compatibility-mysql8 This is a compatibility issue with MySQL 8.0(but NOT 5.7) labels Dec 7, 2023

lcwangchao force-pushed the date_add_bigv branch 2 times, most recently from fa2a92f to e09eeb0 Compare December 7, 2023 09:46

YangKeao reviewed Dec 7, 2023

View reviewed changes

pkg/expression/builtin_time.go Outdated Show resolved Hide resolved

lcwangchao force-pushed the date_add_bigv branch from e09eeb0 to 7e338f3 Compare December 7, 2023 10:53

YangKeao approved these changes Dec 7, 2023

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 7, 2023

expression: fix the behavior when adding date with big interval

8a6bb2c

lcwangchao force-pushed the date_add_bigv branch from 7e338f3 to 8a6bb2c Compare December 7, 2023 12:22

lcwangchao added 2 commits December 7, 2023 20:59

Merge branch 'master' into date_add_bigv

35266c6

update

1066ef0

lcwangchao force-pushed the date_add_bigv branch from 0b130b9 to 1066ef0 Compare December 7, 2023 13:07

lcwangchao added 2 commits December 7, 2023 21:56

Merge branch 'master' into date_add_bigv

a98dcad

Merge branch 'master' into date_add_bigv

9531ee5

update msg

56ff39f

lcwangchao force-pushed the date_add_bigv branch from 09f2727 to 56ff39f Compare December 11, 2023 02:50

windtalker reviewed Dec 12, 2023

View reviewed changes

pkg/expression/builtin_time.go Show resolved Hide resolved

pkg/expression/builtin_time.go Show resolved Hide resolved

windtalker approved these changes Dec 12, 2023

View reviewed changes

ti-chi-bot bot added approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 12, 2023

int vec

d914219

lcwangchao removed needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. labels Dec 12, 2023

ti-chi-bot bot merged commit 724b88b into pingcap:master Dec 12, 2023
15 of 16 checks passed

lcwangchao deleted the date_add_bigv branch December 12, 2023 11:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

expression: fix the behavior when adding date with big interval | tidb-test=pr/2260 #49228

expression: fix the behavior when adding date with big interval | tidb-test=pr/2260 #49228

lcwangchao commented Dec 6, 2023 •

edited

Loading

codecov bot commented Dec 6, 2023 •

edited

Loading

lcwangchao commented Dec 6, 2023

lcwangchao commented Dec 6, 2023

lcwangchao Dec 7, 2023

YangKeao left a comment

YangKeao left a comment

lcwangchao commented Dec 7, 2023

lcwangchao commented Dec 7, 2023

lcwangchao commented Dec 7, 2023

lcwangchao commented Dec 11, 2023

lcwangchao commented Dec 11, 2023

lcwangchao commented Dec 11, 2023

windtalker left a comment

ti-chi-bot bot commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

expression: fix the behavior when adding date with big interval | tidb-test=pr/2260 #49228

expression: fix the behavior when adding date with big interval | tidb-test=pr/2260 #49228

Conversation

lcwangchao commented Dec 6, 2023 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

codecov bot commented Dec 6, 2023 • edited Loading

Codecov Report

lcwangchao commented Dec 6, 2023

lcwangchao commented Dec 6, 2023

lcwangchao Dec 7, 2023

Choose a reason for hiding this comment

YangKeao left a comment

Choose a reason for hiding this comment

YangKeao left a comment

Choose a reason for hiding this comment

lcwangchao commented Dec 7, 2023

lcwangchao commented Dec 7, 2023

lcwangchao commented Dec 7, 2023

lcwangchao commented Dec 11, 2023

lcwangchao commented Dec 11, 2023

lcwangchao commented Dec 11, 2023

windtalker left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Dec 12, 2023

ti-chi-bot bot commented Dec 12, 2023

[LGTM Timeline notifier]

lcwangchao commented Dec 6, 2023 •

edited

Loading

codecov bot commented Dec 6, 2023 •

edited

Loading