Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Redis operation that returns dict now converted to Lua table when called inside eval operation #209

Merged
merged 3 commits into from
Aug 21, 2018
Merged

Redis operation that returns dict now converted to Lua table when called inside eval operation #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2aa8439
During eval operation, results of redis operations returning dictiona…
nimrod-otonomo Aug 20, 2018
8be639f
added key as argument to eval function in test_eval_hgetall_iterate t…
nimrod-otonomo Aug 20, 2018
b461534
changed number of keys from 0 to 1 in the eval command in "test_eval_…
NimrodParasol Aug 21, 2018
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
3 changes: 2 additions & 1 deletion fakeredis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,11 +856,12 @@ def eval(self, script, numkeys, *keys_and_args):

def _convert_redis_result(self, lua_runtime, result):
if isinstance(result, dict):
return [
converted = [
i
for item in result.items()
for i in item
]
return lua_runtime.table_from(converted)
elif isinstance(result, set):
converted = sorted(
self._convert_redis_result(lua_runtime, item)
Expand Down
16 changes: 16 additions & 0 deletions test_fakeredis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3337,6 +3337,22 @@ def test_eval_hgetall(self):
[[b'k1', b'bar'], [b'k2', b'baz']]
)

def test_eval_hgetall_iterate(self):
self.redis.hset('foo', 'k1', 'bar')
self.redis.hset('foo', 'k2', 'baz')
lua = """
local result = redis.call("hgetall", "foo")
for i, v in ipairs(result) do
end
return result
"""
val = self.redis.eval(lua, 1, 'foo')
sorted_val = sorted([val[:2], val[2:]])
self.assertEqual(
sorted_val,
[[b'k1', b'bar'], [b'k2', b'baz']]
)

def test_eval_list_with_nil(self):
self.redis.lpush('foo', 'bar')
self.redis.lpush('foo', None)
Expand Down