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 B0D49275B9
	for <tarantool-patches@freelists.org>; Tue, 20 Aug 2019 20:23:09 -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 xgKcqfDmJSXa for <tarantool-patches@freelists.org>;
	Tue, 20 Aug 2019 20:23:09 -0400 (EDT)
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 turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 1EA622503F
	for <tarantool-patches@freelists.org>; Tue, 20 Aug 2019 20:23:08 -0400 (EDT)
Content-Type: text/plain;
	charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\))
Subject: [tarantool-patches] Re: [PATCH 2/3] txn: merge struct sql_txn into
 struct txn
From: "n.pettik" <korablev@tarantool.org>
In-Reply-To: <de0f9b60-e565-02fc-5ac9-3444f8206489@tarantool.org>
Date: Wed, 21 Aug 2019 03:23:06 +0300
Content-Transfer-Encoding: quoted-printable
Message-Id: <3F4125D8-E07C-4FF9-A5D2-550C747BD2B4@tarantool.org>
References: <cover.1565190104.git.korablev@tarantool.org>
 <7d398281ec92e03c1d6f5f1bf93970debcfcc684.1565190104.git.korablev@tarantool.org>
 <f61b7549-121c-c516-7036-7a3ea6a1e61e@tarantool.org>
 <97A342BD-97BD-451F-A54B-A9CF18D352A3@tarantool.org>
 <b080e29d-2878-d30b-be88-db8d614542d4@tarantool.org>
 <D1974CF9-2539-423A-9448-1215963F5D12@tarantool.org>
 <de0f9b60-e565-02fc-5ac9-3444f8206489@tarantool.org>
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: <mailto:tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-Subscribe: <mailto: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: tarantool-patches@freelists.org
Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>



> On 19 Aug 2019, at 23:47, Vladislav Shpilevoy =
<v.shpilevoy@tarantool.org> wrote:
>=20
> Hi! Thanks for the fixes! Mine is in a separate commit
> on the branch (after "txn: merge struct sql_txn into struct txn"),
> and below. Please, squash if you are ok with that.

Yep, thanks, squashed.

> Talking of savepoint duplicate names - it is a bug existing in 2.2.1
> too. I think, we should backport the fix. Or not. Up to Kirill.
>=20
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>=20
> commit e955f4ad3ad4114a15f35594153ed66f3c23d661
> Author: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
> Date:   Mon Aug 19 22:39:15 2019 +0200
>=20
>    Review fix
>=20
> diff --git a/src/box/txn.c b/src/box/txn.c
> index bd024a73c..1002c2136 100644
> --- a/src/box/txn.c
> +++ b/src/box/txn.c
> @@ -805,7 +805,7 @@ box_txn_rollback_to_savepoint(box_txn_savepoint_t =
*svp)
> 	}
> 	txn_rollback_to_svp(txn, svp->stmt);
> 	/* Discard from list all newer savepoints. */
> -	struct rlist discard =3D { };
> +	RLIST_HEAD(discard);
> 	rlist_cut_before(&discard, &txn->savepoints, &svp->link);
> 	txn->fk_deferred_count =3D svp->fk_deferred_count;
> 	return 0;
> @@ -825,7 +825,7 @@ txn_savepoint_release(struct txn_savepoint *svp)
> 	 * Discard current savepoint alongside with all
> 	 * created after it savepoints.
> 	 */
> -	struct rlist discard =3D { };
> +	RLIST_HEAD(discard);
> 	rlist_cut_before(&discard, &txn->savepoints, =
rlist_next(&svp->link));
> }
>=20
>=20