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 4F56224F28 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 pBPWrl15pZQu for ; Thu, 24 May 2018 15:26:39 -0400 (EDT) Received: from smtp52.i.mail.ru (smtp52.i.mail.ru [94.100.177.112]) (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 E887D24F23 for ; Thu, 24 May 2018 15:26:36 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v7 3/7] sql: introduce expr_len for sql_expr_compile References: <074eb3156b959d1a5cc8534ec104b0bb6fc20034.1527084287.git.kshcherbatov@tarantool.org> From: Vladislav Shpilevoy Message-ID: <14b9b088-c650-e233-167a-24e9f35dfa8c@tarantool.org> Date: Thu, 24 May 2018 22:26:34 +0300 MIME-Version: 1.0 In-Reply-To: <074eb3156b959d1a5cc8534ec104b0bb6fc20034.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 2 comments below. On 23/05/2018 17:05, Kirill Shcherbatov wrote: > As we need to use parser in the cases with not null-terminated > strings expr_len argument for sql_expr_compile is required. > > Part of #3272. > --- > src/box/alter.cc | 1 + > src/box/sql.h | 4 +++- > src/box/sql/tokenize.c | 7 ++++--- > 3 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/src/box/alter.cc b/src/box/alter.cc > index e87bbce..e4780da 100644 > --- a/src/box/alter.cc > +++ b/src/box/alter.cc > @@ -408,6 +408,7 @@ field_def_decode(struct field_def *field, const char **data, > > if (field->default_value != NULL && > sql_expr_compile(sql_get(), field->default_value, > + strlen(field->default_value), > &field->default_value_expr) != 0) > diag_raise(); > } > diff --git a/src/box/sql.h b/src/box/sql.h > index ff8ab6f..a7f2500 100644 > --- a/src/box/sql.h > +++ b/src/box/sql.h > @@ -74,12 +74,14 @@ struct Table; > * stuct Select and return it. > * @param db SQL context handle. > * @param expr Expression to parse. > + * @param expr_len Expression to parse length. 1. Looks like expr_len is the expression that is intended to parse a length. Do you mean this?: "Length of @an expr." > * @param[out] result Result: AST structure. > * > * @retval Error code if any. > */ > int > -sql_expr_compile(struct sqlite3 *db, const char *expr, struct Expr **result); > +sql_expr_compile(struct sqlite3 *db, const char *expr, int expr_len, > + struct Expr **result); 2. Bad indentation.