From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [94.100.177.106]) (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 80EFA469719 for ; Tue, 17 Mar 2020 01:01:55 +0300 (MSK) References: <9547e0b11186786ebbc507536938f2764cb5fe58.1583917262.git.k.sosnin@tarantool.org> <09EA2B12-D7C5-4076-A5F0-8CDBF78EF620@tarantool.org> From: Vladislav Shpilevoy Message-ID: Date: Mon, 16 Mar 2020 23:01:52 +0100 MIME-Version: 1.0 In-Reply-To: <09EA2B12-D7C5-4076-A5F0-8CDBF78EF620@tarantool.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Tarantool-patches] [PATCH v3 2/2] iproto: add an empty body to the unprepare response List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Chris Sosnin Cc: tarantool-patches@dev.tarantool.org LGTM. On 16/03/2020 10:02, Chris Sosnin wrote: > Hi! Thank you for the review! > >> On 15 Mar 2020, at 18:31, Vladislav Shpilevoy wrote: >> >> Hi! Thanks for the patch! >> >> See 2 comments below. >> >>> diff --git a/src/box/iproto.cc b/src/box/iproto.cc >>> index f313af6ae..5a3fb5d0b 100644 >>> --- a/src/box/iproto.cc >>> +++ b/src/box/iproto.cc >>> @@ -1871,7 +1874,7 @@ net_send_msg(struct cmsg *m) >>> } >>> >>> /** >>> - * Complete sending an iproto error: >>> + * Complete sending an iproto error: >> >> 1. Seems like a stray not related change. > > I didn’t notice that my editor trimmed this trailing whitespace. I’m sorry. > Reverted on branch. > >> >>> * recycle the error object and flush output. >>> */ >>> static void >>> diff --git a/test/box/gh-4769-unprepare-response-body.result b/test/box/gh-4769-unprepare-response-body.result >>> new file mode 100644 >>> index 000000000..a5230fad1 >>> --- /dev/null >>> +++ b/test/box/gh-4769-unprepare-response-body.result >>> @@ -0,0 +1,62 @@ >>> +-- test-run result file version 2 >>> +test_run = require('test_run').new() >>> + | --- >>> + | ... >>> +test_run:cmd("setopt delimiter ';'") >> >> 2. Why? You never use the new delimiter until you >> reset it back to normal. >> >> You don't even need test_run = require('test_run').new(), >> because without the needless delimiter change the >> test_run object is also unused. > > I did this to reduce output in the .result file. Fixed: > > +-- test-run result file version 2 > +net_box = require('net.box') > + | --- > + | ... > +msgpack = require('msgpack') > + | --- > + | ... > +urilib = require('uri') > + | --- > + | ... > + > +IPROTO_REQUEST_TYPE = 0x00 > + | --- > + | ... > +IPROTO_PREPARE = 13 > + | --- > + | ... > +IPROTO_SQL_TEXT = 0x40 > + | --- > + | ... > +IPROTO_STMT_ID = 0x43 > + | --- > + | ... > + > +box.schema.user.grant('guest', 'read, write, execute', 'universe') > >> >>> + | --- >>> + | - true >>> + | ... >>> + >>> +net_box = require('net.box') >>> +msgpack = require('msgpack') >>> +urilib = require('uri') >>> + >>> +IPROTO_REQUEST_TYPE = 0x00 >>> +IPROTO_PREPARE = 13 >>> +IPROTO_SQL_TEXT = 0x40 >>> +IPROTO_STMT_ID = 0x43 >>> + >>> +test_run:cmd("setopt delimiter ''"); >>> + | --- >>> + | ... >>> + >