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 B88622C4F9 for ; Fri, 28 Sep 2018 12:14:44 -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 Utp9LWC6fn-X for ; Fri, 28 Sep 2018 12:14:44 -0400 (EDT) Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (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 056B92973B for ; Fri, 28 Sep 2018 12:14:43 -0400 (EDT) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v1 1/1] sql: assertion in autoincrement column Date: Fri, 28 Sep 2018 19:14:40 +0300 Message-Id: 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: v.shpilevoy@tarantool.org, tarantool-patches@freelists.org In some cases on attempt to insert inappropriate value in autoincrement column assertion was thrown. Now it is fixed. Closes #3670 --- Branch: https://github.com/tarantool/tarantool/tree/imeevma/gh-3670-assertion-in-autoincrement-column Issue: https://github.com/tarantool/tarantool/issues/3670 src/box/sql/vdbe.c | 7 +++++-- test/sql-tap/autoinc.test.lua | 27 ++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 00ffb0c..632fa52 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -3758,10 +3758,13 @@ case OP_FCopy: { /* out2 */ /* Flag is set and register is NULL -> do nothing */ } else { assert(memIsValid(pIn1)); - assert(pIn1->flags & MEM_Int); pOut = &aMem[pOp->p2]; - MemSetTypeFlag(pOut, MEM_Int); + /* + * Flag should be MEM_Int but in some cases it can + * have an other value. See gh-3670. + */ + MemSetTypeFlag(pOut, pIn1->flags); pOut->u.i = pIn1->u.i; } diff --git a/test/sql-tap/autoinc.test.lua b/test/sql-tap/autoinc.test.lua index dda7061..bd40de9 100755 --- a/test/sql-tap/autoinc.test.lua +++ b/test/sql-tap/autoinc.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool test = require("sqltester") -test:plan(46) +test:plan(48) --!./tcltestrunner.lua -- 2004 November 12 @@ -801,4 +801,29 @@ test:do_test( -- }) +-- gh-3670: Assertion with large number in autoincrement column +test:do_catchsql_test( + "autoinc-gh-3670-1", + [[ + CREATE TABLE t0 (s1 INT PRIMARY KEY AUTOINCREMENT); + INSERT INTO t0 VALUES (2147483647); + INSERT INTO t0 SELECT max(s1)*max(s1)*max(s1) FROM t0; + ]], { + -- + 1, "datatype mismatch" + -- + }) + +test:do_catchsql_test( + "autoinc-gh-3670-2", + [[ + CREATE TABLE t1 (s1 INT PRIMARY KEY AUTOINCREMENT, s2 CHAR); + INSERT INTO t1 VALUES (1, 'a'); + INSERT INTO t1 SELECT s2, s2 FROM t1; + ]], { + -- + 1, "datatype mismatch" + -- + }) + test:finish_test() -- 2.7.4