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 279AF25631 for ; Fri, 18 May 2018 06:33:18 -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 1r1Rw_pY0iux for ; Fri, 18 May 2018 06:33:18 -0400 (EDT) Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (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 4ED6B25620 for ; Fri, 18 May 2018 06:33:17 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH 1/2] sql: allow key_def to be NULL for ephemeral create References: <54fef8ed5144ab8ee384687caa3448a89ac62746.1526483543.git.kyukhin@tarantool.org> <20180517154939.ya64lgo4ifipmofk@tarantool.org> <20180518065712.aal76hawn3ofyzln@tarantool.org> From: Vladislav Shpilevoy Message-ID: <6186d3a5-8cb6-6ce9-c1ee-d100e04fec96@tarantool.org> Date: Fri, 18 May 2018 13:33:15 +0300 MIME-Version: 1.0 In-Reply-To: <20180518065712.aal76hawn3ofyzln@tarantool.org> 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: Kirill Yukhin Cc: tarantool-patches@freelists.org Hello. Thanks for fixes! > diff --git a/src/box/sql/delete.c b/src/box/sql/delete.c > index 3455f52..2c1ce44 100644 > --- a/src/box/sql/delete.c > +++ b/src/box/sql/delete.c > @@ -386,14 +386,9 @@ sqlite3DeleteFrom(Parse * pParse, /* The parser context */ > iPk = pParse->nMem + 1; > pParse->nMem += nPk; > iEphCur = pParse->nTab++; > - struct key_def *def = key_def_new(nPk); > - if (def == NULL) { > - sqlite3OomFault(db); > - goto delete_from_cleanup; > - } > addrEphOpen = > sqlite3VdbeAddOp4(v, OP_OpenTEphemeral, iEphCur, > - nPk, 0, (char*)def, P4_KEYDEF); > + nPk); Compilation error. /Users/v.shpilevoy/Work/Repositories/tarantool/src/box/sql/delete.c:391:12: error: too few arguments to function call, expected 7, have 4 nPk); ^ /Users/v.shpilevoy/Work/Repositories/tarantool/src/box/sql/vdbe.h:227:1: note: 'sqlite3VdbeAddOp4' declared here int sqlite3VdbeAddOp4(Vdbe *, int, int, int, int, const char *zP4, int); ^ 1 error generated.