From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Kirill Shcherbatov <kshcherbatov@tarantool.org> Cc: tarantool-patches@freelists.org Subject: Re: [tarantool-patches] Re: [PATCH v3 4/7] lib: update msgpuck library Date: Sun, 7 Apr 2019 15:22:25 +0300 [thread overview] Message-ID: <20190407122225.bmufshoojlqjgor7@esperanza> (raw) In-Reply-To: <58a0a5ad-1293-eb8f-704b-88e7ef1961e4@tarantool.org> On Fri, Apr 05, 2019 at 08:17:25PM +0300, Kirill Shcherbatov wrote: > The msgpack dependency has been updated because the new version > introduces the new method mp_stack_top for the mp_stack class > which we will use to store a pointer for a multikey frame to > initialize a field_map in case of multikey index. > > As the library API has changed, the code has been modified > correspondingly. > > Needed for #1012 > --- > src/box/tuple_format.c | 9 +++++---- > src/box/vy_stmt.c | 8 ++++---- > src/lib/msgpuck | 2 +- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/src/box/tuple_format.c b/src/box/tuple_format.c > index 1043707ad..093046b37 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_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; > } > /* > @@ -871,10 +872,10 @@ tuple_field_map_create(struct tuple_format *format, const char *tuple, > * for the subsequent format::fields lookup. > */ > struct json_token token; > - switch (mp_stack_type(&stack)) { > + switch (frame->type) { > case MP_ARRAY: > token.type = JSON_TOKEN_NUM; > - token.num = idx; > + token.num = frame->idx; > break; > case MP_MAP: > if (mp_typeof(*pos) != MP_STR) { > diff --git a/src/box/vy_stmt.c b/src/box/vy_stmt.c > index 7387d72be..776b1f69c 100644 > --- a/src/box/vy_stmt.c > +++ b/src/box/vy_stmt.c > @@ -447,18 +447,18 @@ vy_stmt_new_surrogate_delete_raw(struct tuple_format *format, > struct tuple_field *field; > struct json_token *parent = &format->fields.root; > while (true) { > - int idx; > - while ((idx = mp_stack_advance(&stack)) == -1) { > + struct mp_frame *frame = mp_stack_top(&stack); > + while (!mp_frame_advance(frame)) { > mp_stack_pop(&stack); > if (mp_stack_is_empty(&stack)) > goto finish; > parent = parent->parent; mp_stack_top is missing! This result in assertion failure in engine/json. Looks like you didn't bother to run tests before submitting the patch. Fixed and pushed to master. > } > struct json_token token; > - switch (mp_stack_type(&stack)) { > + switch (frame->type) { > case MP_ARRAY: > token.type = JSON_TOKEN_NUM; > - token.num = idx; > + token.num = frame->idx; > break; > case MP_MAP: > if (mp_typeof(*src_pos) != MP_STR) {
next prev parent reply other threads:[~2019-04-07 12:22 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 2019-04-05 17:17 ` [tarantool-patches] " Kirill Shcherbatov 2019-04-07 12:22 ` Vladimir Davydov [this message] 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=20190407122225.bmufshoojlqjgor7@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=kshcherbatov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] Re: [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