From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 0C39F4696C3 for ; Fri, 24 Jan 2020 17:21:27 +0300 (MSK) From: Roman Khabibov Date: Fri, 24 Jan 2020 17:21:23 +0300 Message-Id: <0d014c80710b24bcfc6380957fcc90b955536599.1579874461.git.roman.habibov@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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: tarantool-patches@dev.tarantool.org 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. + * + * Note: index_id_reg have to be allocated immediately after + * space_id_reg. + */ +static void +vdbe_emit_index_drop(struct Parse *parse_context, uint32_t index_id, + uint32_t index_id_reg, uint32_t space_id_reg) +{ + 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. * @@ -1680,23 +1700,14 @@ sql_code_drop_table(struct Parse *parse_context, struct space *space, * secondary exist. */ for (uint32_t i = 1; i < index_count; ++i) { - sqlVdbeAddOp2(v, OP_Integer, - space->index[i]->def->iid, - index_id_reg); - sqlVdbeAddOp3(v, OP_MakeRecord, - space_id_reg, 2, idx_rec_reg); - sqlVdbeAddOp2(v, OP_SDelete, BOX_INDEX_ID, - idx_rec_reg); - VdbeComment((v, - "Remove secondary index iid = %u", - space->index[i]->def->iid)); + vdbe_emit_index_drop(parse_context, + space->index[i]->def->iid, + index_id_reg, + space_id_reg); } } - sqlVdbeAddOp2(v, OP_Integer, 0, index_id_reg); - sqlVdbeAddOp3(v, OP_MakeRecord, space_id_reg, 2, - idx_rec_reg); - sqlVdbeAddOp2(v, OP_SDelete, BOX_INDEX_ID, idx_rec_reg); - VdbeComment((v, "Remove primary index")); + vdbe_emit_index_drop(parse_context, 0, index_id_reg, + space_id_reg); } /* Delete records about the space from the _truncate. */ sqlVdbeAddOp3(v, OP_MakeRecord, space_id_reg, 1, idx_rec_reg); @@ -2704,18 +2715,11 @@ sql_drop_index(struct Parse *parse_context) goto exit_drop_index; } - /* - * Generate code to remove entry from _index space - * But firstly, delete statistics since schema - * changes after DDL. - */ - int record_reg = ++parse_context->nMem; int space_id_reg = ++parse_context->nMem; int index_id_reg = ++parse_context->nMem; sqlVdbeAddOp2(v, OP_Integer, space->def->id, space_id_reg); - 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); + vdbe_emit_index_drop(parse_context, index_id, index_id_reg, + space_id_reg); sqlVdbeChangeP5(v, OPFLAG_NCHANGE); exit_drop_index: sqlSrcListDelete(db, table_list); -- 2.21.0 (Apple Git-122)