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 BA4A624F5B for ; Thu, 24 May 2018 15:26:39 -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 1E2l21mnVCB1 for ; Thu, 24 May 2018 15:26:39 -0400 (EDT) Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [217.69.128.39]) (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 6EE4724F23 for ; Thu, 24 May 2018 15:26:39 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v7 4/7] sql: rename sql_expr_free to sql_expr_delete References: <19aefd955a44af24ae84d2e07ace6921e41d991d.1527084287.git.kshcherbatov@tarantool.org> From: Vladislav Shpilevoy Message-ID: <165234e9-0317-dd53-a513-f32c7e94d808@tarantool.org> Date: Thu, 24 May 2018 22:26:37 +0300 MIME-Version: 1.0 In-Reply-To: <19aefd955a44af24ae84d2e07ace6921e41d991d.1527084287.git.kshcherbatov@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: tarantool-patches@freelists.org, Kirill Shcherbatov Thanks for the patch! See 3 comments below. > diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c > index 8259680..64991ee 100644 > --- a/src/box/sql/expr.c > +++ b/src/box/sql/expr.c > @@ -2913,7 +2913,7 @@ sqlite3CodeSubselect(Parse * pParse, /* Parsing context */ > dest.iSDParm); > VdbeComment((v, "Init EXISTS result")); > } > - sql_expr_free(pParse->db, pSel->pLimit, false); > + sql_expr_delete(pParse->db, pSel->pLimit, false); 1. Bad indentation. > pSel->pLimit = sqlite3ExprAlloc(pParse->db, TK_INTEGER, > &sqlite3IntTokens[1], > 0); > diff --git a/src/box/sql/select.c b/src/box/sql/select.c > index 5fbcbaf..75bd53d 100644 > --- a/src/box/sql/select.c > +++ b/src/box/sql/select.c > @@ -2639,7 +2639,7 @@ multiSelect(Parse * pParse, /* Parsing context */ > pPrior-> > nSelectRow); > } > - sql_expr_free(db, p->pLimit, false); > + sql_expr_delete(db, p->pLimit, false); 2. Same. > p->pLimit = pLimit; > p->pOffset = pOffset; > p->iLimit = 0; > @@ -2738,7 +2738,7 @@ multiSelect(Parse * pParse, /* Parsing context */ > p->pPrior = pPrior; > if (p->nSelectRow > pPrior->nSelectRow) > p->nSelectRow = pPrior->nSelectRow; > - sql_expr_free(db, p->pLimit, false); > + sql_expr_delete(db, p->pLimit, false); 3. Same. > p->pLimit = pLimit; > p->pOffset = pOffset; >