From: Alexander Turenko <alexander.turenko@tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko <alexander.turenko@tarantool.org> Subject: [Tarantool-patches] [PATCH v3 04/16] lua: factor out tuple encoding from luaT_tuple_new Date: Tue, 13 Oct 2020 02:23:11 +0300 [thread overview] Message-ID: <01e76c42466b2222ee83de66f7f9c48043255b50.1602541394.git.alexander.turenko@tarantool.org> (raw) In-Reply-To: <cover.1602541394.git.alexander.turenko@tarantool.org> It simplifies further changes around encoding a tuple: next commits will get rid of throwing serialization errors and will expose a function to encode a table (or tuple) from the Lua stack on the box region to the module API. Part of #5273 Part of #5382 --- src/box/lua/tuple.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/box/lua/tuple.c b/src/box/lua/tuple.c index 03b4b8a2e..ed97c85e4 100644 --- a/src/box/lua/tuple.c +++ b/src/box/lua/tuple.c @@ -98,8 +98,9 @@ luaT_istuple(struct lua_State *L, int narg) return *(struct tuple **) data; } -struct tuple * -luaT_tuple_new(struct lua_State *L, int idx, box_tuple_format_t *format) +static char * +luaT_tuple_encode_on_lua_ibuf(struct lua_State *L, int idx, + size_t *tuple_len_ptr) { if (idx != 0 && !lua_istable(L, idx) && !luaT_istuple(L, idx)) { diag_set(IllegalParams, "A tuple or a table expected, got %s", @@ -127,8 +128,20 @@ luaT_tuple_new(struct lua_State *L, int idx, box_tuple_format_t *format) luamp_encode_tuple(L, &tuple_serializer, &stream, idx); } mpstream_flush(&stream); - struct tuple *tuple = box_tuple_new(format, buf->buf, - buf->buf + ibuf_used(buf)); + if (tuple_len_ptr != NULL) + *tuple_len_ptr = ibuf_used(buf); + return buf->buf; +} + +struct tuple * +luaT_tuple_new(struct lua_State *L, int idx, box_tuple_format_t *format) +{ + size_t tuple_len; + char *tuple_data = luaT_tuple_encode_on_lua_ibuf(L, idx, &tuple_len); + if (tuple_data == NULL) + return NULL; + struct tuple *tuple = box_tuple_new(format, tuple_data, + tuple_data + tuple_len); if (tuple == NULL) return NULL; ibuf_reinit(tarantool_lua_ibuf); -- 2.25.0
next prev parent reply other threads:[~2020-10-12 23:23 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-12 23:23 [Tarantool-patches] [PATCH v3 00/16] module api: extend for external key_def Lua module Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 01/16] module api: get rid of typedef redefinitions Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 02/16] module api: expose box region Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 13:17 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 03/16] module api/lua: add luaL_iscdata() function Alexander Turenko 2020-10-12 23:23 ` Alexander Turenko [this message] 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 05/16] lua: don't raise a Lua error from luaT_tuple_new() Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 13:17 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 06/16] module api/lua: add luaT_tuple_encode() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 07/16] module api/lua: expose luaT_tuple_new() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 08/16] module api/lua: add API_EXPORT to tuple functions Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 2:35 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 09/16] module api: add API_EXPORT to key_def functions Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 10/16] module api: add box_key_def_new_v2() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 11/16] module api: add box_key_def_dump_parts() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 12/16] module api: expose box_key_def_validate_tuple() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 13/16] module api: expose box_key_def_merge() Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 14/16] module api: expose box_key_def_extract_key() Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 2:39 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 15/16] module api: add box_key_def_validate_key() Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 13:18 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 16/16] module api: add box_key_def_validate_full_key() Alexander Turenko 2020-10-14 23:41 ` [Tarantool-patches] [PATCH v3 00/16] module api: extend for external key_def Lua module Vladislav Shpilevoy 2020-10-15 3:09 ` Alexander Turenko 2020-10-15 13:19 ` Alexander Turenko 2020-10-16 6:05 ` Alexander Turenko 2020-10-15 20:12 ` Vladislav Shpilevoy
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=01e76c42466b2222ee83de66f7f9c48043255b50.1602541394.git.alexander.turenko@tarantool.org \ --to=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 04/16] lua: factor out tuple encoding from luaT_tuple_new' \ /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