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 8C9F846970E for ; Tue, 28 Jan 2020 20:44:50 +0300 (MSK) Date: Tue, 28 Jan 2020 20:44:49 +0300 From: Nikita Pettik Message-ID: <20200128174449.GB1049@tarantool.org> References: <0d014c80710b24bcfc6380957fcc90b955536599.1579874461.git.roman.habibov@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <0d014c80710b24bcfc6380957fcc90b955536599.1579874461.git.roman.habibov@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 1/2] sql: refactor index drop code List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Roman Khabibov Cc: tarantool-patches@dev.tarantool.org On 24 Jan 17:21, Roman Khabibov wrote: > Wrap index drop opcode emitting into single function. > > Part of #4120 > --- > src/box/sql/build.c | 52 ++++++++++++++++++++++++--------------------- > 1 file changed, 28 insertions(+), 24 deletions(-) > > diff --git a/src/box/sql/build.c b/src/box/sql/build.c > index bc50ecbfa..58a6a8a6b 100644 > --- a/src/box/sql/build.c > +++ b/src/box/sql/build.c > @@ -1469,6 +1469,26 @@ vdbe_emit_stat_space_clear(struct Parse *parse, const char *stat_table_name, > sql_table_delete_from(parse, src_list, where); > } > > +/** > + * Generate VDBE program to remove entry with @a index_id and @a > + * space_id from _index space. Is @a common shortcat for @param? If so, please share a link to docs, since I've managed to find only this: ''' \a Displays the argument in italics. Use this command to emphasize words. Use this command to refer to member arguments in the running text. ''' > + * Note: index_id_reg have to be allocated immediately after > + * space_id_reg. > + */ Nit: have -> has. Please, add an assertion verifing that. > +static void > +vdbe_emit_index_drop(struct Parse *parse_context, uint32_t index_id, > + uint32_t index_id_reg, uint32_t space_id_reg) I'd also consider moving storing of index_id to register out of this function. Then you'll need only space_id_reg to process deletion. > +{ > + struct Vdbe *v = sqlGetVdbe(parse_context); > + assert(v != NULL); > + int record_reg = ++parse_context->nMem; > + sqlVdbeAddOp2(v, OP_Integer, index_id, index_id_reg); > + sqlVdbeAddOp3(v, OP_MakeRecord, space_id_reg, 2, record_reg); > + sqlVdbeAddOp2(v, OP_SDelete, BOX_INDEX_ID, record_reg); > + VdbeComment((v, "Remove index iid = %u", index_id)); > +} > + > /** > * Generate VDBE program to remove entry from _fk_constraint space. > *