[Tarantool-patches] [PATCH] box: frommap() bug fix
Chris Sosnin
k.sosnin at tarantool.org
Fri Jan 10 10:31:53 MSK 2020
From: Chris Sosnin <chris125_ at live.com>
This patch already has LGTM from Vlad.
- If an optional argument is provided for
space_object:frommap() (which is {table = true|false}),
type match for first arguments is omitted, which is
incorrect. We should return the result only after making
sure it is possible to build a tuple.
- If there is a type mismatch, however, frommap() does not
return nil, err as it is mentioned in the description, so we
change it to be this way.
Closes #4262
---
branch:https://github.com/tarantool/tarantool/tree/ksosnin/gh-4262-frommap-error-handle
issue:https://github.com/tarantool/tarantool/issues/4262
src/box/lua/space.cc | 12 ++++++++----
test/box/tuple.result | 8 +++++++-
test/box/tuple.test.lua | 1 +
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/box/lua/space.cc b/src/box/lua/space.cc
index 01b58afab..d0e44dd41 100644
--- a/src/box/lua/space.cc
+++ b/src/box/lua/space.cc
@@ -580,14 +580,18 @@ lbox_space_frommap(struct lua_State *L)
}
lua_rawseti(L, -3, fieldno+1);
}
- if (table)
- return 1;
lua_replace(L, 1);
lua_settop(L, 1);
tuple = luaT_tuple_new(L, -1, space->format);
- if (tuple == NULL)
- return luaT_error(L);
+ if (tuple == NULL) {
+ struct error *e = diag_last_error(&fiber()->diag);
+ lua_pushnil(L);
+ lua_pushstring(L, e->errmsg);
+ return 2;
+ }
+ if (table)
+ return 1;
luaT_pushtuple(L, tuple);
return 1;
usage_error:
diff --git a/test/box/tuple.result b/test/box/tuple.result
index 9140211b7..78f919deb 100644
--- a/test/box/tuple.result
+++ b/test/box/tuple.result
@@ -1121,7 +1121,13 @@ s:frommap()
...
s:frommap({})
---
-- error: Tuple field 1 required by space format is missing
+- null
+- Tuple field 1 required by space format is missing
+...
+s:frommap({ddd = 'fail', aaa = 2, ccc = 3, bbb = 4}, {table=true})
+---
+- null
+- 'Tuple field 4 type does not match one required by operation: expected unsigned'
...
s:frommap({ddd = 1, aaa = 2, ccc = 3, bbb = 4}, {table = true})
---
diff --git a/test/box/tuple.test.lua b/test/box/tuple.test.lua
index 3ac2902fe..baf2f22d5 100644
--- a/test/box/tuple.test.lua
+++ b/test/box/tuple.test.lua
@@ -373,6 +373,7 @@ s:frommap({ddd = 1, aaa = 2, bbb = 3})
s:frommap({ddd = 1, aaa = 2, ccc = 3, eee = 4})
s:frommap()
s:frommap({})
+s:frommap({ddd = 'fail', aaa = 2, ccc = 3, bbb = 4}, {table=true})
s:frommap({ddd = 1, aaa = 2, ccc = 3, bbb = 4}, {table = true})
s:frommap({ddd = 1, aaa = 2, ccc = 3, bbb = 4}, {table = false})
s:frommap({ddd = 1, aaa = 2, ccc = 3, bbb = box.NULL})
--
2.21.0 (Apple Git-122.2)
More information about the Tarantool-patches
mailing list