Skip to content

Commit 949e6e0

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. The Tarantool datetime type is mapped to the pandas.Timestamp type. pandas.Timestamp was chosen 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. If you want to use numpy.datetime64 or datetime.datetime in your logic, you can use pandas converters in your code: - pandas.to_datetime(): numpy.datetime64 -> pandas.Timestamp - pandas.to_datetime(): datetime.datetime -> pandas.Timestamp - pandas.Timestamp.to_datetime64(): pandas.Timestamp -> numpy.datetime64 - pandas.Timestamp.to_pydatetime(): pandas.Timestamp -> datetime.datetime This patch does not yet introduce the support of timezones in datetime. 1. tarantool/tarantool#5941 Part of #204
1 parent 3ac6206 commit 949e6e0

File tree

6 files changed

+207
-5
lines changed

6 files changed

+207
-5
lines changed

requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
msgpack>=1.0.4
2+
pandas>=1.0.0
+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
import time
2+
import math
3+
import pandas
4+
5+
from tarantool.error import MsgpackWarning, warn
6+
7+
# https://www.tarantool.io/ru/doc/latest/dev_guide/internals/msgpack_extensions/#the-datetime-type
8+
#
9+
# The datetime MessagePack representation looks like this:
10+
# +---------+----------------+==========+-----------------+
11+
# | MP_EXT | MP_DATETIME | seconds | nsec; tzoffset; |
12+
# | = d7/d8 | = 4 | | tzindex; |
13+
# +---------+----------------+==========+-----------------+
14+
# MessagePack data contains:
15+
#
16+
# * Seconds (8 bytes) as an unencoded 64-bit signed integer stored in the
17+
# little-endian order.
18+
# * The optional fields (8 bytes), if any of them have a non-zero value.
19+
# The fields include nsec (4 bytes), tzoffset (2 bytes), and
20+
# tzindex (2 bytes) packed in the little-endian order.
21+
#
22+
# seconds is seconds since Epoch, where the epoch is the point where the time
23+
# starts, and is platform dependent. For Unix, the epoch is January 1,
24+
# 1970, 00:00:00 (UTC). Tarantool uses a double type, see a structure
25+
# definition in src/lib/core/datetime.h and reasons in
26+
# https://github.com/tarantool/tarantool/wiki/Datetime-internals#intervals-in-c
27+
#
28+
# nsec is nanoseconds, fractional part of seconds. Tarantool uses int32_t, see
29+
# a definition in src/lib/core/datetime.h.
30+
#
31+
# tzoffset is timezone offset in minutes from UTC. Tarantool uses a int16_t type,
32+
# see a structure definition in src/lib/core/datetime.h.
33+
#
34+
# tzindex is Olson timezone id. Tarantool uses a int16_t type, see a structure
35+
# definition in src/lib/core/datetime.h. If both tzoffset and tzindex are
36+
# specified, tzindex has the preference and the tzoffset value is ignored.
37+
38+
EXT_ID = 4
39+
40+
SECONDS_SIZE_BYTES = 8
41+
NSEC_SIZE_BYTES = 4
42+
TZOFFSET_SIZE_BYTES = 2
43+
TZINDEX_SIZE_BYTES = 2
44+
45+
BYTEORDER = 'little'
46+
47+
NSEC_IN_SEC = 1000000000
48+
assert isinstance(NSEC_IN_SEC, int)
49+
50+
def encode(obj):
51+
seconds = obj.value // NSEC_IN_SEC
52+
nsec = obj.value % NSEC_IN_SEC
53+
tzoffset = 0
54+
tzindex = 0
55+
56+
bytes_buffer = bytes(seconds.to_bytes(SECONDS_SIZE_BYTES,
57+
byteorder=BYTEORDER))
58+
59+
if (nsec != 0) or (tzoffset != 0) or (tzindex != 0):
60+
bytes_buffer = bytes_buffer + nsec.to_bytes(NSEC_SIZE_BYTES,
61+
byteorder=BYTEORDER)
62+
bytes_buffer = bytes_buffer + tzoffset.to_bytes(TZOFFSET_SIZE_BYTES,
63+
byteorder=BYTEORDER)
64+
bytes_buffer = bytes_buffer + tzindex.to_bytes(TZINDEX_SIZE_BYTES,
65+
byteorder=BYTEORDER)
66+
67+
return bytes_buffer
68+
69+
def get_bytes_as_int(data, cursor, size):
70+
part = data[cursor:cursor + size]
71+
return int.from_bytes(part, BYTEORDER), cursor + size
72+
73+
def decode(data):
74+
cursor = 0
75+
seconds, cursor = get_bytes_as_int(data, cursor, SECONDS_SIZE_BYTES)
76+
77+
if len(data) > SECONDS_SIZE_BYTES:
78+
nsec, cursor = get_bytes_as_int(data, cursor, NSEC_SIZE_BYTES)
79+
tzoffset, cursor = get_bytes_as_int(data, cursor, TZOFFSET_SIZE_BYTES)
80+
tzindex, cursor = get_bytes_as_int(data, cursor, TZINDEX_SIZE_BYTES)
81+
else:
82+
nsec = 0
83+
tzoffset = 0
84+
tzindex = 0
85+
86+
if (tzoffset != 0) or (tzindex != 0):
87+
raise NotImplementedError
88+
89+
total_nsec = seconds * NSEC_IN_SEC + nsec
90+
91+
return pandas.to_datetime(total_nsec, unit='ns')

