From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Subject: Re: [tarantool-patches] Re: [PATCH v3 4/7] lib: update msgpuck library References: <20190404155433.6abpuiwakrxjyktg@esperanza> From: Kirill Shcherbatov Message-ID: <58a0a5ad-1293-eb8f-704b-88e7ef1961e4@tarantool.org> Date: Fri, 5 Apr 2019 20:17:25 +0300 MIME-Version: 1.0 In-Reply-To: <20190404155433.6abpuiwakrxjyktg@esperanza> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit To: tarantool-patches@freelists.org, Vladimir Davydov List-ID: > Other than that, the patch looks good, BUT for some reason it doesn't > compile on CentOS 6 on Travis, see > > https://travis-ci.org/tarantool/msgpuck/jobs/515314874 > > It fails with > > BFD: /build/BUILDROOT/msgpuck-2.0.23-1.el6.x86_64/usr/lib64/libmsgpuck.a(msgpuck.c.o): invalid relocation type 42 > > Please figure out why is that and fix if possible. > 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. Unfortunately, I don't know what's wrong here. This problem is reproduced even on empty branch(master duplicate) https://travis-ci.org/tarantool/msgpuck/builds/516062909?utm_source=github_status&utm_medium=notification Seems something wrong with el6. I've googled that this connected with -fPIC. > Can we please refactor it a little so that we don't call mp_stack_top > twice in case the frame is advanced? Nice. Tnx! ============================================================ 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; } 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) { diff --git a/src/lib/msgpuck b/src/lib/msgpuck index 222b71aa6..9d04562fd 160000 --- a/src/lib/msgpuck +++ b/src/lib/msgpuck @@ -1 +1 @@ -Subproject commit 222b71aa63e8de6d0015588442d828460560d9be +Subproject commit 9d04562fd898159f68b644ee11975210e15c6871 -- 2.21.0