[tarantool-patches] Re: [PATCH v2 3/7] sql: refactor sql_src_list_append to set diag

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Tue Mar 26 21:07:54 MSK 2019


Sorry. Fixes here and in other emails are bad
formatted. My email client has updated and
dropped some settings. On the branch everything
is fine (in fixes commits).

On 26/03/2019 20:08, Vladislav Shpilevoy wrote:
> Hi! Thanks for the fixes!
> 
> Please, look at the diff below and on the branch.
> 
> =============================================================
> 
> commit 5edf345d82d7954944a1d7c7464b724821829388
> Author: Vladislav Shpilevoy <v.shpilevoy at tarantool.org>
> Date:   Mon Mar 25 15:09:13 2019 +0300
> 
>     Review fixes
> 
> diff --git a/src/box/sql/parse.y b/src/box/sql/parse.y
> index ead71dfc0..9bd948bb4 100644
> --- a/src/box/sql/parse.y
> +++ b/src/box/sql/parse.y
> @@ -617,7 +617,7 @@ seltablist(A) ::= stl_prefix(A) LP seltablist(F) RP
>  %type fullname {SrcList*}
>  %destructor fullname {sqlSrcListDelete(pParse->db, $$);}
>  fullname(A) ::= nm(X). {
> -  /*A-overwrites-X. */
> +  /* A-overwrites-X. */
>    A = sql_src_list_append(pParse->db,0,&X);
>    if (A == NULL) {
>      pParse->is_aborted = true;
> diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
> index b6c89893a..6dd1c58a7 100644
> --- a/src/box/sql/sqlInt.h
> +++ b/src/box/sql/sqlInt.h
> @@ -3459,12 +3459,8 @@ sql_src_list_new(struct sql *db);
>   * @param db The database connection.
>   * @param list Append to this SrcList. NULL creates a new SrcList.
>   * @param name_token Token representing table name.
> - * @retval Not NULL SrcList pointer is returned. The returned
> - *         SrcList might be the same as the list that was input
> - *         or it might be a new one.
> - * @retval NULL Otherwise. The diag message is set. The prior
> - *         value of list that is input to this routine is
> - *         automatically freed.
> + * @retval Not NULL A new SrcList or updated @a list.
> + * @retval NULL Error. A diag message is set. @A list is deleted.
>   */
>  struct SrcList *
>  sql_src_list_append(struct sql *db, struct SrcList *list,
> 




More information about the Tarantool-patches mailing list