[tarantool-patches] Re: [PATCH v2 06/11] sql: refactor sql_expr_compile to return AST

[Vladislav Shpilevoy <v.shpilevoy@tarantool.org>]

Thanks for the patch! See 1 comment below.

On 09/06/2018 12:32, Kirill Shcherbatov wrote:
> ---
>   src/box/alter.cc       |  6 +++---
>   src/box/sql.c          |  5 +++--
>   src/box/sql.h          |  9 ++++-----
>   src/box/sql/tokenize.c | 33 +++++++++++++++++++++------------
>   4 files changed, 31 insertions(+), 22 deletions(-)
> 
> diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
> index 42c70a2..5b7c97d 100644
> --- a/src/box/sql/tokenize.c
> +++ b/src/box/sql/tokenize.c
> @@ -550,19 +555,23 @@ sql_expr_compile(sqlite3 *db, const char *expr, int expr_len,
>   	sql_parser_create(&parser, db);
>   	parser.parse_only = true;
>   
> +	struct Expr *expression = NULL;
>   	char *stmt = (char *)region_alloc(&parser.region, len + 1);
>   	if (stmt == NULL) {
>   		diag_set(OutOfMemory, len + 1, "region_alloc", "stmt");
> -		return -1;
> +		return NULL;
>   	}
>   	sprintf(stmt, "%s%.*s", outer, expr_len, expr);
>   
> -	char *unused;
> -	if (sqlite3RunParser(&parser, stmt, &unused) != SQLITE_OK) {
> -		diag_set(ClientError, ER_SQL_EXECUTE, expr);
> -		return -1;
> +	char *sql_error;
> +	if (sqlite3RunParser(&parser, stmt, &sql_error) != SQLITE_OK) {
> +		char *error = tt_static_buf();
> +		snprintf(error, TT_STATIC_BUF_LEN, "%s", sql_error);
> +		diag_set(ClientError, ER_SQL, error);
> +		sqlite3DbFree(db, sql_error);

Why not just diag_set(ClientError, ER_SQL, sql_error); ?

> +	} else {
> +		expression = parser.parsed_expr;
>   	}
> -	*result = parser.parsed_expr;
>   	sql_parser_destroy(&parser);
> -	return 0;
> +	return expression;
>   }
>