From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Kirill Shcherbatov <kshcherbatov@tarantool.org> Cc: tarantool-patches@freelists.org Subject: Re: [tarantool-patches] [PATCH v3 4/7] lib: update msgpuck library Date: Thu, 4 Apr 2019 18:54:33 +0300 [thread overview] Message-ID: <20190404155433.6abpuiwakrxjyktg@esperanza> (raw) In-Reply-To: <afcd9afd-3e14-abc1-3857-7c26338fc561@tarantool.org> On Wed, Apr 03, 2019 at 08:49:21PM +0300, Kirill Shcherbatov wrote: > diff --git a/src/box/tuple_format.c b/src/box/tuple_format.c > index 9a643b700..7cfdd73bc 100644 > --- a/src/box/tuple_format.c > +++ b/src/box/tuple_format.c > @@ -974,8 +974,8 @@ tuple_parse_iterator_advice(struct tuple_parse_iterator *it, > struct tuple_field **field, const char **data, > const char **data_end) Once you figure out why msgpuck build failed on Travis (see my other email), please rebase this patch on top of the master branch so that we can push it right away. > { > - int idx, rc = 0; > - while ((idx = mp_stack_advance(&it->stack)) == -1) { > + int rc = 0; > + while (!mp_frame_advance(mp_stack_top(&it->stack))) { > /* > * If the elements of the current frame > * are over, pop this frame out of stack > @@ -993,12 +993,13 @@ tuple_parse_iterator_advice(struct tuple_parse_iterator *it, > * current data offset to prepare the JSON token > * for the subsequent format::fields lookup. > */ > + struct mp_frame *frame = mp_stack_top(&it->stack); Can we please refactor it a little so that we don't call mp_stack_top twice in case the frame is advanced? diff --git a/src/box/tuple_format.c b/src/box/tuple_format.c index 1043707a..d3c82a7a 100644 --- a/src/box/tuple_format.c +++ b/src/box/tuple_format.c @@ -850,8 +850,8 @@ tuple_field_map_create(struct tuple_format *format, const char *tuple, struct tuple_field *field; struct json_token *parent = &format->fields.root; while (true) { - int idx; - while ((idx = mp_stack_advance(&stack)) == -1) { + struct mp_stack_frame *frame = mp_stack_top(&stack); + while (!mp_frame_advance(frame)) { /* * If the elements of the current frame * are over, pop this frame out of stack @@ -863,6 +863,7 @@ tuple_field_map_create(struct tuple_format *format, const char *tuple, mp_stack_pop(&stack); if (mp_stack_is_empty(&stack)) goto finish; + frame = mp_stack_top(&stack); parent = parent->parent; } /*
next prev parent reply other threads:[~2019-04-04 15:54 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-02 15:49 [PATCH v3 0/7] box: introduce multikey indexes in memtx Kirill Shcherbatov 2019-04-02 15:49 ` [PATCH v3 1/7] box: cleanup key_def virtual extract_key setter Kirill Shcherbatov 2019-04-03 12:42 ` Vladimir Davydov 2019-04-03 16:22 ` [tarantool-patches] " Kirill Shcherbatov 2019-04-03 18:01 ` Vladimir Davydov 2019-04-02 15:49 ` [PATCH v3 2/7] lib: introduce a new json_path_multikey_offset helper Kirill Shcherbatov 2019-04-03 12:56 ` Vladimir Davydov 2019-04-03 16:22 ` [tarantool-patches] " Kirill Shcherbatov 2019-04-03 18:02 ` Vladimir Davydov 2019-04-04 6:17 ` Konstantin Osipov 2019-04-02 15:49 ` [PATCH v3 3/7] box: move offset_slot init to tuple_format_add_field Kirill Shcherbatov 2019-04-03 12:57 ` Vladimir Davydov 2019-04-03 18:02 ` Vladimir Davydov 2019-04-04 6:19 ` [tarantool-patches] " Konstantin Osipov 2019-04-05 17:17 ` [tarantool-patches] " Kirill Shcherbatov 2019-04-02 15:49 ` [PATCH v3 4/7] lib: update msgpuck library Kirill Shcherbatov 2019-04-03 17:49 ` [tarantool-patches] " Kirill Shcherbatov 2019-04-04 15:54 ` Vladimir Davydov [this message] 2019-04-05 17:17 ` [tarantool-patches] " Kirill Shcherbatov 2019-04-07 12:22 ` Vladimir Davydov 2019-04-02 15:49 ` [PATCH v3 5/7] box: introduce tuple_parse_iterator class Kirill Shcherbatov 2019-04-03 14:04 ` Vladimir Davydov 2019-04-05 17:17 ` [tarantool-patches] " Kirill Shcherbatov 2019-04-02 15:49 ` [PATCH v3 6/7] box: introduce field_map_builder class Kirill Shcherbatov 2019-04-03 14:38 ` Vladimir Davydov 2019-04-05 17:17 ` [tarantool-patches] " Kirill Shcherbatov 2019-04-03 16:30 ` Vladimir Davydov 2019-04-02 15:49 ` [PATCH v3 7/7] box: introduce multikey indexes in memtx Kirill Shcherbatov 2019-04-04 14:20 ` Vladimir Davydov
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=20190404155433.6abpuiwakrxjyktg@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=kshcherbatov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v3 4/7] lib: update msgpuck library' \ /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