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

util/types: re-implement check time related #2233

Merged
merged 20 commits into from
Dec 14, 2016
Merged

util/types: re-implement check time related #2233

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
47ebaab
*: types.TimeInternal GoTime method would return error
tiancaiamao Dec 6, 2016
9c03502
recover checkTime
tiancaiamao Dec 6, 2016
d1e394c
address comment
tiancaiamao Dec 7, 2016
3c103db
util/time: ToPackedUint would return error for invalid timestamp
tiancaiamao Dec 7, 2016
6c964c9
util/types: fix bug parseFrac overflow ignored during time Parse
tiancaiamao Dec 8, 2016
0fa8e1a
fix and add more test
tiancaiamao Dec 8, 2016
06331ee
make golint happy
tiancaiamao Dec 8, 2016
3031d2f
util/types: provide time Format method
tiancaiamao Dec 8, 2016
b9b54c9
Merge branch 'master' into time
tiancaiamao Dec 9, 2016
57d3cbf
Merge branch 'tiancaiamao/overflow' into time
tiancaiamao Dec 9, 2016
6f79941
refact check method for Time
tiancaiamao Dec 10, 2016
0dfb6a1
Merge branch 'master' into time
tiancaiamao Dec 12, 2016
a23fb69
address comment
tiancaiamao Dec 13, 2016
09b521f
address comment
tiancaiamao Dec 13, 2016
b002458
address comment
tiancaiamao Dec 13, 2016
52e67b5
address comment
tiancaiamao Dec 13, 2016
c36a514
remove unused checkTimeType
tiancaiamao Dec 13, 2016
31dce0b
address comment
tiancaiamao Dec 13, 2016
f0b208f
address comment
tiancaiamao Dec 13, 2016
530195b
Merge branch 'master' into tiancaiamao/check-time
tiancaiamao Dec 14, 2016
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
3 changes: 0 additions & 3 deletions util/types/format_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
package types

import (
"fmt"

. "github.com/pingcap/check"
"github.com/pingcap/tidb/mysql"
)
Expand Down Expand Up @@ -57,7 +55,6 @@ func (s *testTimeSuite) TestTimeFormatMethod(c *C) {
for i, t := range tblDate {
tm, err := ParseTime(t.Input, mysql.TypeDatetime, 6)
c.Assert(err, IsNil, Commentf("parse time fail: %s", t.Input))
fmt.Println("lala", tm.Time.Microsecond())

str, err := tm.Format(t.Format)
c.Assert(err, IsNil, Commentf("time format fail: %d", i))
Expand Down
14 changes: 10 additions & 4 deletions util/types/mytime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ package types

import (
gotime "time"

"github.com/juju/errors"
)

type mysqlTime struct {
Expand Down Expand Up @@ -85,9 +83,17 @@ func (t mysqlTime) ISOWeek() (int, int) {
}

func (t mysqlTime) GoTime() (gotime.Time, error) {
err := checkTime(int(t.year), int(t.month), int(t.day), int(t.hour), int(t.minute), int(t.second), int(t.microsecond))
tm := gotime.Date(t.Year(), gotime.Month(t.Month()), t.Day(), t.Hour(), t.Minute(), t.Second(), t.Microsecond()*1000, gotime.Local)
return tm, errors.Trace(err)
year, month, day := tm.Date()
Copy link
Member

Choose a reason for hiding this comment

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

Please add comment for the following logic.

hour, minute, second := tm.Clock()
microsec := tm.Nanosecond() / 1000
var err error
if year != t.Year() || int(month) != t.Month() || day != t.Day() ||
hour != t.Hour() || minute != t.Minute() || second != t.Second() ||
microsec != t.Microsecond() {
err = ErrInvalidTimeFormat
Copy link
Member

Choose a reason for hiding this comment

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

return tm, err directly ? and we needn't init var at line 94

}
return tm, err
Copy link
Contributor

Choose a reason for hiding this comment

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

Add err trace.

}

func newMysqlTime(year, month, day, hour, minute, second, microsecond int) mysqlTime {
Expand Down
Loading