Skip to content

datetime: sync datetime range with Tarantool #192

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.

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

Merged
merged 1 commit into from
Jul 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 24 additions & 6 deletions datetime/datetime.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,33 @@ const (
tzOffsetSize = 2
)

// Limits are from c-dt library:
// https://github.com/tarantool/c-dt/blob/e6214325fe8d4336464ebae859ac2b456fd22b77/API.pod#introduction
// https://github.com/tarantool/tarantool/blob/a99ccce5f517d2a04670289d3d09a8cc2f5916f9/src/lib/core/datetime.h#L44-L61
const (
minSeconds = -185604722870400
maxSeconds = 185480451417600
)

const maxSize = secondsSize + nsecSize + tzIndexSize + tzOffsetSize

type Datetime struct {
time time.Time
}

// NewDatetime returns a pointer to a new datetime.Datetime that contains a
// specified time.Time.
func NewDatetime(t time.Time) *Datetime {
// specified time.Time. It may returns an error if the Time value is out of
// supported range: [-5879610-06-22T00:00Z .. 5879611-07-11T00:00Z]
func NewDatetime(t time.Time) (*Datetime, error) {
seconds := t.Unix()

if seconds < minSeconds || seconds > maxSeconds {
return nil, fmt.Errorf("Time %s is out of supported range.", t)
}

dt := new(Datetime)
dt.time = t
return dt
return dt, nil
}

// ToTime returns a time.Time that Datetime contains.
Expand Down Expand Up @@ -129,10 +144,13 @@ func (tm *Datetime) UnmarshalMsgpack(b []byte) error {
dt.tzOffset = int16(binary.LittleEndian.Uint16(b[secondsSize+nsecSize:]))
dt.tzIndex = int16(binary.LittleEndian.Uint16(b[secondsSize+nsecSize+tzOffsetSize:]))
}
tt := time.Unix(dt.seconds, int64(dt.nsec)).UTC()
*tm = *NewDatetime(tt)

return nil
tt := time.Unix(dt.seconds, int64(dt.nsec)).UTC()
dtp, err := NewDatetime(tt)
if dtp != nil {
*tm = *dtp
}
return err
}

