[tarantool-patches] [PATCH] tarantoolctl: fix cat and play for empty body requests

Serge Petrenko sergepetrenko at tarantool.org
Fri Sep 14 17:39:59 MSK 2018



> 13 сент. 2018 г., в 16:04, Vladimir Davydov <vdavydov.dev at gmail.com> написал(а):
> 
> On Tue, Sep 11, 2018 at 07:15:06PM +0300, Serge Petrenko wrote:
>> If space.before_replace returns the old tuple, the operation turns into
>> no-op, but is still written to WAL as IPROTO_NOP for the sake of
>> replication. Such a request doesn't have a body, and tarantoolctl failed
>> to parse such requests in `tarantoolctl cat` and `tarantoolctl play`.
>> Fix this by skipping such requests, since they have no effect anyway.
>> 
>> Closes #3675
>> ---
>> https://github.com/tarantool/tarantool/issues/3675
>> https://github.com/tarantool/tarantool/tree/sp/gh-3675-tarantoolctl-cat-empty-body
>> 
>> extra/dist/tarantoolctl.in | 18 ++++++++++++------
>> 1 file changed, 12 insertions(+), 6 deletions(-)
> 
> Please add a test.
> 
>> 
>> 
>> +            end
> 
> Nit:
> 
>  local sid = record.BODY and record.BODY.space_id
> 
>>             local rid = record.HEADER.replica_id
>> -            if (lsn < from) or
>> +            if (lsn < from) or sid == nil or
> 
> I want to see BODY-less requests in the output while this code makes
> tarantoolctl-cat ignore them AFAIU.
> 
>>                (not spaces and sid and sid < 512 and not show_system) or
>> 
>> -            if (lsn < from) or
>> +            if (lsn < from) or sid == nil or
>>                (not spaces and sid and sid < 512 and not show_system) or
>> -               (spaces and (sid == nil or not find_in_list(sid, spaces))) or
>> +               (spaces and not find_in_list(sid, spaces)) or
>>                (replicas and not find_in_list(rid, replicas)) then
>>                 -- pass this tuple
>>             elseif lsn >= to then
> 

Hi! I fixed all your comments and resent the patch as a part of a patchset together with
a patch regarding #3678.




More information about the Tarantool-patches mailing list