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 D06D02ADF1 for ; Thu, 28 Mar 2019 11:11:57 -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 V2tiF0zcFcT5 for ; Thu, 28 Mar 2019 11:11:57 -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 836B92ADC0 for ; Thu, 28 Mar 2019 11:11:57 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v2 3/4] sql: fix error message for improperly created index References: <1e34e241c5647b34a59ae0703eea3bcdc39c8fac.1553729426.git.korablev@tarantool.org> From: Vladislav Shpilevoy Message-ID: Date: Thu, 28 Mar 2019 18:11:55 +0300 MIME-Version: 1.0 In-Reply-To: <1e34e241c5647b34a59ae0703eea3bcdc39c8fac.1553729426.git.korablev@tarantool.org> Content-Type: text/plain; charset=utf-8 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, Nikita Pettik Thanks for the patch! See my review fix at the bottom of the email, and on the branch. In my fixes I've accounted Kostja's comment about a proper error code. On 28/03/2019 15:07, Nikita Pettik wrote: > Table can be created without any indexes (for instance, from Lua-land). > On the other hand, bytecode generated for CREATE INDEX statement > attempts at finding entry in _index space with given space id. > In case it is not found error "wrong space id" is raised. On the other > hand, it is obvious that such message is appeared when table doesn't > have any created indexes yet. Hence, lets fix this message to indicate > that primary key should be created before any secondary indexes. > > Closes #3914 > --- > src/box/sql/build.c | 3 +-- > test/sql-tap/index1.test.lua | 19 ++++++++++++++++++- > 2 files changed, 19 insertions(+), 3 deletions(-) > > diff --git a/src/box/sql/build.c b/src/box/sql/build.c > index f55f6d800..20cc346a0 100644 > --- a/src/box/sql/build.c > +++ b/src/box/sql/build.c > @@ -1946,8 +1946,7 @@ generate_index_id(struct Parse *parse, uint32_t space_id, int cursor) > sqlVdbeJumpHere(v, seek_adr); > sqlVdbeJumpHere(v, seek_adr + 1); > sqlVdbeAddOp4(v, OP_Halt, SQL_ERROR, ON_CONFLICT_ACTION_FAIL, 0, > - sqlMPrintf(parse->db, "Invalid space id: %d", space_id), > - P4_DYNAMIC); > + "can not add a secondary key before primary", P4_STATIC); > > sqlVdbeJumpHere(v, goto_succ_addr); > /* Fetch iid from the row and increment it. */ ======================================================================== commit 50adf5f01374a4cd6741c862e23ba902ab651909 Author: Vladislav Shpilevoy Date: Thu Mar 28 16:03:26 2019 +0300 Review fix diff --git a/src/box/sql/build.c b/src/box/sql/build.c index 076f62dde..78cd3cee6 100644 --- a/src/box/sql/build.c +++ b/src/box/sql/build.c @@ -1943,11 +1943,16 @@ vdbe_emit_new_sec_index_id(struct Parse *parse, uint32_t space_id, sqlVdbeAddOp4Int(v, OP_IdxLT, _index_cursor, 0, key_reg, 1); /* Jump over Halt block. */ int goto_succ_addr = sqlVdbeAddOp0(v, OP_Goto); - /* Invalid space id handling block starts here. */ + /* + * Absence of any records in _index for that space is + * handled here. + */ sqlVdbeJumpHere(v, seek_adr); sqlVdbeJumpHere(v, seek_adr + 1); - sqlVdbeAddOp4(v, OP_Halt, SQL_ERROR, ON_CONFLICT_ACTION_FAIL, 0, - "can not add a secondary key before primary", P4_STATIC); + sqlVdbeAddOp4(v, OP_Halt, SQL_TARANTOOL_ERROR, ON_CONFLICT_ACTION_FAIL, + 0, "can not add a secondary key before primary", + P4_STATIC); + sqlVdbeChangeP5(v, ER_ALTER_SPACE); sqlVdbeJumpHere(v, goto_succ_addr); /* Fetch iid from the row and increment it. */