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: addition between datetime and interval is not compatible with Mysql #10329

Merged
merged 21 commits into from May 10, 2019
Merged

expression: addition between datetime and interval is not compatible with Mysql #10329

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6fd3c1b
fix 9727
erjiaqing Apr 30, 2019
2432371
fix
erjiaqing Apr 30, 2019
c4e83d5
fix
erjiaqing Apr 30, 2019
b100b0a
use integration test
erjiaqing Apr 30, 2019
65de397
improve coverage
erjiaqing May 5, 2019
b583a62
simplify pr
erjiaqing May 5, 2019
ecf263a
Merge branch 'master' into issue_9727
erjiaqing May 5, 2019
d22eca1
avoid float number for precision
erjiaqing May 5, 2019
18860bf
fix rounding
erjiaqing May 6, 2019
87e8d56
Merge branch 'master' into issue_9727
erjiaqing May 6, 2019
430e3d7
add more tests
erjiaqing May 6, 2019
54c17b5
remove some redundant tests
erjiaqing May 6, 2019
d75132a
address comments
erjiaqing May 6, 2019
9a527d2
address comments
erjiaqing May 7, 2019
c2c6d8a
Merge branch 'master' into issue_9727
erjiaqing May 8, 2019
355112a
fix
erjiaqing May 8, 2019
4dc5c08
throw warnings
erjiaqing May 9, 2019
e50a2fe
fix ci
erjiaqing May 9, 2019
a74aa2d
fix
erjiaqing May 9, 2019
77e28a6
Merge branch 'master' into issue_9727
alivxxx May 10, 2019
dee0fb4
fix
erjiaqing May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions expression/builtin_time.go
View file
Open in desktop
Expand Up @@ -2704,7 +2704,7 @@ func (du *baseDateArithmitical) getIntervalFromInt(ctx sessionctx.Context, args
}

