Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Commit

Permalink
fix issue 49 get/mget with empty series (#50)
Browse files Browse the repository at this point in the history
* fix issue 49 get/mget with empty series
  • Loading branch information
Ariel Shtul authored Feb 19, 2020
1 parent d9a2246 commit 73dfcc4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 8 deletions.
15 changes: 12 additions & 3 deletions redistimeseries/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,20 @@ def parse_m_range(response):
parse_range(item[2])]})
return res

def parse_get(response):
if response == []:
return None
return (int(response[0]), float(response[1]))

def parse_m_get(response):
res = []
for item in response:
res.append({ nativestr(item[0]) : [list_to_dict(item[1]),
item[2][0], float(item[2][1])]})
if item[2] == []:
res.append({ nativestr(item[0]) : [list_to_dict(item[1]), None, None]})
else:
res.append({ nativestr(item[0]) : [list_to_dict(item[1]),
int(item[2][0]), float(item[2][1])]})

return res

def parseToList(response):
Expand Down Expand Up @@ -92,7 +101,7 @@ def __init__(self, *args, **kwargs):
self.DELETERULE_CMD : bool_ok,
self.RANGE_CMD : parse_range,
self.MRANGE_CMD : parse_m_range,
self.GET_CMD : lambda x: (int(x[0]), float(x[1])),
self.GET_CMD : parse_get,
self.MGET_CMD : parse_m_get,
self.INFO_CMD : TSInfo,
self.QUERYINDEX_CMD : parseToList,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def read_all(f):

setup(
name='redistimeseries',
version='0.7.0',
version='0.7.1',
description='RedisTimeSeries Python Client',
long_description=read_all("README.md"),
long_description_content_type='text/markdown',
Expand Down
14 changes: 10 additions & 4 deletions test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,21 @@ def testMultiRange(self):
def testGet(self):
'''Test TS.GET calls'''

rts.add(1, 2, 3)
self.assertEqual(2, rts.get(1)[0])
rts.add(1, 3, 4)
self.assertEqual(4, rts.get(1)[1])
name = 'test'
rts.create(name)
self.assertEqual(None, rts.get(name))
rts.add(name, 2, 3)
self.assertEqual(2, rts.get(name)[0])
rts.add(name, 3, 4)
self.assertEqual(4, rts.get(name)[1])

def testMGet(self):
'''Test TS.MGET calls'''
rts.create(1, labels={'Test':'This'})
rts.create(2, labels={'Test':'This', 'Taste':'That'})
act_res = rts.mget(['Test=This'])
exp_res = [{'1': [{}, None, None]}, {'2': [{}, None, None]}]
self.assertEqual(act_res, exp_res)
rts.add(1, '*', 15)
rts.add(2, '*', 25)
res = rts.mget(['Test=This'])
Expand Down

0 comments on commit 73dfcc4

Please sign in to comment.