From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sergepetrenko@tarantool.org>
Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [94.100.177.110])
 (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 C2727469710
 for <tarantool-patches@dev.tarantool.org>;
 Fri, 29 May 2020 14:09:16 +0300 (MSK)
References: <cover.1590403792.git.sergepetrenko@tarantool.org>
 <89a689f86a2d81e9fcd424375ef6d71432b2d720.1590403792.git.sergepetrenko@tarantool.org>
 <280a2b74-dbad-9cee-decf-abfb01b2894b@tarantool.org>
From: Serge Petrenko <sergepetrenko@tarantool.org>
Message-ID: <437633eb-f82e-ecc6-003b-d3040bd2f64f@tarantool.org>
Date: Fri, 29 May 2020 14:09:14 +0300
MIME-Version: 1.0
In-Reply-To: <280a2b74-dbad-9cee-decf-abfb01b2894b@tarantool.org>
Content-Type: text/plain; charset="utf-8"; format="flowed"
Content-Transfer-Encoding: 8bit
Content-Language: ru
Subject: Re: [Tarantool-patches] [PATCH v2 1/2] wal: fix tx boundaries
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: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org


29.05.2020 01:53, Vladislav Shpilevoy пишет:
> Thanks for the patch!
>
>> diff --git a/src/box/wal.c b/src/box/wal.c
>> index b979244e3..ef4d84920 100644
>> --- a/src/box/wal.c
>> +++ b/src/box/wal.c
>> @@ -956,25 +956,37 @@ wal_assign_lsn(struct vclock *vclock_diff, struct vclock *base,
>>   	       struct xrow_header **end)
>>   {
>>   	int64_t tsn = 0;
>> +	struct xrow_header **start = row;
>> +	struct xrow_header **first_glob_row = row;
>>   	/** Assign LSN to all local rows. */
>>   	for ( ; row < end; row++) {
>>   		if ((*row)->replica_id == 0) {
>>   			/*
>>   			 * All rows representing local space data
>> -			 * manipulations are signed wth a zero
>> +			 * manipulations are signed with a zero
>>   			 * instance id. This is also true for
>>   			 * anonymous replicas, since they are
>>   			 * only capable of writing to local and
>>   			 * temporary spaces.
>>   			 */
>> -			if ((*row)->group_id != GROUP_LOCAL)
>> +			if ((*row)->group_id != GROUP_LOCAL) {
>>   				(*row)->replica_id = instance_id;
>> +			}
> Seems like accidental diff.

Thanks! Fixed.

diff --git a/src/box/wal.c b/src/box/wal.c
index ef4d84920..59587510a 100644
--- a/src/box/wal.c
+++ b/src/box/wal.c
@@ -969,9 +969,8 @@ wal_assign_lsn(struct vclock *vclock_diff, struct 
vclock *base,
                          * only capable of writing to local and
                          * temporary spaces.
                          */
-                       if ((*row)->group_id != GROUP_LOCAL) {
+                       if ((*row)->group_id != GROUP_LOCAL)
                                 (*row)->replica_id = instance_id;
-                       }

                         (*row)->lsn = vclock_inc(vclock_diff, 
(*row)->replica_id) +
                                       vclock_get(base, (*row)->replica_id);

-- 
Serge Petrenko