From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id ACC66256CE for ; Tue, 30 Jul 2019 16:16:10 -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 vLjVlctMAth9 for ; Tue, 30 Jul 2019 16:16:10 -0400 (EDT) Received: from smtp55.i.mail.ru (smtp55.i.mail.ru [217.69.128.35]) (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 3F32E2581D for ; Tue, 30 Jul 2019 16:16:10 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH] net.box: ignore absence of _vcollation References: <20190708121338.76309-1-roman.habibov@tarantool.org> <20190712095549.ac4hhaxhxzgaik5i@tarantool.org> <20190720190714.5pejxoy2ae43nssp@tkn_work_nb> <20190724212743.jwrti2iuclleogjq@tkn_work_nb> <20190730105847.5bfgdhqqcxoqz7bh@tkn_work_nb> From: Vladislav Shpilevoy Message-ID: Date: Tue, 30 Jul 2019 22:18:16 +0200 MIME-Version: 1.0 In-Reply-To: <20190730105847.5bfgdhqqcxoqz7bh@tkn_work_nb> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: Alexander Turenko Cc: Roman Khabibov , tarantool-patches@freelists.org, Konstantin Osipov , Kirill Yukhin Hi! Thanks for the patch! > diff --git a/src/box/lua/net_box.lua b/src/box/lua/net_box.lua > index 2892bb3d3..31a8c16b7 100644 > --- a/src/box/lua/net_box.lua > +++ b/src/box/lua/net_box.lua > @@ -754,6 +768,8 @@ local function create_transport(host, port, user, password, callback, > if err then return error_sm(err, hdr) end > dispatch_response_iproto(hdr, body_rpos, body_end) > local id = hdr[IPROTO_SYNC_KEY] > + -- trick: omit check for peer_has_vcollation: id is > + -- not nil Nit: usually we start comments with a capital letter and finish with a dot. Here and in other hunks. Other than that the patch LGTM. > if id == select1_id or id == select2_id or id == select3_id then > -- response to a schema query we've submitted > local status = hdr[IPROTO_STATUS_KEY] > diff --git a/test/box/net.box.result b/test/box/net.box.result > index 1d9f43400..e3dabf7d9 100644 > --- a/test/box/net.box.result > +++ b/test/box/net.box.result > @@ -2905,18 +2905,41 @@ c = net:connect(box.cfg.listen) > +#parts == 1 > +--- > +- true > +... > +parts[1].fieldno == 1 > +--- > +- true > +... > +parts[1].type == 'string' > +--- > +- true > +... > +parts[1].is_nullable == false > +--- > +- true > +... > +if _TARANTOOL >= '2.2.1' then \ > + return parts[1].collation == 'test' \ > +else \ > + return parts[1].collation_id == collation_id \ I like this new test-run feature with '\', looks way better than setopt delimited, and looks like C.