Skip to content

Commit 938d44b

Browse files
committed
datetime: add TZ support
The patch adds timezone support [1] for datetime. For the purpose of compatibility we got constants for timezones from Tarantool [2]. The patch adds a script to generate the data according to the instructions [3]. 1. https://github.com/tarantool/tarantool/wiki/Datetime-Internals#timezone-support 2. https://github.com/tarantool/tarantool/blob/9ee45289e01232b8df1413efea11db170ae3b3b4/src/lib/tzcode/timezones.h 3. https://github.com/tarantool/tarantool/blob/9ee45289e01232b8df1413efea11db170ae3b3b4/src/lib/tzcode/gen-zone-abbrevs.pl#L35-L39 Closes #163
1 parent 65a6de4 commit 938d44b

8 files changed

+1848
-68
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
1111
### Added
1212

1313
- Optional msgpack.v5 usage (#124)
14+
- TZ support for datetime (#163)
1415

1516
### Changed
1617

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ clean:
2424
deps: clean
2525
( cd ./queue; tarantoolctl rocks install queue 1.1.0 )
2626

27+
.PHONY: datetime-timezones
28+
datetime-timezones:
29+
(cd ./datetime; ./gen-timezones.sh)
30+
2731
.PHONY: format
2832
format:
2933
goimports -l -w .

datetime/datetime.go

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ package datetime
1212
import (
1313
"encoding/binary"
1414
"fmt"
15+
"math"
1516
"time"
1617
)
1718

@@ -47,13 +48,11 @@ type datetime struct {
4748
// Nanoseconds, fractional part of seconds. Tarantool uses int32_t, see
4849
// a definition in src/lib/core/datetime.h.
4950
nsec int32
50-
// Timezone offset in minutes from UTC (not implemented in Tarantool,
51-
// see gh-163). Tarantool uses a int16_t type, see a structure
52-
// definition in src/lib/core/datetime.h.
51+
// Timezone offset in minutes from UTC. Tarantool uses a int16_t type,
52+
// see a structure definition in src/lib/core/datetime.h.
5353
tzOffset int16
54-
// Olson timezone id (not implemented in Tarantool, see gh-163).
55-
// Tarantool uses a int16_t type, see a structure definition in
56-
// src/lib/core/datetime.h.
54+
// Olson timezone id. Tarantool uses a int16_t type, see a structure
55+
// definition in src/lib/core/datetime.h.
5756
tzIndex int16
5857
}
5958

@@ -79,16 +78,39 @@ type Datetime struct {
7978
time time.Time
8079
}
8180

81+
const (
82+
// NoTimezone allows to create a datetime without UTC timezone for
83+
// Tarantool. The problem is that Golang by default creates a time value
84+
// with UTC timezone. So it is a way to create a datetime without timezone.
85+
NoTimezone = ""
86+
)
87+
88+
var noTimezoneLoc = time.FixedZone(NoTimezone, 0)
89+
8290
// NewDatetime returns a pointer to a new datetime.Datetime that contains a
83-
// specified time.Time. It may returns an error if the Time value is out of
84-
// supported range: [-5879610-06-22T00:00Z .. 5879611-07-11T00:00Z]
91+
// specified time.Time. It may return an error if the Time value is out of
92+
// supported range: [-5879610-06-22T00:00Z .. 5879611-07-11T00:00Z] or
93+
// an invalid timezone or offset value is out of supported range:
94+
// [math.MinInt16, math.MaxInt16]
8595
func NewDatetime(t time.Time) (*Datetime, error) {
8696
seconds := t.Unix()
8797

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

102+
zone, offset := t.Zone()
103+
if zone != NoTimezone {
104+
if _, ok := timezoneToIndex[zone]; !ok {
105+
return nil, fmt.Errorf("Unknown timezone %s with offset %d",
106+
zone, offset)
107+
}
108+
}
109+
offset /= 60
110+
if offset < math.MinInt16 || offset > math.MaxInt16 {
111+
return nil, fmt.Errorf("Offset must be between %d and %d", math.MinInt16, math.MaxInt16)
112+
}
113+
92114
dt := new(Datetime)
93115
dt.time = t
94116
return dt, nil
@@ -105,8 +127,14 @@ func (dtime *Datetime) MarshalMsgpack() ([]byte, error) {
105127
var dt datetime
106128
dt.seconds = tm.Unix()
107129
dt.nsec = int32(tm.Nanosecond())
108-
dt.tzIndex = 0 // It is not implemented, see gh-163.
109-
dt.tzOffset = 0 // It is not implemented, see gh-163.
130+
131+
zone, offset := tm.Zone()
132+
if zone != NoTimezone {
133+
// The zone value already checked in NewDatetime() or
134+
// UnmarshalMsgpack() calls.
135+
dt.tzIndex = int16(timezoneToIndex[zone])
136+
}
137+
dt.tzOffset = int16(offset / 60)
110138

111139
var bytesSize = secondsSize
112140
if dt.nsec != 0 || dt.tzOffset != 0 || dt.tzIndex != 0 {
@@ -127,7 +155,7 @@ func (dtime *Datetime) MarshalMsgpack() ([]byte, error) {
127155
func (tm *Datetime) UnmarshalMsgpack(b []byte) error {
128156
l := len(b)
129157
if l != maxSize && l != secondsSize {
130-
return fmt.Errorf("invalid data length: got %d, wanted %d or %d", len(b), secondsSize, maxSize)
158+
return fmt.Errorf("Invalid data length: got %d, wanted %d or %d", len(b), secondsSize, maxSize)
131159
}
132160

133161
var dt datetime
@@ -140,7 +168,23 @@ func (tm *Datetime) UnmarshalMsgpack(b []byte) error {
140168
dt.tzIndex = int16(binary.LittleEndian.Uint16(b[secondsSize+nsecSize+tzOffsetSize:]))
141169
}
142170

143-
tt := time.Unix(dt.seconds, int64(dt.nsec)).UTC()
171+
tt := time.Unix(dt.seconds, int64(dt.nsec))
172+
173+
loc := noTimezoneLoc
174+
if dt.tzIndex != 0 || dt.tzOffset != 0 {
175+
zone := NoTimezone
176+
offset := int(dt.tzOffset) * 60
177+
178+
if dt.tzIndex != 0 {
179+
if _, ok := indexToTimezone[int(dt.tzIndex)]; !ok {
180+
return fmt.Errorf("Unknown timezone index %d", dt.tzIndex)
181+
}
182+
zone = indexToTimezone[int(dt.tzIndex)]
183+
}
184+
loc = time.FixedZone(zone, offset)
185+
}
186+
tt = tt.In(loc)
187+
144188
dtp, err := NewDatetime(tt)
145189
if dtp != nil {
146190
*tm = *dtp

0 commit comments

Comments
 (0)