func init() {
Expand Down
86 changes: 64 additions & 22 deletions datetime/datetime_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,22 @@ import (
"gopkg.in/vmihailenco/msgpack.v2"
)

var (
minTime = time.Unix(0, 0)
maxTime = time.Unix(1<<63-1, 999999999)
)
var lesserBoundaryTimes = []time.Time{
time.Date(-5879610, 06, 22, 0, 0, 1, 0, time.UTC),
time.Date(-5879610, 06, 22, 0, 0, 0, 1, time.UTC),
time.Date(5879611, 07, 10, 23, 59, 59, 0, time.UTC),
time.Date(5879611, 07, 10, 23, 59, 59, 999999999, time.UTC),
}

var boundaryTimes = []time.Time{
time.Date(-5879610, 06, 22, 0, 0, 0, 0, time.UTC),
time.Date(5879611, 07, 11, 0, 0, 0, 999999999, time.UTC),
}

var greaterBoundaryTimes = []time.Time{
time.Date(-5879610, 06, 21, 23, 59, 59, 999999999, time.UTC),
time.Date(5879611, 07, 11, 0, 0, 1, 0, time.UTC),
}

var isDatetimeSupported = false

Expand Down Expand Up @@ -63,10 +75,15 @@ func assertDatetimeIsEqual(t *testing.T, tuples []interface{}, tm time.Time) {
}

func tupleInsertSelectDelete(t *testing.T, conn *Connection, tm time.Time) {
dt := NewDatetime(tm)
t.Helper()

dt, err := NewDatetime(tm)
if err != nil {
t.Fatalf("Unable to create Datetime from %s: %s", tm, err)
}

// Insert tuple with datetime.
_, err := conn.Insert(spaceTuple1, []interface{}{dt, "payload"})
_, err = conn.Insert(spaceTuple1, []interface{}{dt, "payload"})
if err != nil {
t.Fatalf("Datetime insert failed: %s", err.Error())
}
Expand Down Expand Up @@ -172,22 +189,30 @@ func TestDatetimeInsertSelectDelete(t *testing.T) {
// time.Parse() could not parse formatted string with datetime where year is
// bigger than 9999. That's why testcase with maximum datetime value represented
// as a separate testcase. Testcase with minimal value added for consistency.
func TestDatetimeMax(t *testing.T) {
func TestDatetimeBoundaryRange(t *testing.T) {
skipIfDatetimeUnsupported(t)

conn := test_helpers.ConnectWithValidation(t, server, opts)
defer conn.Close()

tupleInsertSelectDelete(t, conn, maxTime)
for _, tm := range append(lesserBoundaryTimes, boundaryTimes...) {
t.Run(tm.String(), func(t *testing.T) {
tupleInsertSelectDelete(t, conn, tm)
})
}
}

func TestDatetimeMin(t *testing.T) {
func TestDatetimeOutOfRange(t *testing.T) {
skipIfDatetimeUnsupported(t)

conn := test_helpers.ConnectWithValidation(t, server, opts)
defer conn.Close()

tupleInsertSelectDelete(t, conn, minTime)
for _, tm := range greaterBoundaryTimes {
t.Run(tm.String(), func(t *testing.T) {
_, err := NewDatetime(tm)
if err == nil {
t.Errorf("Time %s should be unsupported!", tm)
}
})
}
}

func TestDatetimeReplace(t *testing.T) {
Expand All @@ -201,7 +226,10 @@ func TestDatetimeReplace(t *testing.T) {
t.Fatalf("Time parse failed: %s", err)
}

dt := NewDatetime(tm)
dt, err := NewDatetime(tm)
if err != nil {
t.Fatalf("Unable to create Datetime from %s: %s", tm, err)
}
resp, err := conn.Replace(spaceTuple1, []interface{}{dt, "payload"})
if err != nil {
t.Fatalf("Datetime replace failed: %s", err)
Expand Down Expand Up @@ -346,16 +374,24 @@ func TestCustomEncodeDecodeTuple1(t *testing.T) {
conn := test_helpers.ConnectWithValidation(t, server, opts)
defer conn.Close()

dt1, _ := time.Parse(time.RFC3339, "2010-05-24T17:51:56.000000009Z")
dt2, _ := time.Parse(time.RFC3339, "2022-05-24T17:51:56.000000009Z")
tm1, _ := time.Parse(time.RFC3339, "2010-05-24T17:51:56.000000009Z")
tm2, _ := time.Parse(time.RFC3339, "2022-05-24T17:51:56.000000009Z")
dt1, err := NewDatetime(tm1)
if err != nil {
t.Fatalf("Unable to create Datetime from %s: %s", tm1, err)
}
dt2, err := NewDatetime(tm2)
if err != nil {
t.Fatalf("Unable to create Datetime from %s: %s", tm2, err)
}
const cid = 13
const orig = "orig"

tuple := Tuple2{Cid: cid,
Orig: orig,
Events: []Event{
{*NewDatetime(dt1), "Minsk"},
{*NewDatetime(dt2), "Moscow"},
{*dt1, "Minsk"},
{*dt2, "Moscow"},
},
}
resp, err := conn.Replace(spaceTuple2, &tuple)
Expand Down Expand Up @@ -392,7 +428,7 @@ func TestCustomEncodeDecodeTuple1(t *testing.T) {
t.Fatalf("Unable to convert 2 field to []interface{}")
}

for i, tv := range []time.Time{dt1, dt2} {
for i, tv := range []time.Time{tm1, tm2} {
dt := events[i].([]interface{})[1].(Datetime)
if !dt.ToTime().Equal(tv) {
t.Fatalf("%v != %v", dt.ToTime(), tv)
Expand Down Expand Up @@ -450,8 +486,11 @@ func TestCustomEncodeDecodeTuple5(t *testing.T) {
defer conn.Close()

tm := time.Unix(500, 1000)
dt := NewDatetime(tm)
_, err := conn.Insert(spaceTuple1, []interface{}{dt})
dt, err := NewDatetime(tm)
if err != nil {
t.Fatalf("Unable to create Datetime from %s: %s", tm, err)
}
_, err = conn.Insert(spaceTuple1, []interface{}{dt})
if err != nil {
t.Fatalf("Datetime insert failed: %s", err.Error())
}
Expand Down Expand Up @@ -482,7 +521,10 @@ func TestMPEncode(t *testing.T) {
if err != nil {
t.Fatalf("Time (%s) parse failed: %s", testcase.dt, err)
}
dt := NewDatetime(tm)
dt, err := NewDatetime(tm)
if err != nil {
t.Fatalf("Unable to create Datetime from %s: %s", tm, err)
}
buf, err := msgpack.Marshal(dt)
if err != nil {
t.Fatalf("Marshalling failed: %s", err.Error())
Expand Down
6 changes: 5 additions & 1 deletion datetime/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ func Example() {
fmt.Printf("error in time.Parse() is %v", err)
return
}
dt := NewDatetime(tm)
dt, err := NewDatetime(tm)
if err != nil {
fmt.Printf("Unable to create Datetime from %s: %s", tm, err)
return
}

space := "testDatetime_1"
index := "primary"
Expand Down