func (du *baseDateArithmitical) add(ctx sessionctx.Context, date types.Time, interval string, unit string) (types.Time, bool, error) {
year, month, day, dur, err := types.ExtractTimeValue(unit, interval)
year, month, day, nano, err := types.ParseDurationValue(unit, interval)
if err != nil {
return types.Time{}, true, handleInvalidTimeError(ctx, err)
}
Expand All @@ -2714,8 +2714,7 @@ func (du *baseDateArithmitical) add(ctx sessionctx.Context, date types.Time, int
return types.Time{}, true, err
}

duration := time.Duration(dur)
goTime = goTime.Add(duration)
goTime = goTime.Add(time.Duration(nano))
goTime = types.AddDate(year, month, day, goTime)

if goTime.Nanosecond() == 0 {
Expand All @@ -2736,18 +2735,18 @@ func (du *baseDateArithmitical) add(ctx sessionctx.Context, date types.Time, int
}

func (du *baseDateArithmitical) sub(ctx sessionctx.Context, date types.Time, interval string, unit string) (types.Time, bool, error) {
year, month, day, dur, err := types.ExtractTimeValue(unit, interval)
year, month, day, nano, err := types.ParseDurationValue(unit, interval)
if err != nil {
return types.Time{}, true, handleInvalidTimeError(ctx, err)
}
year, month, day, dur = -year, -month, -day, -dur
year, month, day, nano = -year, -month, -day, -nano

goTime, err := date.Time.GoTime(time.Local)
if err != nil {
return types.Time{}, true, err
}

duration := time.Duration(dur)
duration := time.Duration(nano)
goTime = goTime.Add(duration)
goTime = types.AddDate(year, month, day, goTime)

Expand Down
42 changes: 42 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Expand Up @@ -4248,6 +4248,48 @@ where
tk.MustQuery(q)
}

func (s *testIntegrationSuite) TestIssue9727(c *C) {
tk := testkit.NewTestKit(c, s.store)
defer s.cleanEnv(c)

cases := []struct {
sql string
result string
}{
{`SELECT "1900-01-01 00:00:00" + INTERVAL "100000000:214748364700" MINUTE_SECOND;`, "8895-03-27 22:11:40"},
{`SELECT "1900-01-01 00:00:00" + INTERVAL 1 << 37 SECOND;`, "6255-04-08 15:04:32"},
{`SELECT "1900-01-01 00:00:00" + INTERVAL 1 << 31 MINUTE;`, "5983-01-24 02:08:00"},
{`SELECT "1900-01-01 00:00:00" + INTERVAL 1 << 38 SECOND;`, "<nil>"},
{`SELECT "1900-01-01 00:00:00" + INTERVAL 1 << 33 MINUTE;`, "<nil>"},
{`SELECT "1900-01-01 00:00:00" + INTERVAL 1 << 30 HOUR;`, "<nil>"},
{`SELECT "1900-01-01 00:00:00" + INTERVAL "1000000000:214748364700" MINUTE_SECOND;`, "<nil>"},
{`SELECT 19000101000000 + INTERVAL "100000000:214748364700" MINUTE_SECOND;`, "8895-03-27 22:11:40"},
{`SELECT 19000101000000 + INTERVAL 1 << 37 SECOND;`, "6255-04-08 15:04:32"},
{`SELECT 19000101000000 + INTERVAL 1 << 31 MINUTE;`, "5983-01-24 02:08:00"},

{`SELECT "8895-03-27 22:11:40" - INTERVAL "100000000:214748364700" MINUTE_SECOND;`, "1900-01-01 00:00:00"},
{`SELECT "6255-04-08 15:04:32" - INTERVAL 1 << 37 SECOND;`, "1900-01-01 00:00:00"},
{`SELECT "5983-01-24 02:08:00" - INTERVAL 1 << 31 MINUTE;`, "1900-01-01 00:00:00"},
{`SELECT "9999-01-01 00:00:00" - INTERVAL 1 << 39 SECOND;`, "<nil>"},
{`SELECT "9999-01-01 00:00:00" - INTERVAL 1 << 33 MINUTE;`, "<nil>"},
{`SELECT "9999-01-01 00:00:00" - INTERVAL 1 << 30 HOUR;`, "<nil>"},
{`SELECT "9999-01-01 00:00:00" - INTERVAL "10000000000:214748364700" MINUTE_SECOND;`, "<nil>"},
{`SELECT 88950327221140 - INTERVAL "100000000:214748364700" MINUTE_SECOND ;`, "1900-01-01 00:00:00"},
{`SELECT 62550408150432 - INTERVAL 1 << 37 SECOND;`, "1900-01-01 00:00:00"},
{`SELECT 59830124020800 - INTERVAL 1 << 31 MINUTE;`, "1900-01-01 00:00:00"},

{`SELECT 10000101000000 + INTERVAL "111111111111111111" MICROSECOND;`, `4520-12-21 05:31:51.111111`},
{`SELECT 10000101000000 + INTERVAL "111111111111.111111" SECOND;`, `4520-12-21 05:31:51.111111`},
{`SELECT 10000101000000 + INTERVAL "111111111111.111111111" SECOND;`, `4520-12-21 05:31:51.111111`},
{`SELECT 10000101000000 + INTERVAL "111111111111.111" SECOND;`, `4520-12-21 05:31:51.111000`},
{`SELECT 10000101000000 + INTERVAL "111111111111." SECOND;`, `4520-12-21 05:31:51`},
}

for _, c := range cases {
tk.MustQuery(c.sql).Check(testkit.Rows(c.result))
}
}

func (s *testIntegrationSuite) TestTimestampDatumEncode(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
Expand Down
105 changes: 69 additions & 36 deletions types/time.go
View file
Open in desktop
Expand Up @@ -1615,41 +1615,72 @@ func ExtractDurationNum(d *Duration, unit string) (int64, error) {
}
}

func extractSingleTimeValue(unit string, format string) (int64, int64, int64, float64, error) {
fv, err := strconv.ParseFloat(format, 64)
func parseSingleTimeValue(unit string, format string) (int64, int64, int64, int64, error) {
// Format is a preformatted number, it format should be A[.[B]].
decimalPointPos := strings.IndexRune(format, '.')
if decimalPointPos == -1 {
decimalPointPos = len(format)
}
iv, err := strconv.ParseInt(format[0:decimalPointPos], 10, 64)
if err != nil {
return 0, 0, 0, 0, ErrIncorrectDatetimeValue.GenWithStackByArgs(format)
}
iv := int64(math.Round(fv))
riv := iv // Rounded integer value

dv := int64(0)
lf := len(format) - 1
// Has fraction part
if decimalPointPos < lf {
if lf-decimalPointPos >= 6 {
if dv, err = strconv.ParseInt(format[decimalPointPos+1:decimalPointPos+7], 10, 64); err != nil {
erjiaqing marked this conversation as resolved.
Show resolved Hide resolved
return 0, 0, 0, 0, ErrIncorrectDatetimeValue.GenWithStackByArgs(format)
}
} else {
if dv, err = strconv.ParseInt(format[decimalPointPos+1:]+"000000"[:6-(lf-decimalPointPos)], 10, 64); err != nil {
return 0, 0, 0, 0, ErrIncorrectDatetimeValue.GenWithStackByArgs(format)
}
}
if dv >= 500000 { // Round up
qw4990 marked this conversation as resolved.
Show resolved Hide resolved
riv++
}
}
switch strings.ToUpper(unit) {
case "MICROSECOND":
return 0, 0, 0, fv * float64(gotime.Microsecond), nil
dayCount := riv / (3600000000 * 24)
qw4990 marked this conversation as resolved.
Show resolved Hide resolved
riv %= 3600000000 * 24
return 0, 0, dayCount, riv * int64(gotime.Microsecond), nil
case "SECOND":
return 0, 0, 0, fv * float64(gotime.Second), nil
dayCount := iv / (3600 * 24)
iv %= 3600 * 24
return 0, 0, dayCount, iv*int64(gotime.Second) + dv*int64(gotime.Microsecond), nil
case "MINUTE":
return 0, 0, 0, float64(iv * int64(gotime.Minute)), nil
dayCount := riv / (60 * 24)
riv %= 60 * 24
return 0, 0, dayCount, riv * int64(gotime.Minute), nil
case "HOUR":
return 0, 0, 0, float64(iv * int64(gotime.Hour)), nil
dayCount := riv / 24
riv %= 24
return 0, 0, dayCount, riv * int64(gotime.Hour), nil
case "DAY":
return 0, 0, iv, 0, nil
return 0, 0, riv, 0, nil
case "WEEK":
return 0, 0, 7 * iv, 0, nil
return 0, 0, 7 * riv, 0, nil
case "MONTH":
return 0, iv, 0, 0, nil
return 0, riv, 0, 0, nil
case "QUARTER":
return 0, 3 * iv, 0, 0, nil
return 0, 3 * riv, 0, 0, nil
case "YEAR":
return iv, 0, 0, 0, nil
return riv, 0, 0, 0, nil
}

return 0, 0, 0, 0, errors.Errorf("invalid singel timeunit - %s", unit)
}

// extractTimeValue extracts years, months, days, microseconds from a string
// parseTimeValue gets years, months, days, nanoseconds from a string
// nanosecond will not exceed length of single day
// MySQL permits any punctuation delimiter in the expr format.
// See https://dev.mysql.com/doc/refman/8.0/en/expressions.html#temporal-intervals
func extractTimeValue(format string, index, cnt int) (int64, int64, int64, float64, error) {
func parseTimeValue(format string, index, cnt int) (int64, int64, int64, int64, error) {
neg := false
originalFmt := format
format = strings.TrimSpace(format)
Expand Down Expand Up @@ -1687,55 +1718,57 @@ func extractTimeValue(format string, index, cnt int) (int64, int64, int64, float
return 0, 0, 0, 0, ErrIncorrectDatetimeValue.GenWithStackByArgs(originalFmt)
}

hours, err := strconv.ParseFloat(fields[HourIndex], 64)
hours, err := strconv.ParseInt(fields[HourIndex], 10, 64)
if err != nil {
return 0, 0, 0, 0, ErrIncorrectDatetimeValue.GenWithStackByArgs(originalFmt)
}
minutes, err := strconv.ParseFloat(fields[MinuteIndex], 64)
minutes, err := strconv.ParseInt(fields[MinuteIndex], 10, 64)
if err != nil {
return 0, 0, 0, 0, ErrIncorrectDatetimeValue.GenWithStackByArgs(originalFmt)
}
seconds, err := strconv.ParseFloat(fields[SecondIndex], 64)
seconds, err := strconv.ParseInt(fields[SecondIndex], 10, 64)
if err != nil {
return 0, 0, 0, 0, ErrIncorrectDatetimeValue.GenWithStackByArgs(originalFmt)
}
microseconds, err := strconv.ParseFloat(alignFrac(fields[MicrosecondIndex], MaxFsp), 64)
microseconds, err := strconv.ParseInt(alignFrac(fields[MicrosecondIndex], MaxFsp), 10, 64)
if err != nil {
return 0, 0, 0, 0, ErrIncorrectDatetimeValue.GenWithStackByArgs(originalFmt)
}
durations := hours*float64(gotime.Hour) + minutes*float64(gotime.Minute) +
seconds*float64(gotime.Second) + microseconds*float64(gotime.Microsecond)

return years, months, days, durations, nil
seconds = hours*3600 + minutes*60 + seconds
days += seconds / (3600 * 24)
seconds %= 3600 * 24
return years, months, days, seconds*int64(gotime.Second) + microseconds*int64(gotime.Microsecond), nil
}

// ExtractTimeValue extracts time value from time unit and format.
func ExtractTimeValue(unit string, format string) (int64, int64, int64, float64, error) {
// ParseDurationValue parses time value from time unit and format.
// Returns y years m months d days + n nanoseconds
// Nanoseconds will no longer than one day.
func ParseDurationValue(unit string, format string) (y int64, m int64, d int64, n int64, _ error) {
winoros marked this conversation as resolved.
Show resolved Hide resolved
switch strings.ToUpper(unit) {
case "MICROSECOND", "SECOND", "MINUTE", "HOUR", "DAY", "WEEK", "MONTH", "QUARTER", "YEAR":
return extractSingleTimeValue(unit, format)
return parseSingleTimeValue(unit, format)
case "SECOND_MICROSECOND":
return extractTimeValue(format, MicrosecondIndex, SecondMicrosecondMaxCnt)
return parseTimeValue(format, MicrosecondIndex, SecondMicrosecondMaxCnt)
case "MINUTE_MICROSECOND":
return extractTimeValue(format, MicrosecondIndex, MinuteMicrosecondMaxCnt)
return parseTimeValue(format, MicrosecondIndex, MinuteMicrosecondMaxCnt)
case "MINUTE_SECOND":
return extractTimeValue(format, SecondIndex, MinuteSecondMaxCnt)
return parseTimeValue(format, SecondIndex, MinuteSecondMaxCnt)
case "HOUR_MICROSECOND":
return extractTimeValue(format, MicrosecondIndex, HourMicrosecondMaxCnt)
return parseTimeValue(format, MicrosecondIndex, HourMicrosecondMaxCnt)
case "HOUR_SECOND":
return extractTimeValue(format, SecondIndex, HourSecondMaxCnt)
return parseTimeValue(format, SecondIndex, HourSecondMaxCnt)
case "HOUR_MINUTE":
return extractTimeValue(format, MinuteIndex, HourMinuteMaxCnt)
return parseTimeValue(format, MinuteIndex, HourMinuteMaxCnt)
case "DAY_MICROSECOND":
return extractTimeValue(format, MicrosecondIndex, DayMicrosecondMaxCnt)
return parseTimeValue(format, MicrosecondIndex, DayMicrosecondMaxCnt)
case "DAY_SECOND":
return extractTimeValue(format, SecondIndex, DaySecondMaxCnt)
return parseTimeValue(format, SecondIndex, DaySecondMaxCnt)
case "DAY_MINUTE":
return extractTimeValue(format, MinuteIndex, DayMinuteMaxCnt)
return parseTimeValue(format, MinuteIndex, DayMinuteMaxCnt)
case "DAY_HOUR":
return extractTimeValue(format, HourIndex, DayHourMaxCnt)
return parseTimeValue(format, HourIndex, DayHourMaxCnt)
case "YEAR_MONTH":
return extractTimeValue(format, MonthIndex, YearMonthMaxCnt)
return parseTimeValue(format, MonthIndex, YearMonthMaxCnt)
default:
return 0, 0, 0, 0, errors.Errorf("invalid singel timeunit - %s", unit)
}
Expand Down
51 changes: 26 additions & 25 deletions types/time_test.go
View file
Open in desktop
Expand Up @@ -1245,37 +1245,37 @@ func (s *testTimeSuite) TestExtractDurationNum(c *C) {
c.Assert(err, ErrorMatches, "invalid unit.*")
}

func (s *testTimeSuite) TestExtractTimeValue(c *C) {
func (s *testTimeSuite) TestParseDurationValue(c *C) {
tbl := []struct {
format string
unit string
res1 int64
res2 int64
res3 int64
res4 float64
res4 int64
}{
{"52", "WEEK", 0, 0, 52 * 7, 0},
{"12", "DAY", 0, 0, 12, 0},
{"04", "MONTH", 0, 04, 0, 0},
{"1", "QUARTER", 0, 1 * 3, 0, 0},
{"2019", "YEAR", 2019, 0, 0, 0},
{"10567890", "SECOND_MICROSECOND", 0, 0, 0, 1.056789e+10},
{"10.567890", "SECOND_MICROSECOND", 0, 0, 0, 1.056789e+10},
{"-10.567890", "SECOND_MICROSECOND", 0, 0, 0, -1.056789e+10},
{"35:10567890", "MINUTE_SECOND", 0, 0, 0, 1.056999e+16},
{"3510567890", "MINUTE_SECOND", 0, 0, 0, 3.51056789e+18},
{"11:35:10.567890", "HOUR_MICROSECOND", 0, 0, 0, 4.171056789e+13},
{"567890", "HOUR_MICROSECOND", 0, 0, 0, 5.6789e+08},
{"14:00", "HOUR_MINUTE", 0, 0, 0, 5.04e+13},
{"14", "HOUR_MINUTE", 0, 0, 0, 8.4e+11},
{"12 14:00:00.345", "DAY_MICROSECOND", 0, 0, 12, 5.0400345e+13},
{"12 14:00:00", "DAY_SECOND", 0, 0, 12, 5.04e+13},
{"12 14:00", "DAY_MINUTE", 0, 0, 12, 5.04e+13},
{"12 14", "DAY_HOUR", 0, 0, 12, 5.04e+13},
{"1:1", "DAY_HOUR", 0, 0, 1, 3.6e+12},
{"aa1bb1", "DAY_HOUR", 0, 0, 1, 3.6e+12},
{"-1:1", "DAY_HOUR", 0, 0, -1, -3.6e+12},
{"-aa1bb1", "DAY_HOUR", 0, 0, -1, -3.6e+12},
{"10567890", "SECOND_MICROSECOND", 0, 0, 0, 10567890000},
{"10.567890", "SECOND_MICROSECOND", 0, 0, 0, 10567890000},
{"-10.567890", "SECOND_MICROSECOND", 0, 0, 0, -10567890000},
{"35:10567890", "MINUTE_SECOND", 0, 0, 122, 29190000000000}, // 122 * 3600 * 24 + 29190 = 35 * 60 + 10567890
{"3510567890", "MINUTE_SECOND", 0, 0, 40631, 49490000000000}, // 40631 * 3600 * 24 + 49490 = 3510567890
{"11:35:10.567890", "HOUR_MICROSECOND", 0, 0, 0, 41710567890000}, // = (11 * 3600 + 35 * 60) * 1000000000 + 10567890000
{"567890", "HOUR_MICROSECOND", 0, 0, 0, 567890000},
{"14:00", "HOUR_MINUTE", 0, 0, 0, 50400000000000},
{"14", "HOUR_MINUTE", 0, 0, 0, 840000000000},
{"12 14:00:00.345", "DAY_MICROSECOND", 0, 0, 12, 50400345000000},
{"12 14:00:00", "DAY_SECOND", 0, 0, 12, 50400000000000},
{"12 14:00", "DAY_MINUTE", 0, 0, 12, 50400000000000},
{"12 14", "DAY_HOUR", 0, 0, 12, 50400000000000},
{"1:1", "DAY_HOUR", 0, 0, 1, 3600000000000},
{"aa1bb1", "DAY_HOUR", 0, 0, 1, 3600000000000},
{"-1:1", "DAY_HOUR", 0, 0, -1, -3600000000000},
{"-aa1bb1", "DAY_HOUR", 0, 0, -1, -3600000000000},
{"2019-12", "YEAR_MONTH", 2019, 12, 0, 0},
{"1 1", "YEAR_MONTH", 1, 1, 0, 0},
{"aa1bb1", "YEAR_MONTH", 1, 1, 0, 0},
Expand All @@ -1284,12 +1284,13 @@ func (s *testTimeSuite) TestExtractTimeValue(c *C) {
{" \t\n\r\n - aa1bb1 \t\n ", "YEAR_MONTH", -1, -1, 0, 0},
}
for _, col := range tbl {
res1, res2, res3, res4, err := types.ExtractTimeValue(col.unit, col.format)
c.Assert(res1, Equals, col.res1)
c.Assert(res2, Equals, col.res2)
c.Assert(res3, Equals, col.res3)
c.Assert(res4, Equals, col.res4)
c.Assert(err, IsNil)
comment := Commentf("Extract %v Unit %v", col.format, col.unit)
res1, res2, res3, res4, err := types.ParseDurationValue(col.unit, col.format)
c.Assert(res1, Equals, col.res1, comment)
c.Assert(res2, Equals, col.res2, comment)
c.Assert(res3, Equals, col.res3, comment)
c.Assert(res4, Equals, col.res4, comment)
c.Assert(err, IsNil, comment)
}

}
Expand Down