Skip to content

Commit 7c37a69

Browse files
msgpack: support datetime extended type
Tarantool supports datetime type since version 2.10.0 [1]. This patch introduced the support of Tarantool datetime type in msgpack decoders and encoders. Tarantool datetime objects are decoded to `tarantool.Datetime` type. `tarantool.Datetime` and `pandas.Timestamp` may be encoded to Tarantool datetime objects. `tarantool.Datetime` is basically a `pandas.Timestamp` wrapper. You can create `tarantool.Datetime` objects - from `pandas.Timestamp` object, - by using the same API as in `pandas.Timestamp()` [2], - from another `tarantool.Datetime` object. To work with datetime data as a `pandas.Timestamp`, convert `tarantool.Datetime` object to a `pandas.Timestamp` with `to_pd_timestamp()` method call. You can use this `pandas.Timestamp` object to build a `tarantool.Datetime` object before sending data to Tarantool. To work with data as `numpy.datetime64` or `datetime.datetime`, convert to a `pandas.Timestamp` and then use `to_datetime64()` or `to_datetime()` converter. pandas.Timestamp was chosen to store data because it could be used to store both nanoseconds and timezone information. In-build Python datetime.datetime supports microseconds at most, numpy.datetime64 do not support timezones. There are two reasons to use custom type instead of plain pandas.Timestamp: - tzindex may be lost on conversion to pandas.Timestamp - Tarantool datetime interval type is planned to be stored in custom type tarantool.Interval and we'll need a way to support arithmetic between datetime and interval. This patch does not yet introduce the support of timezones in datetime. 1. tarantool/tarantool#5941 2. https://pandas.pydata.org/docs/reference/api/pandas.Timestamp.html Part of #204
1 parent c70dfa6 commit 7c37a69

File tree

11 files changed

+369
-7
lines changed

11 files changed

+369
-7
lines changed

