Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: tarantool-patches@freelists.org,
	Kirill Shcherbatov <kshcherbatov@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH v7 4/7] sql: rename sql_expr_free to sql_expr_delete
Date: Thu, 24 May 2018 22:26:37 +0300	[thread overview]
Message-ID: <165234e9-0317-dd53-a513-f32c7e94d808@tarantool.org> (raw)
In-Reply-To: <19aefd955a44af24ae84d2e07ace6921e41d991d.1527084287.git.kshcherbatov@tarantool.org>

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;
>   

  parent reply	other threads:[~2018-05-24 19:26 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-23 14:05 [tarantool-patches] [PATCH v7 0/7] sql: remove Checks to server Kirill Shcherbatov
2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 1/7] sql: remove parser construct, destruct to sql.h Kirill Shcherbatov
2018-05-23 17:46   ` [tarantool-patches] " Konstantin Osipov
2018-05-24 19:26   ` Vladislav Shpilevoy
2018-05-25 12:05     ` Kirill Shcherbatov
2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 2/7] box: introduce OPT_ARRAY opt_type to decode arrays Kirill Shcherbatov
2018-05-23 17:53   ` [tarantool-patches] " Konstantin Osipov
2018-05-24  7:32     ` Kirill Shcherbatov
2018-05-24 19:26   ` Vladislav Shpilevoy
2018-05-25 11:54     ` Kirill Shcherbatov
2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 3/7] sql: introduce expr_len for sql_expr_compile Kirill Shcherbatov
2018-05-24 19:26   ` [tarantool-patches] " Vladislav Shpilevoy
2018-05-25 11:54     ` Kirill Shcherbatov
2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 4/7] sql: rename sql_expr_free to sql_expr_delete Kirill Shcherbatov
2018-05-23 18:00   ` [tarantool-patches] " Konstantin Osipov
2018-05-24 19:26   ` Vladislav Shpilevoy [this message]
2018-05-25 11:54     ` Kirill Shcherbatov
2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 5/7] sql: change sqlite3AddCheckConstraint signature Kirill Shcherbatov
2018-05-23 18:01   ` [tarantool-patches] " Konstantin Osipov
2018-05-24 19:26   ` Vladislav Shpilevoy
2018-05-25 11:53     ` Kirill Shcherbatov
2018-05-29 11:51   ` n.pettik
2018-05-30  8:32     ` Kirill Shcherbatov
2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 6/7] sql: export funcs defined on Expr, ExprList to sql.h Kirill Shcherbatov
2018-05-23 18:15   ` [tarantool-patches] " Konstantin Osipov
2018-05-24  7:33     ` Kirill Shcherbatov
2018-05-24 19:26   ` Vladislav Shpilevoy
2018-05-25 11:53     ` Kirill Shcherbatov
2018-05-28 11:19       ` Vladislav Shpilevoy
2018-05-28 14:59         ` Kirill Shcherbatov
2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 7/7] sql: remove Checks to server Kirill Shcherbatov
2018-05-24 19:26   ` [tarantool-patches] " Vladislav Shpilevoy
2018-05-25 11:53     ` Kirill Shcherbatov
2018-05-28 11:19       ` Vladislav Shpilevoy
2018-05-28 14:59         ` Kirill Shcherbatov
2018-05-28 18:50           ` Vladislav Shpilevoy
2018-05-29 11:49   ` n.pettik
2018-05-30  8:32     ` Kirill Shcherbatov
2018-05-30 10:42       ` n.pettik
2018-05-25 12:04 ` [tarantool-patches] Re: [PATCH v7 0/7] " Kirill Shcherbatov
2018-05-28 11:19   ` Vladislav Shpilevoy
2018-05-30 11:03 ` n.pettik
2018-05-31 17:44   ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=165234e9-0317-dd53-a513-f32c7e94d808@tarantool.org \
    --to=v.shpilevoy@tarantool.org \
    --cc=kshcherbatov@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='[tarantool-patches] Re: [PATCH v7 4/7] sql: rename sql_expr_free to sql_expr_delete' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox