[tarantool-patches] Re: [PATCH v7 4/7] sql: rename sql_expr_free to sql_expr_delete

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Thu May 24 22:26:37 MSK 2018


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




More information about the Tarantool-patches mailing list