From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tarantool-patches-bounce@freelists.org>
Received: from localhost (localhost [127.0.0.1])
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 196F823009
	for <tarantool-patches@freelists.org>; Thu,  3 May 2018 06:10:15 -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 FPlMssD-DsA2 for <tarantool-patches@freelists.org>;
	Thu,  3 May 2018 06:10:15 -0400 (EDT)
Received: from smtp37.i.mail.ru (smtp37.i.mail.ru [94.100.177.97])
	(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 CB1FD22FF9
	for <tarantool-patches@freelists.org>; Thu,  3 May 2018 06:10:14 -0400 (EDT)
Subject: [tarantool-patches] Re: [PATCH v4 1/7] sql: fix code style in
 sqlite3Pragma
References: <cover.1524675028.git.kshcherbatov@tarantool.org>
 <cover.1524939874.git.kshcherbatov@tarantool.org>
 <d96f1471b4197b2562e4f3107e8992369f4c3fb6.1524939874.git.kshcherbatov@tarantool.org>
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Message-ID: <8fa4c614-6e99-cd4f-d3f9-226172b83725@tarantool.org>
Date: Thu, 3 May 2018 13:10:12 +0300
MIME-Version: 1.0
In-Reply-To: <d96f1471b4197b2562e4f3107e8992369f4c3fb6.1524939874.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: <mailto:ecartis@freelists.org?Subject=help>
List-unsubscribe: <tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-subscribe: <tarantool-patches-request@freelists.org?Subject=subscribe>
List-owner: <mailto:>
List-post: <mailto:tarantool-patches@freelists.org>
List-archive: <http://www.freelists.org/archives/tarantool-patches>
To: Kirill Shcherbatov <kshcherbatov@tarantool.org>, tarantool-patches@freelists.org

Hello. Please, fix comments from the previous review.

On 28/04/2018 21:26, Kirill Shcherbatov wrote:
> ---
>   src/box/sql/pragma.c | 56 +++++++++++++++++++++++++---------------------------
>   1 file changed, 27 insertions(+), 29 deletions(-)
> 
> diff --git a/src/box/sql/pragma.c b/src/box/sql/pragma.c
> index e41f69b..4a68cad 100644
> --- a/src/box/sql/pragma.c
> +++ b/src/box/sql/pragma.c
> @@ -544,37 +544,35 @@ sqlite3Pragma(Parse * pParse, Token * pId,	/* First part of [schema.]id field */
>   
>   #ifndef SQLITE_OMIT_FOREIGN_KEY
>   	case PragTyp_FOREIGN_KEY_LIST:{
> -			if (zRight) {
> -				FKey *pFK;
> -				Table *pTab;
> -				pTab = sqlite3HashFind(&db->pSchema->tblHash,
> -						       zRight);
> -				if (pTab != NULL) {
> -					pFK = pTab->pFKey;
> -					if (pFK) {
> -						int i = 0;
> -						pParse->nMem = 8;
> -						while (pFK) {
> -							int j;
> -							for (j = 0;
> -							     j < pFK->nCol;
> -							     j++) {
> -								sqlite3VdbeMultiLoad(v, 1, "iissssss", i, j, pFK->zTo, pTab->aCol[pFK->aCol[j].iFrom].zName, pFK->aCol[j].zCol, actionName(pFK->aAction[1]),	/* ON UPDATE */
> -										     actionName(pFK->aAction[0]),	/* ON DELETE */
> -										     "NONE");
> -								sqlite3VdbeAddOp2
> -								    (v,
> -								     OP_ResultRow,
> -								     1, 8);
> -							}
> -							++i;
> -							pFK = pFK->pNextFrom;
> -						}
> -					}
> -				}
> -			}
> +		if (!zRight)
> +			break;
> +		FKey *pFK;
> +		Table *pTab;
> +		pTab = sqlite3HashFind(&db->pSchema->tblHash, zRight);
> +		if (pTab == NULL)
>   			break;
> +		pFK = pTab->pFKey;
> +		if (!pFK)
> +			break;
> +		int i = 0;
> +		pParse->nMem = 8;
> +		while (pFK) {
> +			for (int j = 0; j < pFK->nCol; j++) {
> +				const char *name =
> +					pTab->aCol[pFK->aCol[j].iFrom].zName;
> +				sqlite3VdbeMultiLoad(v, 1, "iissssss", i, j,
> +						     pFK->zTo, name,
> +						     pFK->aCol[j].zCol,
> +						     actionName(pFK->aAction[1]),
> +						     actionName(pFK->aAction[0]),
> +						     "NONE");
> +				sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 8);
> +			}
> +			++i;
> +			pFK = pFK->pNextFrom;
>   		}
> +		break;
> +	}
>   #endif				/* !defined(SQLITE_OMIT_FOREIGN_KEY) */
>   
>   #ifndef SQLITE_OMIT_FOREIGN_KEY
>