From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 4201726F64 for ; Wed, 22 Aug 2018 06:44:02 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aTMa0vgwokEx for ; Wed, 22 Aug 2018 06:44:02 -0400 (EDT) Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 82AE3216AB for ; Wed, 22 Aug 2018 06:44:01 -0400 (EDT) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v1 1/1] lua: wrong 'tomap' work with nullable fields Date: Wed, 22 Aug 2018 13:43:58 +0300 Message-Id: <7d7cd9396f57d25a6bd05a24bf8677e7bb0fdd28.1534934562.git.imeevma@gmail.com> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: v.shpilevoy@tarantool.org Tuple method 'tomap' in some cases worked impropertly if tuple length less than it should be according to space format. Fixed in this patch. Closes #3631 --- Branch: https://github.com/tarantool/tarantool/tree/imeevma/gh-3631-wrong-tomap-work-with-nullable-fields Issue: https://github.com/tarantool/tarantool/issues/3631 src/box/lua/tuple.c | 4 +-- test/engine/tuple.result | 63 ++++++++++++++++++++++++++++++++++++++++++++++ test/engine/tuple.test.lua | 23 +++++++++++++++++ 3 files changed, 88 insertions(+), 2 deletions(-) diff --git a/src/box/lua/tuple.c b/src/box/lua/tuple.c index 7ca4299..856042c 100644 --- a/src/box/lua/tuple.c +++ b/src/box/lua/tuple.c @@ -284,12 +284,12 @@ lbox_tuple_to_map(struct lua_State *L) luaL_error(L, "Usage: tuple:tomap()"); const struct tuple *tuple = lua_checktuple(L, 1); const struct tuple_format *format = tuple_format(tuple); - const struct tuple_field *field = &format->fields[0]; const char *pos = tuple_data(tuple); int field_count = (int)mp_decode_array(&pos); int n_named = format->dict->name_count; lua_createtable(L, field_count, n_named); - for (int i = 0; i < n_named; ++i, ++field) { + int fields_number = n_named > field_count ? field_count : n_named; + for (int i = 0; i < fields_number; ++i) { /* Access by name. */ const char *name = format->dict->names[i]; lua_pushstring(L, name); diff --git a/test/engine/tuple.result b/test/engine/tuple.result index b3b23b2..b9f42b9 100644 --- a/test/engine/tuple.result +++ b/test/engine/tuple.result @@ -590,6 +590,69 @@ maplen(t1map), t1map[1], t1map[2], t1map[3] s:drop() --- ... +-- +-- gh-3631: Wrong 'tomap' work with nullable fields +-- +format = {} +--- +... +format[1] = {'first', 'unsigned'} +--- +... +format[2] = {'second', 'unsigned'} +--- +... +format[3] = {'third', 'unsigned'} +--- +... +format[4] = {'fourth', 'string', is_nullable = true} +--- +... +s = box.schema.space.create('test', {format = format, engine = engine}) +--- +... +pk = s:create_index('primary', {parts = { 1, 'unsigned'}}) +--- +... +s:insert({1, 2, 3}) +--- +- [1, 2, 3] +... +tuple = s:get(1) +--- +... +tuple +--- +- [1, 2, 3] +... +-- Should be NULL +tuple.fourth +--- +- null +... +-- Should have only three named fields +tuple:tomap() +--- +- 1: 1 + 2: 2 + 3: 3 + third: 3 + second: 2 + first: 1 +... +-- Should be NULL +tuple:tomap().fourth +--- +- null +... +-- Should be nil +type(tuple:tomap().fourth) +--- +- nil +... +s:drop() +--- +... engine = nil --- ... diff --git a/test/engine/tuple.test.lua b/test/engine/tuple.test.lua index 6d7d254..10b888e 100644 --- a/test/engine/tuple.test.lua +++ b/test/engine/tuple.test.lua @@ -200,5 +200,28 @@ t1map = t1:tomap() maplen(t1map), t1map[1], t1map[2], t1map[3] s:drop() +-- +-- gh-3631: Wrong 'tomap' work with nullable fields +-- +format = {} +format[1] = {'first', 'unsigned'} +format[2] = {'second', 'unsigned'} +format[3] = {'third', 'unsigned'} +format[4] = {'fourth', 'string', is_nullable = true} +s = box.schema.space.create('test', {format = format, engine = engine}) +pk = s:create_index('primary', {parts = { 1, 'unsigned'}}) +s:insert({1, 2, 3}) +tuple = s:get(1) +tuple +-- Should be NULL +tuple.fourth +-- Should have only three named fields +tuple:tomap() +-- Should be NULL +tuple:tomap().fourth +-- Should be nil +type(tuple:tomap().fourth) +s:drop() + engine = nil test_run = nil -- 2.7.4