From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Alexander Turenko <alexander.turenko@tarantool.org> Cc: Roman Khabibov <roman.habibov@tarantool.org>, tarantool-patches@freelists.org, Konstantin Osipov <kostja.osipov@gmail.com>, Kirill Yukhin <kyukhin@tarantool.org> Subject: [tarantool-patches] Re: [PATCH] net.box: ignore absence of _vcollation Date: Tue, 30 Jul 2019 22:18:16 +0200 [thread overview] Message-ID: <c6908e41-d461-57b0-ca3c-e60f436c5dd5@tarantool.org> (raw) In-Reply-To: <20190730105847.5bfgdhqqcxoqz7bh@tkn_work_nb> 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.
next prev parent reply other threads:[~2019-07-30 20:16 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-08 12:13 [tarantool-patches] " Roman Khabibov 2019-07-12 9:55 ` [tarantool-patches] " Kirill Yukhin 2019-07-19 12:16 ` Roman Khabibov 2019-07-20 19:07 ` Alexander Turenko 2019-07-24 21:27 ` Alexander Turenko 2019-07-24 22:43 ` Vladislav Shpilevoy 2019-07-30 10:58 ` Alexander Turenko 2019-07-30 12:08 ` Konstantin Osipov 2019-07-30 20:18 ` Vladislav Shpilevoy [this message] 2019-07-30 22:35 ` Alexander Turenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c6908e41-d461-57b0-ca3c-e60f436c5dd5@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=kostja.osipov@gmail.com \ --cc=kyukhin@tarantool.org \ --cc=roman.habibov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH] net.box: ignore absence of _vcollation' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox