[tarantool-patches] [PATCH v1 08/10] box: add method dump_lua to port
imeevma at tarantool.org
imeevma at tarantool.org
Sat Nov 17 17:04:05 MSK 2018
New method dump_lua dumps saved in port tuples to Lua stack. It
will allow us to call this method from vstream without any other
interaction with port.
Needed for #3505
---
src/box/lua/call.c | 1 +
src/box/port.c | 22 ++++++++++++++++++++++
src/box/port.h | 12 ++++++++++++
3 files changed, 35 insertions(+)
diff --git a/src/box/lua/call.c b/src/box/lua/call.c
index 1f20426..52939ae 100644
--- a/src/box/lua/call.c
+++ b/src/box/lua/call.c
@@ -424,6 +424,7 @@ port_lua_dump_plain(struct port *port, uint32_t *size);
static const struct port_vtab port_lua_vtab = {
.dump_msgpack = port_lua_dump,
.dump_msgpack_16 = port_lua_dump_16,
+ .dump_lua = NULL,
.dump_plain = port_lua_dump_plain,
.destroy = port_lua_destroy,
};
diff --git a/src/box/port.c b/src/box/port.c
index 266cf3d..a65a32d 100644
--- a/src/box/port.c
+++ b/src/box/port.c
@@ -36,6 +36,8 @@
#include <small/mempool.h>
#include <fiber.h>
#include "errinj.h"
+#include "lua/utils.h"
+#include "lua/tuple.h"
static struct mempool port_tuple_entry_pool;
@@ -121,6 +123,19 @@ port_tuple_dump_msgpack(struct port *base, struct obuf *out)
return 1;
}
+static int
+port_tuple_dump_lua(struct port *base, struct lua_State *L)
+{
+ struct port_tuple *port = port_tuple(base);
+ struct port_tuple_entry *pe;
+ int i = 0;
+ for (pe = port->first; pe != NULL; pe = pe->next) {
+ luaT_pushtuple(L, pe->tuple);
+ lua_rawseti(L, -2, ++i);
+ }
+ return port->size;
+}
+
void
port_destroy(struct port *port)
{
@@ -139,6 +154,12 @@ port_dump_msgpack_16(struct port *port, struct obuf *out)
return port->vtab->dump_msgpack_16(port, out);
}
+int
+port_dump_lua(struct port *port, struct lua_State *L)
+{
+ return port->vtab->dump_lua(port, L);
+}
+
const char *
port_dump_plain(struct port *port, uint32_t *size)
{
@@ -161,6 +182,7 @@ port_free(void)
const struct port_vtab port_tuple_vtab = {
.dump_msgpack = port_tuple_dump_msgpack,
.dump_msgpack_16 = port_tuple_dump_msgpack_16,
+ .dump_lua = port_tuple_dump_lua,
.dump_plain = NULL,
.destroy = port_tuple_destroy,
};
diff --git a/src/box/port.h b/src/box/port.h
index 882bb37..3bd83b0 100644
--- a/src/box/port.h
+++ b/src/box/port.h
@@ -78,6 +78,11 @@ struct port_vtab {
*/
int (*dump_msgpack_16)(struct port *port, struct obuf *out);
/**
+ * Dump the content of a port to Lua stack.
+ * On success returns number of entries dumped.
+ */
+ int (*dump_lua)(struct port *port, struct lua_State *L);
+ /**
* Dump a port content as a plain text into a buffer,
* allocated inside.
*/
@@ -185,6 +190,13 @@ int
port_dump_msgpack_16(struct port *port, struct obuf *out);
/**
+ * Same as port_dump(), but use the legacy Tarantool 1.6
+ * format.
+ */
+int
+port_dump_lua(struct port *port, struct lua_State *L);
+
+/**
* Dump a port content as a plain text into a buffer,
* allocated inside.
* @param port Port with data to dump.
--
2.7.4
More information about the Tarantool-patches
mailing list