From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id EDB6B46970F for ; Thu, 28 Nov 2019 17:11:49 +0300 (MSK) From: imeevma@tarantool.org Date: Thu, 28 Nov 2019 17:11:49 +0300 Message-Id: Subject: [Tarantool-patches] [PATCH v1 1/1] lua: allow to push -2^63 in INTEGER field List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: alexander.turenko@tarantool.org Cc: tarantool-patches@dev.tarantool.org This patch fixes a bug that appeared due to commit 3a13be1d. --- https://github.com/tarantool/tarantool/tree/imeevma/small_fixes src/lua/utils.c | 2 +- test/engine/insert.result | 28 ++++++++++++++++++++++++++++ test/engine/insert.test.lua | 8 ++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/lua/utils.c b/src/lua/utils.c index 7f7bf47..bad5f7b 100644 --- a/src/lua/utils.c +++ b/src/lua/utils.c @@ -667,7 +667,7 @@ luaL_tofield(struct lua_State *L, struct luaL_serializer *cfg, int index, } else if (num >= 0 && num < exp2(64)) { field->type = MP_UINT; field->ival = (uint64_t) num; - } else if (num > -exp2(63) && num < exp2(63)) { + } else if (num >= -exp2(63) && num < exp2(63)) { field->type = MP_INT; field->ival = (int64_t) num; } else { diff --git a/test/engine/insert.result b/test/engine/insert.result index 1015b6a..d678e28 100644 --- a/test/engine/insert.result +++ b/test/engine/insert.result @@ -730,3 +730,31 @@ s:drop() fiber = nil --- ... +format = {{name = 'i', type = 'integer'}} +--- +... +s = box.schema.space.create('s', {format = format, engine = engine}) +--- +... +_ = s:create_index('ii') +--- +... +s:insert({-2^63}) +--- +- [-9223372036854775808] +... +s:insert({-2^64}) +--- +- error: 'Tuple field 1 type does not match one required by operation: expected integer' +... +s:insert({2^63}) +--- +- [9223372036854775808] +... +s:insert({2^64}) +--- +- error: 'Tuple field 1 type does not match one required by operation: expected integer' +... +s:drop() +--- +... diff --git a/test/engine/insert.test.lua b/test/engine/insert.test.lua index 39b1501..d6df60e 100644 --- a/test/engine/insert.test.lua +++ b/test/engine/insert.test.lua @@ -123,3 +123,11 @@ s:select{} s:drop() fiber = nil +format = {{name = 'i', type = 'integer'}} +s = box.schema.space.create('s', {format = format, engine = engine}) +_ = s:create_index('ii') +s:insert({-2^63}) +s:insert({-2^64}) +s:insert({2^63}) +s:insert({2^64}) +s:drop() -- 2.7.4