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 v3 3/7] lua: optimize creation of a tuple from a tuple
Date: Wed, 10 Apr 2019 18:21:21 +0300 [thread overview]
Message-ID: <eb8d159b6f049306a12d160e4cd334ce77ed4a14.1554906327.git.alexander.turenko@tarantool.org> (raw)
In-Reply-To: <cover.1554906327.git.alexander.turenko@tarantool.org>
Don't parse tuple data, just copy it.
---
src/box/lua/tuple.c | 65 ++++++++++++++++++++++++++++-----------------
1 file changed, 41 insertions(+), 24 deletions(-)
diff --git a/src/box/lua/tuple.c b/src/box/lua/tuple.c
index 183c3901d..c57945997 100644
--- a/src/box/lua/tuple.c
+++ b/src/box/lua/tuple.c
@@ -96,37 +96,54 @@ luaT_istuple(struct lua_State *L, int narg)
struct tuple *
luaT_tuple_new(struct lua_State *L, int idx, box_tuple_format_t *format)
{
- if (idx != 0 && !lua_istable(L, idx) && !luaT_istuple(L, idx)) {
+ 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, &tuple_serializer, &stream, idx);
+ }
+ mpstream_flush(&stream);
+ tuple = box_tuple_new(format, buf->buf,
+ buf->buf + ibuf_used(buf));
+ if (tuple == NULL)
+ return NULL;
+ ibuf_reinit(tarantool_lua_ibuf);
+ return tuple;
+ }
+
+ tuple = luaT_istuple(L, idx);
+ if (tuple == NULL) {
diag_set(IllegalParams, "A tuple or a table expected, got %s",
lua_typename(L, lua_type(L, idx)));
return NULL;
}
- 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, &tuple_serializer, &stream, idx);
- }
- mpstream_flush(&stream);
- struct tuple *tuple = box_tuple_new(format, buf->buf,
- buf->buf + ibuf_used(buf));
+ /*
+ * Create a new tuple with the necessary format from
+ * 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)
return NULL;
- ibuf_reinit(tarantool_lua_ibuf);
return tuple;
}
--
2.20.1
next prev parent reply other threads:[~2019-04-10 15:21 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-10 15:21 [PATCH v3 0/7] Merger Alexander Turenko
2019-04-10 15:21 ` [PATCH v3 1/7] Add luaL_iscallable with support of cdata metatype Alexander Turenko
2019-04-18 17:30 ` [tarantool-patches] " Konstantin Osipov
2019-04-30 12:45 ` Vladimir Davydov
2019-04-10 15:21 ` [PATCH v3 2/7] Add functions to ease using Lua iterators from C Alexander Turenko
2019-04-18 17:31 ` [tarantool-patches] " Konstantin Osipov
2019-04-30 12:46 ` Vladimir Davydov
2019-04-10 15:21 ` Alexander Turenko [this message]
2019-04-18 17:32 ` [tarantool-patches] [PATCH v3 3/7] lua: optimize creation of a tuple from a tuple Konstantin Osipov
2019-04-30 12:50 ` Vladimir Davydov
2019-04-30 15:07 ` Alexander Turenko
2019-04-10 15:21 ` [PATCH v3 4/7] lua: add non-recursive msgpack decoding functions Alexander Turenko
2019-04-18 17:35 ` [tarantool-patches] " Konstantin Osipov
2019-04-18 18:30 ` Alexander Turenko
2019-04-18 18:33 ` Konstantin Osipov
2019-04-18 18:44 ` Alexander Turenko
2019-04-30 13:03 ` Vladimir Davydov
2019-04-30 18:38 ` Alexander Turenko
2019-04-10 15:21 ` [PATCH v3 5/7] net.box: add skip_header option to use with buffer Alexander Turenko
2019-04-18 17:37 ` [tarantool-patches] " Konstantin Osipov
2019-04-18 18:39 ` Alexander Turenko
2019-04-30 13:16 ` Vladimir Davydov
2019-04-30 18:39 ` Alexander Turenko
2019-04-10 15:21 ` [PATCH v3 6/7] Add merger for tuples streams (C part) Alexander Turenko
2019-04-25 11:43 ` [tarantool-patches] " Konstantin Osipov
2019-04-25 13:32 ` Alexander Turenko
2019-04-25 13:45 ` Konstantin Osipov
2019-04-25 15:32 ` [tarantool-patches] " Alexander Turenko
2019-04-25 16:42 ` Konstantin Osipov
2019-04-30 15:34 ` Vladimir Davydov
2019-05-07 22:14 ` Alexander Turenko
2019-04-10 15:21 ` [PATCH v3 7/7] Add merger for tuple streams (Lua part) Alexander Turenko
2019-04-25 11:46 ` [tarantool-patches] " Konstantin Osipov
2019-04-25 12:53 ` Alexander Turenko
2019-04-25 13:30 ` Konstantin Osipov
2019-04-30 17:37 ` Vladimir Davydov
2019-04-30 21:09 ` [tarantool-patches] " Konstantin Osipov
2019-05-02 9:48 ` Vladimir Davydov
2019-05-07 22:14 ` 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=eb8d159b6f049306a12d160e4cd334ce77ed4a14.1554906327.git.alexander.turenko@tarantool.org \
--to=alexander.turenko@tarantool.org \
--cc=tarantool-patches@freelists.org \
--cc=vdavydov.dev@gmail.com \
--subject='Re: [PATCH v3 3/7] lua: optimize creation of a tuple from a tuple' \
/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