[tarantool-patches] [PATCH v2 1/1] tuple:tomap: only_names option

[Kirill Shcherbatov]

Fixes #3280
---
 src/box/lua/tuple.c        | 24 +++++++++++++++++++--
 test/engine/tuple.result   | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 test/engine/tuple.test.lua | 16 ++++++++++++++
 3 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/box/lua/tuple.c b/src/box/lua/tuple.c
index d5ed7c4..b52072c 100644
--- a/src/box/lua/tuple.c
+++ b/src/box/lua/tuple.c
@@ -280,8 +280,21 @@ luamp_encode_extension_box(struct lua_State *L, int idx,
 static int
 lbox_tuple_to_map(struct lua_State *L)
 {
-	if (lua_gettop(L) < 1)
-		luaL_error(L, "Usage: tuple:tomap()");
+	int argc = lua_gettop(L);
+	if (argc < 1 || argc > 2)
+		goto error;
+	int names_only = 0;
+	if (argc == 2) {
+		if (!lua_istable(L, 2))
+			goto error;
+		lua_getfield(L, 2, "names_only");
+		if (!lua_isboolean(L, -1) && !lua_isnil(L, -1)) {
+			goto error;
+		}
+		names_only = lua_toboolean(L, -1);
+		lua_pop(L, 1);
+	}
+
 	const struct tuple *tuple = lua_checktuple(L, 1);
 	const struct tuple_format *format = tuple_format(tuple);
 	const struct tuple_field *field = &format->fields[0];
@@ -294,6 +307,8 @@ lbox_tuple_to_map(struct lua_State *L)
 		lua_pushstring(L, field->name);
 		luamp_decode(L, luaL_msgpack_default, &pos);
 		lua_rawset(L, -3);
+		if (names_only)
+			continue;
 		/*
 		 * Access the same field by an index. There is no
 		 * copy for tables - lua optimizes it and uses
@@ -303,12 +318,17 @@ lbox_tuple_to_map(struct lua_State *L)
 		lua_rawget(L, -2);
 		lua_rawseti(L, -2, i + TUPLE_INDEX_BASE);
 	}
+	if (names_only)
+		return 1;
 	/* Access for not named fields by index. */
 	for (int i = n_named; i < field_count; ++i) {
 		luamp_decode(L, luaL_msgpack_default, &pos);
 		lua_rawseti(L, -2, i + TUPLE_INDEX_BASE);
 	}
 	return 1;
+error:
+	luaL_error(L, "Usage: tuple:tomap(params)");
+	return 1;
 }
 
 /**
diff --git a/test/engine/tuple.result b/test/engine/tuple.result
index b3b23b2..f9805b0 100644
--- a/test/engine/tuple.result
+++ b/test/engine/tuple.result
@@ -590,6 +590,59 @@ maplen(t1map), t1map[1], t1map[2], t1map[3]
 s:drop()
 ---
 ...
+--
+-- gh-2821: tuple:tomap() names_only feature.
+--
+format = {}
+---
+...
+format[1] = {name = 'field1', type = 'unsigned' }
+---
+...
+format[2] = {name = 'field2', type = 'unsigned' }
+---
+...
+s = box.schema.create_space('test', {format = format})
+---
+...
+pk = s:create_index('pk')
+---
+...
+t = s:replace{100, 200, 300 }
+---
+...
+t:tomap({names_only = false})
+---
+- 1: 100
+  2: 200
+  3: 300
+  field1: 100
+  field2: 200
+...
+t:tomap({names_only = true})
+---
+- field1: 100
+  field2: 200
+...
+t:tomap({names_only = 'text'})
+---
+- error: 'Usage: tuple:tomap() or tuple:tomap({names_only = true})'
+...
+t:tomap({names_only = true}, {dummy = true})
+---
+- error: 'Usage: tuple:tomap() or tuple:tomap({names_only = true})'
+...
+t:tomap({})
+---
+- 1: 100
+  2: 200
+  3: 300
+  field1: 100
+  field2: 200
+...
+s:drop()
+---
+...
 engine = nil
 ---
 ...
diff --git a/test/engine/tuple.test.lua b/test/engine/tuple.test.lua
index 6d7d254..3411947 100644
--- a/test/engine/tuple.test.lua
+++ b/test/engine/tuple.test.lua
@@ -200,5 +200,21 @@ t1map = t1:tomap()
 maplen(t1map), t1map[1], t1map[2], t1map[3]
 s:drop()
 
+--
+-- gh-2821: tuple:tomap() names_only feature.
+--
+format = {}
+format[1] = {name = 'field1', type = 'unsigned' }
+format[2] = {name = 'field2', type = 'unsigned' }
+s = box.schema.create_space('test', {format = format})
+pk = s:create_index('pk')
+t = s:replace{100, 200, 300 }
+t:tomap({names_only = false})
+t:tomap({names_only = true})
+t:tomap({names_only = 'text'})
+t:tomap({names_only = true}, {dummy = true})
+t:tomap({})
+s:drop()
+
 engine = nil
 test_run = nil
-- 
2.7.4