From: Alexander Turenko <alexander.turenko@tarantool.org> To: Vladimir Davydov <vdavydov.dev@gmail.com> Cc: Alexander Turenko <alexander.turenko@tarantool.org>, tarantool-patches@freelists.org Subject: [PATCH v2 3/6] lua: add luaT_newtuple() Date: Wed, 9 Jan 2019 23:20:11 +0300 [thread overview] Message-ID: <e77761560ff8840239cb2f70a12a21b6906486bd.1547064388.git.alexander.turenko@tarantool.org> (raw) In-Reply-To: <cover.1547064388.git.alexander.turenko@tarantool.org> The function allows to create a tuple with specific tuple format in C code using a Lua table, an another tuple or objects on a Lua stack. Needed for #3276. --- src/box/lua/tuple.c | 91 +++++++++++++++++++++++++++++++++------------ src/box/lua/tuple.h | 15 ++++++++ 2 files changed, 83 insertions(+), 23 deletions(-) diff --git a/src/box/lua/tuple.c b/src/box/lua/tuple.c index 1867f810f..7e9ad89fe 100644 --- a/src/box/lua/tuple.c +++ b/src/box/lua/tuple.c @@ -92,6 +92,65 @@ luaT_istuple(struct lua_State *L, int narg) return *(struct tuple **) data; } +struct tuple * +luaT_newtuple(struct lua_State *L, int idx, box_tuple_format_t *format) +{ + struct tuple *tuple; + + if (idx == 0 || lua_istable(L, idx)) { + struct ibuf *buf = tarantool_lua_ibuf; + ibuf_reset(buf); + struct mpstream stream; + mpstream_init(&stream, buf, ibuf_reserve_cb, ibuf_alloc_cb, + luamp_error, L); + if (idx == 0) { + /* + * Create the tuple from lua stack + * objects. + */ + int argc = lua_gettop(L); + mpstream_encode_array(&stream, argc); + for (int k = 1; k <= argc; ++k) { + luamp_encode(L, luaL_msgpack_default, &stream, + k); + } + } else { + /* Create the tuple from a Lua table. */ + luamp_encode_tuple(L, luaL_msgpack_default, &stream, + idx); + } + mpstream_flush(&stream); + tuple = box_tuple_new(format, buf->buf, + buf->buf + ibuf_used(buf)); + if (tuple == NULL) { + luaT_pusherror(L, diag_last_error(diag_get())); + return NULL; + } + ibuf_reinit(tarantool_lua_ibuf); + return tuple; + } + + tuple = luaT_istuple(L, idx); + if (tuple == NULL) { + lua_pushfstring(L, "A tuple or a table expected, got %s", + lua_typename(L, lua_type(L, -1))); + return NULL; + } + + /* + * Create the new tuple with the necessary format from + * the another tuple. + */ + const char *tuple_beg = tuple_data(tuple); + const char *tuple_end = tuple_beg + tuple->bsize; + tuple = box_tuple_new(format, tuple_beg, tuple_end); + if (tuple == NULL) { + luaT_pusherror(L, diag_last_error(diag_get())); + return NULL; + } + return tuple; +} + int lbox_tuple_new(lua_State *L) { @@ -100,33 +159,19 @@ lbox_tuple_new(lua_State *L) lua_newtable(L); /* create an empty tuple */ ++argc; } - struct ibuf *buf = tarantool_lua_ibuf; - - ibuf_reset(buf); - struct mpstream stream; - mpstream_init(&stream, buf, ibuf_reserve_cb, ibuf_alloc_cb, - luamp_error, L); - - if (argc == 1 && (lua_istable(L, 1) || luaT_istuple(L, 1))) { - /* New format: box.tuple.new({1, 2, 3}) */ - luamp_encode_tuple(L, luaL_msgpack_default, &stream, 1); - } else { - /* Backward-compatible format: box.tuple.new(1, 2, 3). */ - mpstream_encode_array(&stream, argc); - for (int k = 1; k <= argc; ++k) { - luamp_encode(L, luaL_msgpack_default, &stream, k); - } - } - mpstream_flush(&stream); - + /* + * Use backward-compatible parameters format: + * box.tuple.new(1, 2, 3) (idx == 0), or the new one: + * box.tuple.new({1, 2, 3}) (idx == 1). + */ + int idx = argc == 1 && (lua_istable(L, 1) || + luaT_istuple(L, 1)); box_tuple_format_t *fmt = box_tuple_format_default(); - struct tuple *tuple = box_tuple_new(fmt, buf->buf, - buf->buf + ibuf_used(buf)); + struct tuple *tuple = luaT_newtuple(L, idx, fmt); if (tuple == NULL) - return luaT_error(L); + return lua_error(L); /* box_tuple_new() doesn't leak on exception, see public API doc */ luaT_pushtuple(L, tuple); - ibuf_reinit(tarantool_lua_ibuf); return 1; } diff --git a/src/box/lua/tuple.h b/src/box/lua/tuple.h index 5d7062eb8..3319b951e 100644 --- a/src/box/lua/tuple.h +++ b/src/box/lua/tuple.h @@ -41,6 +41,8 @@ typedef struct tuple box_tuple_t; struct lua_State; struct mpstream; struct luaL_serializer; +struct tuple_format; +typedef struct tuple_format box_tuple_format_t; /** \cond public */ @@ -66,6 +68,19 @@ luaT_istuple(struct lua_State *L, int idx); /** \endcond public */ +/** + * Create the new tuple with specific format from a Lua table, a + * tuple or objects on the lua stack. + * + * Set idx to zero to create the new tuple from objects on the lua + * stack. + * + * In case of an error push the error message to the Lua stack and + * return NULL. + */ +struct tuple * +luaT_newtuple(struct lua_State *L, int idx, box_tuple_format_t *format); + int lbox_tuple_new(struct lua_State *L); -- 2.20.1
next prev parent reply other threads:[~2019-01-09 20:20 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-09 20:20 [PATCH v2 0/6] Merger Alexander Turenko 2019-01-09 20:20 ` [PATCH v2 1/6] Add luaL_iscallable with support of cdata metatype Alexander Turenko 2019-01-10 12:21 ` Vladimir Davydov 2019-01-09 20:20 ` [PATCH v2 2/6] Add functions to ease using Lua iterators from C Alexander Turenko 2019-01-10 12:29 ` Vladimir Davydov 2019-01-15 23:26 ` Alexander Turenko 2019-01-16 8:18 ` Vladimir Davydov 2019-01-16 11:40 ` Alexander Turenko 2019-01-16 12:20 ` Vladimir Davydov 2019-01-17 1:20 ` Alexander Turenko 2019-01-28 18:17 ` Alexander Turenko 2019-03-01 4:04 ` Alexander Turenko 2019-01-09 20:20 ` Alexander Turenko [this message] 2019-01-10 12:44 ` [PATCH v2 3/6] lua: add luaT_newtuple() Vladimir Davydov 2019-01-18 21:58 ` Alexander Turenko 2019-01-23 16:12 ` Vladimir Davydov 2019-01-28 16:51 ` Alexander Turenko 2019-03-01 4:08 ` Alexander Turenko 2019-01-09 20:20 ` [PATCH v2 4/6] lua: add luaT_new_key_def() Alexander Turenko 2019-01-10 13:07 ` Vladimir Davydov 2019-01-29 18:52 ` Alexander Turenko 2019-01-30 10:58 ` Alexander Turenko 2019-03-01 4:10 ` Alexander Turenko 2019-01-09 20:20 ` [PATCH v2 5/6] net.box: add helpers to decode msgpack headers Alexander Turenko 2019-01-10 17:29 ` Vladimir Davydov 2019-02-01 15:11 ` Alexander Turenko 2019-03-05 12:00 ` Alexander Turenko 2019-01-09 20:20 ` [PATCH v2 6/6] Add merger for tuple streams 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=e77761560ff8840239cb2f70a12a21b6906486bd.1547064388.git.alexander.turenko@tarantool.org \ --to=alexander.turenko@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [PATCH v2 3/6] lua: add luaT_newtuple()' \ /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