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

types: year function can't handle some date string #26152

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+30 −1
Open

types: year function can't handle some date string #26152

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4129fcb
executor: query memory table TIKV_REGION_PEERS and TIKV_REGION_STATUS…
yuqi1129 Jun 30, 2021
5c2c38c
Merge branch 'master' of github.com:pingcap/tidb
yuqi1129 Jul 1, 2021
f0ed397
Merge branch 'master' of github.com:pingcap/tidb
yuqi1129 Jul 9, 2021
6ab6308
Merge branch 'master' of github.com:pingcap/tidb
yuqi1129 Jul 10, 2021
9bcd65b
Merge branch 'master' of github.com:pingcap/tidb
yuqi1129 Jul 12, 2021
9ae8633
types: year function can't handle some date string
yuqi1129 Jul 12, 2021
c2f69a9
types: year function can't handle some date string
yuqi1129 Jul 12, 2021
c179cea
Merge branch 'master' into date_string
yuqi1129 Jul 12, 2021
e5a6c7d
types: year function can't handle some date string, resolve comment 1
yuqi1129 Jul 14, 2021
96f549f
Merge remote-tracking branch 'me/date_string' into date_string
yuqi1129 Jul 14, 2021
1452926
types: year function can't handle some date string, resolve comment 2
yuqi1129 Jul 14, 2021
abe8f99
types: year function can't handle some date string, resolve comment 3
yuqi1129 Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion types/time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
gotime "time"
"unicode"

"github.com/cznic/mathutil"
"github.com/pingcap/errors"
"github.com/pingcap/parser/mysql"
"github.com/pingcap/parser/terror"
Expand Down Expand Up @@ -775,7 +776,16 @@ func ParseDateFormat(format string) []string {
}
}

seps = append(seps, format[start:])
var end = 0
for end = start; end < len(format) && !isValidSeparator(format[end], len(seps)); end++ {

}

end = mathutil.Min(end, len(format))
Copy link
Contributor

Choose a reason for hiding this comment

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

IIRC golang builtin provides math.Min already, and github.com/cznic/mathutil is archived.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tisonkun You mean the built-in math.Min?, it only has double64 parameter method, correct me if i'am wrong

if end != start {
seps = append(seps, format[start:end])
}

return seps
}

Expand Down
20 changes: 20 additions & 0 deletions types/time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,17 @@ func (s *testTimeSuite) TestDateTime(c *C) {
{"2020-05-28 23:59:59T T00:00:00", "2020-05-28 23:59:59"},
{"2020-10-22 10:31-10:12", "2020-10-22 10:31:10"},
{"2018.01.01 01:00:00", "2018-01-01 01:00:00"},

// For issue 26151
{"2018.01.01 01:", "2018-01-01 01:00:00"},
{"2018.01.01 01:::::", "2018-01-01 01:00:00"},
{"2018.01.01 01:05:", "2018-01-01 01:05:00"},
{"2018.01.01 01:05:", "2018-01-01 01:05:00"},
{"2018.01.01 01:05:00::::", "2018-01-01 01:05:00"},
{"2020|5|4|||01|", "2020-05-04 01:00:00"},
{"2020|5|4|;|01;02 ", "2020-05-04 01:02:00"},
{"2020|5|4;;;01,02|03 ", "2020-05-04 01:02:03"},
{" 2020|5|'';.'4,|;#' ", "2020-05-04 00:00:00"},
}

for _, test := range table {
Expand Down Expand Up @@ -276,6 +287,15 @@ func (s *testTimeSuite) TestDate(c *C) {
{"2011~/.12)_#13T T.12~)12[~12", "2011-12-13"},
// combinations
{" 2011----12----13 ", "2011-12-13"},
{" 2011----12----13 ", "2011-12-13"},
{"2011----12----13------ ", "2011-12-13"},
{" 2011----12----13-----", "2011-12-13"},
{"2020|5|4|||", "2020-05-04"},
{"2020|5|4| ", "2020-05-04"},
{"2020|5|4| ", "2020-05-04"},
{"2020|;;5||4|:;", "2020-05-04"},
{"2020|5|'';.'4,|;#'", "2020-05-04"},
{" 2020|5|'';.'4,|;#' ", "2020-05-04"},
}

for _, test := range table {
Expand Down