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 3438B2BAE6 for ; Wed, 3 Oct 2018 11:19:12 -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 CkI2YxS2NlN0 for ; Wed, 3 Oct 2018 11:19:12 -0400 (EDT) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 E15942B9F4 for ; Wed, 3 Oct 2018 11:19:11 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v1 1/1] sql: assertion in autoincrement column References: From: Vladislav Shpilevoy Message-ID: <8418885d-8812-d7d9-d74c-1808e2937153@tarantool.org> Date: Wed, 3 Oct 2018 18:19:09 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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, imeevma@tarantool.org Hi! Thanks for the patch! See 3 comments below. On 28/09/2018 19:14, imeevma@tarantool.org wrote: > In some cases on attempt to insert inappropriate value in > autoincrement column assertion was thrown. Now it is fixed. 1. Firstly, I agree with Kostja - I do not understand why in 'some cases' a value becomes not integer when I insert an integer. Please, describe here a reason. > > 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. 2. Do not ref issues in a code. Explain, why it is not Int. Even if we could have issue refs, this comment explained nothing - I opened https://github.com/tarantool/tarantool/issues/3670 and found only Gulutzan's comment with a test. No an explanation. > + */ > + 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" 3. Why mismatch? integer * integer * integer is still an integer. If it is an overflow, then it should print 'overflow', it is not? An overflow should be detected somewhere. > + -- > + }) > + > +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() >