From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <v.shpilevoy@tarantool.org>
Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
 bits)) (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id ED953430412
 for <tarantool-patches@dev.tarantool.org>;
 Sat, 15 Aug 2020 18:06:10 +0300 (MSK)
References: <20200815083851.GD2074@grain>
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Message-ID: <5618a6d1-1b65-a24e-e6d9-6332882f3fdb@tarantool.org>
Date: Sat, 15 Aug 2020 17:06:09 +0200
MIME-Version: 1.0
In-Reply-To: <20200815083851.GD2074@grain>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Tarantool-patches] [PATCH v7 9/8] txn: txn_add_redo -- drop
	synchro processing
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Cyrill Gorcunov <gorcunov@gmail.com>, tml <tarantool-patches@dev.tarantool.org>

Thanks for the patch!

On 15.08.2020 10:38, Cyrill Gorcunov wrote:
> Since we no longer use txn engine for synchro
> packets processing this code is never executed.
> 
> Part-of #5129
> 
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
> Happen to miss this yesterday. I pushed into the same branch.
> 
>  src/box/txn.c | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/src/box/txn.c b/src/box/txn.c
> index cc1f496c5..b2d342355 100644
> --- a/src/box/txn.c
> +++ b/src/box/txn.c
> @@ -82,14 +82,7 @@ txn_add_redo(struct txn *txn, struct txn_stmt *stmt, struct request *request)
>  	 */
>  	struct space *space = stmt->space;
>  	row->group_id = space != NULL ? space_group_id(space) : 0;
> -	/*
> -	 * Sychronous replication entries are supplementary and
> -	 * aren't valid dml requests. They're encoded manually.
> -	 */
> -	if (likely(!iproto_type_is_synchro_request(row->type)))
> -		row->bodycnt = xrow_encode_dml(request, &txn->region, row->body);
> -	else
> -		row->bodycnt = xrow_header_dup_body(row, &txn->region);

xrow_header_dup_body() can be deleted now.

> +	row->bodycnt = xrow_encode_dml(request, &txn->region, row->body);
>  	if (row->bodycnt < 0)
>  		return -1;
>  	stmt->row = row;
>