tarantool/msgpack_ext_types/packer.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1+
import pandas
12
from decimal import Decimal
23
from uuid import UUID
34
from msgpack import ExtType
45

56
import tarantool.msgpack_ext_types.decimal as ext_decimal
67
import tarantool.msgpack_ext_types.uuid as ext_uuid
8+
import tarantool.msgpack_ext_types.datetime as ext_datetime
79

810
encoders = [
9-
{'type': Decimal, 'ext': ext_decimal},
10-
{'type': UUID, 'ext': ext_uuid },
11+
{'type': Decimal, 'ext': ext_decimal },
12+
{'type': UUID, 'ext': ext_uuid },
13+
{'type': pandas.Timestamp, 'ext': ext_datetime},
1114
]
1215

1316
def default(obj):

tarantool/msgpack_ext_types/unpacker.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import tarantool.msgpack_ext_types.decimal as ext_decimal
22
import tarantool.msgpack_ext_types.uuid as ext_uuid
3+
import tarantool.msgpack_ext_types.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):

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')

test/suites/test_msgpack_ext_types.py

+95-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@
99
import msgpack
1010
import warnings
1111
import tarantool
12+
import pandas
1213

1314
from tarantool.msgpack_ext_types.packer import default as packer_default
1415
from tarantool.msgpack_ext_types.unpacker import ext_hook as unpacker_ext_hook
1516

1617
from .lib.tarantool_server import TarantoolServer
17-
from .lib.skip import skip_or_run_decimal_test, skip_or_run_UUID_test
18+
from .lib.skip import (
19+
skip_or_run_datetime_test, skip_or_run_decimal_test,
20+
skip_or_run_UUID_test,)
1821
from tarantool.error import MsgpackError, MsgpackWarning
1922

