From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [94.100.177.108]) (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 91328469719 for ; Mon, 16 Mar 2020 12:02:26 +0300 (MSK) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3608.60.0.2.5\)) From: Chris Sosnin In-Reply-To: Date: Mon, 16 Mar 2020 12:02:25 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: <09EA2B12-D7C5-4076-A5F0-8CDBF78EF620@tarantool.org> References: <9547e0b11186786ebbc507536938f2764cb5fe58.1583917262.git.k.sosnin@tarantool.org> 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: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Hi! Thank you for the review! > On 15 Mar 2020, at 18:31, Vladislav Shpilevoy = wrote: >=20 > Hi! Thanks for the patch! >=20 > See 2 comments below. >=20 >> 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) >> } >>=20 >> /** >> - * Complete sending an iproto error:=20 >> + * Complete sending an iproto error: >=20 > 1. Seems like a stray not related change. I didn=E2=80=99t notice that my editor trimmed this trailing whitespace. = I=E2=80=99m sorry. Reverted on branch. >=20 >> * 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 =3D require('test_run').new() >> + | --- >> + | ... >> +test_run:cmd("setopt delimiter ';'") >=20 > 2. Why? You never use the new delimiter until you > reset it back to normal. >=20 > You don't even need test_run =3D 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 =3D require('net.box') + | --- + | ... +msgpack =3D require('msgpack') + | --- + | ... +urilib =3D require('uri') + | --- + | ... + +IPROTO_REQUEST_TYPE =3D 0x00 + | --- + | ... +IPROTO_PREPARE =3D 13 + | --- + | ... +IPROTO_SQL_TEXT =3D 0x40 + | --- + | ... +IPROTO_STMT_ID =3D 0x43 + | --- + | ... + +box.schema.user.grant('guest', 'read, write, execute', 'universe') >=20 >> + | --- >> + | - true >> + | ... >> + >> +net_box =3D require('net.box') >> +msgpack =3D require('msgpack') >> +urilib =3D require('uri') >> + >> +IPROTO_REQUEST_TYPE =3D 0x00 >> +IPROTO_PREPARE =3D 13 >> +IPROTO_SQL_TEXT =3D 0x40 >> +IPROTO_STMT_ID =3D 0x43 >> + >> +test_run:cmd("setopt delimiter ''"); >> + | --- >> + | ... >> +