Diff for: CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Added
1010
- Decimal type support (#203).
1111
- UUID type support (#202).
12+
- Datetime type support and tarantool.Datetime type (#204).
13+
14+
Tarantool datetime objects are decoded to `tarantool.Datetime`
15+
type. `tarantool.Datetime` and `pandas.Timestamp` may be encoded
16+
to Tarantool datetime objects.
17+
18+
`tarantool.Datetime` is basically a `pandas.Timestamp` wrapper.
19+
You can create `tarantool.Datetime` objects
20+
- from `pandas.Timestamp` object,
21+
- by using the same API as in `pandas.Timestamp()`,
22+
- from another `tarantool.Datetime` object.
23+
24+
To work with datetime data as a `pandas.Timestamp`, convert
25+
`tarantool.Datetime` object to a `pandas.Timestamp` with
26+
`to_pd_timestamp()` method call. You can use this
27+
`pandas.Timestamp` object to build a `tarantool.Datetime`
28+
object before sending data to Tarantool.
29+
30+
To work with data as `numpy.datetime64` or `datetime.datetime`,
31+
convert to a `pandas.Timestamp` and then use `to_datetime64()`
32+
or `to_datetime()` converter.
1233

1334
### Changed
1435
- Bump msgpack requirement to 1.0.4 (PR #223).

Diff for: requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
msgpack>=1.0.4
2+
pandas

Diff for: tarantool/__init__.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
ENCODING_DEFAULT,
3333
)
3434

35+
from tarantool.msgpack_ext.types.datetime import (
36+
Datetime,
37+
)
38+
3539
__version__ = "0.9.0"
3640

3741

@@ -91,7 +95,7 @@ def connectmesh(addrs=({'host': 'localhost', 'port': 3301},), user=None,
9195

9296
__all__ = ['connect', 'Connection', 'connectmesh', 'MeshConnection', 'Schema',
9397
'Error', 'DatabaseError', 'NetworkError', 'NetworkWarning',
94-
'SchemaError', 'dbapi']
98+
'SchemaError', 'dbapi', 'Datetime']
9599

96100
# ConnectionPool is supported only for Python 3.7 or newer.
97101
if sys.version_info.major >= 3 and sys.version_info.minor >= 7:

Diff for: tarantool/error.py

+10
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ class MsgpackWarning(UserWarning):
119119
Warning with encoding or decoding of MP_EXT types
120120
'''
121121

122+
class ExtTypeError(ValueError):
123+
'''
124+
Error related to tarantool.Datetime type
125+
'''
126+
127+
class ExtTypeWarning(UserWarning):
128+
'''
129+
Warning related to tarantool.Datetime type
130+
'''
131+
122132
__all__ = ("Warning", "Error", "InterfaceError", "DatabaseError", "DataError",
123133
"OperationalError", "IntegrityError", "InternalError",
124134
"ProgrammingError", "NotSupportedError", "MsgpackError",

Diff for: tarantool/msgpack_ext/datetime.py

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
from tarantool.msgpack_ext.types.datetime import Datetime
2+
3+
EXT_ID = 4
4+
5+
def encode(obj):
6+
return obj.msgpack_encode()
7+
8+
def encode_pd_timestamp(obj):
9+
return Datetime(obj).msgpack_encode()
10+
11+
def decode(data):
12+
return Datetime(data)

Diff for: tarantool/msgpack_ext/packer.py

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,39 @@
11
from decimal import Decimal
22
from uuid import UUID
33
from msgpack import ExtType
4+
import pandas
5+
6+
from tarantool.msgpack_ext.types.datetime import Datetime
47

58
import tarantool.msgpack_ext.decimal as ext_decimal
69
import tarantool.msgpack_ext.uuid as ext_uuid
10+
import tarantool.msgpack_ext.datetime as ext_datetime
711

812
encoders = [
9-
{'type': Decimal, 'ext': ext_decimal},
10-
{'type': UUID, 'ext': ext_uuid },
13+
{
14+
'type': Decimal,
15+
'ext_id': ext_decimal.EXT_ID,
16+
'encoder': ext_decimal.encode,
17+
},
18+
{
19+
'type': UUID,
20+
'ext_id': ext_uuid.EXT_ID,
21+
'encoder': ext_uuid.encode,
22+
},
23+
{
24+
'type': Datetime,
25+
'ext_id': ext_datetime.EXT_ID,
26+
'encoder': ext_datetime.encode,
27+
},
28+
{
29+
'type': pandas.Timestamp,
30+
'ext_id': ext_datetime.EXT_ID,
31+
'encoder': ext_datetime.encode_pd_timestamp,
32+
},
1133
]
1234

1335
def default(obj):
1436
for encoder in encoders:
1537
if isinstance(obj, encoder['type']):
16-
return ExtType(encoder['ext'].EXT_ID, encoder['ext'].encode(obj))
38+
return ExtType(encoder['ext_id'], encoder['encoder'](obj))
1739
raise TypeError("Unknown type: %r" % (obj,))

Diff for: tarantool/msgpack_ext/types/datetime.py

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
from copy import deepcopy
2+
3+
import pandas
4+
5+
# https://www.tarantool.io/en/doc/latest/dev_guide/internals/msgpack_extensions/#the-datetime-type
6+
#
7+
# The datetime MessagePack representation looks like this:
8+
# +---------+----------------+==========+-----------------+
9+
# | MP_EXT | MP_DATETIME | seconds | nsec; tzoffset; |
10+
# | = d7/d8 | = 4 | | tzindex; |
11+
# +---------+----------------+==========+-----------------+
12+
# MessagePack data contains:
13+
#
14+
# * Seconds (8 bytes) as an unencoded 64-bit signed integer stored in the
15+
# little-endian order.
16+
# * The optional fields (8 bytes), if any of them have a non-zero value.
17+
# The fields include nsec (4 bytes), tzoffset (2 bytes), and
18+
# tzindex (2 bytes) packed in the little-endian order.
19+
#
20+
# seconds is seconds since Epoch, where the epoch is the point where the time
21+
# starts, and is platform dependent. For Unix, the epoch is January 1,
22+
# 1970, 00:00:00 (UTC). Tarantool uses a double type, see a structure
23+
# definition in src/lib/core/datetime.h and reasons in
24+
# https://github.com/tarantool/tarantool/wiki/Datetime-internals#intervals-in-c
25+
#
26+
# nsec is nanoseconds, fractional part of seconds. Tarantool uses int32_t, see
27+
# a definition in src/lib/core/datetime.h.
28+
#
29+
# tzoffset is timezone offset in minutes from UTC. Tarantool uses a int16_t type,
30+
# see a structure definition in src/lib/core/datetime.h.
31+
#
32+
# tzindex is Olson timezone id. Tarantool uses a int16_t type, see a structure
33+
# definition in src/lib/core/datetime.h. If both tzoffset and tzindex are
34+
# specified, tzindex has the preference and the tzoffset value is ignored.
35+
36+
SECONDS_SIZE_BYTES = 8
37+
NSEC_SIZE_BYTES = 4
38+
TZOFFSET_SIZE_BYTES = 2
39+
TZINDEX_SIZE_BYTES = 2
40+
41+
BYTEORDER = 'little'
42+
43+
NSEC_IN_SEC = 1000000000
44+
45+
46+
def get_bytes_as_int(data, cursor, size):
47+
part = data[cursor:cursor + size]
48+
return int.from_bytes(part, BYTEORDER, signed=True), cursor + size
49+
50+
def get_int_as_bytes(data, size):
51+
return data.to_bytes(size, byteorder=BYTEORDER, signed=True)
52+
53+
def msgpack_decode(data):
54+
cursor = 0
55+
seconds, cursor = get_bytes_as_int(data, cursor, SECONDS_SIZE_BYTES)
56+
57+
if len(data) > SECONDS_SIZE_BYTES:
58+
nsec, cursor = get_bytes_as_int(data, cursor, NSEC_SIZE_BYTES)
59+
tzoffset, cursor = get_bytes_as_int(data, cursor, TZOFFSET_SIZE_BYTES)
60+
tzindex, cursor = get_bytes_as_int(data, cursor, TZINDEX_SIZE_BYTES)
61+
else:
62+
nsec = 0
63+
tzoffset = 0
64+
tzindex = 0
65+
66+
if (tzoffset != 0) or (tzindex != 0):
67+
raise NotImplementedError
68+
69+
total_nsec = seconds * NSEC_IN_SEC + nsec
70+
71+
timestamp = pandas.to_datetime(total_nsec, unit='ns')
72+
return timestamp, tzoffset, tzindex
73+
74+
class Datetime():
75+
def __init__(self, *args, **kwargs):
76+
if len(args) > 0:
77+
data = args[0]
78+
if isinstance(data, bytes):
79+
timestamp, tzoffset, tzindex = msgpack_decode(data)
80+
elif isinstance(data, pandas.Timestamp):
81+
timestamp = deepcopy(data)
82+
elif isinstance(data, Datetime):
83+
timestamp = deepcopy(data._timestamp)
84+
else:
85+
timestamp = pandas.Timestamp(*args, **kwargs)
86+
87+
self._timestamp = timestamp
88+
89+
def __eq__(self, other):
90+
if isinstance(other, Datetime):
91+
return self._timestamp == other._timestamp
92+
elif isinstance(other, pandas.Timestamp):
93+
return self._timestamp == other
94+
else:
95+
return False
96+
def __str__(self):
97+
return f'tarantool.Datetime(timestamp={self._timestamp})'
98+
99+
def __repr__(self):
100+
return f'tarantool.Datetime(timestamp={self._timestamp})'
101+
102+
def to_pd_timestamp(self):
103+
return deepcopy(self._timestamp)
104+
105+
def msgpack_encode(self):
106+
ts_value = self._timestamp.value
107+
108+
seconds = ts_value // NSEC_IN_SEC
109+
nsec = ts_value % NSEC_IN_SEC
110+
tzoffset = 0
111+
tzindex = 0
112+
113+
buf = get_int_as_bytes(seconds, SECONDS_SIZE_BYTES)
114+
115+
if (nsec != 0) or (tzoffset != 0) or (tzindex != 0):
116+
buf = buf + get_int_as_bytes(nsec, NSEC_SIZE_BYTES)
117+
buf = buf + get_int_as_bytes(tzoffset, TZOFFSET_SIZE_BYTES)
118+
buf = buf + get_int_as_bytes(tzindex, TZINDEX_SIZE_BYTES)
119+
120+
return buf

Diff for: tarantool/msgpack_ext/unpacker.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import tarantool.msgpack_ext.decimal as ext_decimal
22
import tarantool.msgpack_ext.uuid as ext_uuid
3+
import tarantool.msgpack_ext.datetime as ext_datetime
34

45
decoders = {
5-
ext_decimal.EXT_ID: ext_decimal.decode,
6-
ext_uuid.EXT_ID : ext_uuid.decode ,
6+
ext_decimal.EXT_ID : ext_decimal.decode ,
7+
ext_uuid.EXT_ID : ext_uuid.decode ,
8+
ext_datetime.EXT_ID: ext_datetime.decode,
79
}
810

911
def ext_hook(code, data):

Diff for: test/suites/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
from .test_ssl import TestSuite_Ssl
1818
from .test_decimal import TestSuite_Decimal
1919
from .test_uuid import TestSuite_UUID
20+
from .test_datetime import TestSuite_Datetime
2021

2122
test_cases = (TestSuite_Schema_UnicodeConnection,
2223
TestSuite_Schema_BinaryConnection,
2324
TestSuite_Request, TestSuite_Protocol, TestSuite_Reconnect,
2425
TestSuite_Mesh, TestSuite_Execute, TestSuite_DBAPI,
2526
TestSuite_Encoding, TestSuite_Pool, TestSuite_Ssl,
26-
TestSuite_Decimal, TestSuite_UUID)
27+
TestSuite_Decimal, TestSuite_UUID, TestSuite_Datetime)
2728

2829
def load_tests(loader, tests, pattern):
2930
suite = unittest.TestSuite()

Diff for: test/suites/lib/skip.py

+11
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,14 @@ def skip_or_run_UUID_test(func):
154154

155155
return skip_or_run_test_tarantool(func, '2.4.1',
156156
'does not support UUID type')
157+
158+
def skip_or_run_datetime_test(func):
159+
"""Decorator to skip or run datetime-related tests depending on
160+
the tarantool version.
161+
162+
Tarantool supports datetime type only since 2.10.0 version.
163+
See https://github.com/tarantool/tarantool/issues/5941
164+
"""
165+
166+
return skip_or_run_test_pcall_require(func, 'datetime',
167+
'does not support datetime type')

0 commit comments

Comments
 (0)