2023
class TestSuite_MsgpackExtTypes(unittest.TestCase):
@@ -30,6 +33,7 @@ def setUpClass(self):
3033
self.adm(r"""
3134
_, decimal = pcall(require, 'decimal')
3235
_, uuid = pcall(require, 'uuid')
36+
_, datetime = pcall(require, 'datetime')
3337
3438
box.schema.space.create('test')
3539
box.space['test']:create_index('primary', {
@@ -499,6 +503,96 @@ def test_UUID_tarantool_encode(self):
499503

500504
self.assertSequenceEqual(self.con.eval(lua_eval), [True])
501505

506+
507+
datetime_cases = [
508+
{
509+
'python': pandas.Timestamp(year=1970, month=1, day=1),
510+
'msgpack': (b'\x00\x00\x00\x00\x00\x00\x00\x00'),
511+
'tarantool': r"datetime.new({year=1970, month=1, day=1})",
512+
},
513+
{
514+
'python': pandas.Timestamp(year=2022, month=8, day=31),
515+
'msgpack': (b'\x80\xa4\x0e\x63\x00\x00\x00\x00'),
516+
'tarantool': r"datetime.new({year=2022, month=8, day=31})",
517+
},
518+
{
519+
'python': pandas.Timestamp(year=2022, month=8, day=31, hour=18, minute=7),
520+
'msgpack': (b'\x44\xa3\x0f\x63\x00\x00\x00\x00'),
521+
'tarantool': r"datetime.new({year=2022, month=8, day=31, hour=18, min=7})",
522+
},
523+
{
524+
'python': pandas.Timestamp(year=2022, month=8, day=31, hour=18, minute=7, second=54),
525+
'msgpack': (b'\x7a\xa3\x0f\x63\x00\x00\x00\x00'),
526+
'tarantool': r"datetime.new({year=2022, month=8, day=31, hour=18, min=7, sec=54})",
527+
},
528+
{
529+
'python': pandas.Timestamp(year=2022, month=8, day=31, hour=18, minute=7, second=54,
530+
microsecond=308543),
531+
'msgpack': (b'\x7a\xa3\x0f\x63\x00\x00\x00\x00\x18\xfe\x63\x12\x00\x00\x00\x00'),
532+
'tarantool': r"datetime.new({year=2022, month=8, day=31, hour=18, min=7, sec=54, " +
533+
r"nsec=308543000})",
534+
},
535+
{
536+
'python': pandas.Timestamp(year=2022, month=8, day=31, hour=18, minute=7, second=54,
537+
microsecond=308543, nanosecond=321),
538+
'msgpack': (b'\x7a\xa3\x0f\x63\x00\x00\x00\x00\x59\xff\x63\x12\x00\x00\x00\x00'),
539+
'tarantool': r"datetime.new({year=2022, month=8, day=31, hour=18, min=7, sec=54, " +
540+
r"nsec=308543321})",
541+
},
542+
]
543+
544+
def test_datetime_msgpack_decode(self):
545+
for i in range(len(self.datetime_cases)):
546+
with self.subTest(msg=str(i)):
547+
datetime_case = self.datetime_cases[i]
548+
549+
self.assertEqual(unpacker_ext_hook(4, datetime_case['msgpack']),
550+
datetime_case['python'])
551+
552+
@skip_or_run_datetime_test
553+
def test_datetime_tarantool_decode(self):
554+
for i in range(len(self.datetime_cases)):
555+
with self.subTest(msg=str(i)):
556+
datetime_case = self.datetime_cases[i]
557+
558+
self.adm(f"box.space['test']:replace{{{i}, {datetime_case['tarantool']}}}")
559+
560+
self.assertSequenceEqual(self.con.select('test', i),
561+
[[i, datetime_case['python']]])
562+
563+
def test_datetime_msgpack_encode(self):
564+
for i in range(len(self.datetime_cases)):
565+
with self.subTest(msg=str(i)):
566+
datetime_case = self.datetime_cases[i]
567+
568+
self.assertEqual(packer_default(datetime_case['python']),
569+
msgpack.ExtType(code=4, data=datetime_case['msgpack']))
570+
571+
@skip_or_run_datetime_test
572+
def test_datetime_msgpack_encode(self):
573+
for i in range(len(self.datetime_cases)):
574+
with self.subTest(msg=str(i)):
575+
datetime_case = self.datetime_cases[i]
576+
577+
self.con.insert('test', [i, datetime_case['python']])
578+
579+
lua_eval = f"""
580+
local dt = {datetime_case['tarantool']}
581+
582+
local tuple = box.space['test']:get({i})
583+
assert(tuple ~= nil)
584+
585+
if tuple[2] == dt then
586+
return true
587+
else
588+
return nil, ('%s is not equal to expected %s'):format(
589+
tostring(tuple[2]), tostring(dt))
590+
end
591+
"""
592+
593+
self.assertSequenceEqual(self.adm(lua_eval), [True])
594+
595+
502596
@classmethod
503597
def tearDownClass(self):
504598
self.con.close()

0 commit comments

Comments
 (0)