Skip to content
Snippets Groups Projects
Unverified Commit ab95ddaa authored by Alexander Turenko's avatar Alexander Turenko
Browse files

module api/lua: add luaT_tuple_encode()

It is the same as luaT_tuple_new(), but returns raw MsgPack data (not
<box_tuple_t>) allocated on the box region.

The reason to expose this function is to provide ability to use
box_tuple_compare_with_key() function from an external module for a key
passed as a Lua table. The compare function has the following signature:

 | API_EXPORT int
 | box_tuple_compare_with_key(box_tuple_t *tuple_a, const char *key_b,
 |                            box_key_def_t *key_def);

The second parameter is a key encoded as an MsgPack array, not a tuple
structure. So luaT_tuple_new() is not applicable here (it is not
worthful to create a tuple structure if we need just MsgPack data).

Some complexity was introduced to support encoding on the Lua shared
buffer and the box region both. The motivation is the following:

- luaT_tuple_encode() is exposed with encoding to the box region,
  because it is more usual to the module API. In particular a user of
  the API able to control when the tuple data should be released.
- Encoding to the Lua shared buffer is kept internally, because there is
  no strong reason to change it to the box region for box.tuple.new().

Part of #5273
parent ec9a7fa7
No related branches found
No related tags found
No related merge requests found
......@@ -108,6 +108,25 @@ luaT_istuple(struct lua_State *L, int narg)
return *(struct tuple **) data;
}
/* {{{ Encode a Lua table as an MsgPack array */
/*
* A lot of functions are there, however the task per se looks
* simple. Reasons are the following.
*
* 1. box.tuple.new() supports two parameters conventions.
* <luaT_tuple_encode_values>() implements the old API.
* 2. Serializer from Lua to MsgPack may raise a Lua error,
* so it should be run under pcall. The dangerous code is
* encapsulated into <luaT_tuple_encode_table>().
* 3. In particular <mpstream_init>() may raise an error in case
* of OOM, so it also is run under pcall.
* 4. box.tuple.new() and <luaT_tuple_new>() use shared Lua ibuf
* under the hood (because there is no strong reason to change
* it), while <luaT_tuple_encode>() uses the box region
* (because it is usual for the module API).
*/
/**
* Encode a Lua values on a Lua stack as an MsgPack array.
*
......@@ -132,6 +151,22 @@ luaT_tuple_encode_values(struct lua_State *L)
return 0;
}
typedef void luaT_mpstream_init_f(struct mpstream *stream, struct lua_State *L);
static void
luaT_mpstream_init_lua_ibuf(struct mpstream *stream, struct lua_State *L)
{
mpstream_init(stream, tarantool_lua_ibuf, ibuf_reserve_cb,
ibuf_alloc_cb, luamp_error, L);
}
static void
luaT_mpstream_init_box_region(struct mpstream *stream, struct lua_State *L)
{
mpstream_init(stream, &fiber()->gc, region_reserve_cb, region_alloc_cb,
luamp_error, L);
}
/**
* Encode a Lua table or a tuple as MsgPack.
*
......@@ -142,28 +177,26 @@ luaT_tuple_encode_values(struct lua_State *L)
static int
luaT_tuple_encode_table(struct lua_State *L)
{
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);
luamp_encode_tuple(L, &tuple_serializer, &stream, 1);
luaT_mpstream_init_f *luaT_mpstream_init_f = lua_topointer(L, 1);
luaT_mpstream_init_f(&stream, L);
luamp_encode_tuple(L, &tuple_serializer, &stream, 2);
mpstream_flush(&stream);
return 0;
}
/**
* Encode a Lua table / tuple to Lua shared ibuf.
* Encode a Lua table / tuple to given mpstream.
*/
static char *
luaT_tuple_encode_on_lua_ibuf(struct lua_State *L, int idx,
size_t *tuple_len_ptr)
static int
luaT_tuple_encode_on_mpstream(struct lua_State *L, int idx,
luaT_mpstream_init_f *luaT_mpstream_init_f)
{
assert(idx != 0);
if (!lua_istable(L, idx) && !luaT_istuple(L, idx)) {
diag_set(IllegalParams, "A tuple or a table expected, got %s",
lua_typename(L, lua_type(L, idx)));
return NULL;
return -1;
}
/* To restore before leaving the function. */
......@@ -180,18 +213,58 @@ luaT_tuple_encode_on_lua_ibuf(struct lua_State *L, int idx,
lua_rawgeti(L, LUA_REGISTRYINDEX, luaT_tuple_encode_table_ref);
assert(lua_isfunction(L, -1));
lua_pushlightuserdata(L, luaT_mpstream_init_f);
lua_pushvalue(L, idx);
int rc = luaT_call(L, 1, 0);
int rc = luaT_call(L, 2, 0);
lua_settop(L, top);
if (rc != 0)
return rc;
}
/**
* Encode a Lua table / tuple to Lua shared ibuf.
*/
static char *
luaT_tuple_encode_on_lua_ibuf(struct lua_State *L, int idx,
size_t *tuple_len_ptr)
{
struct ibuf *buf = tarantool_lua_ibuf;
ibuf_reset(buf);
if (luaT_tuple_encode_on_mpstream(L, idx,
luaT_mpstream_init_lua_ibuf) != 0)
return NULL;
if (tuple_len_ptr != NULL)
*tuple_len_ptr = ibuf_used(buf);
return buf->buf;
}
/**
* Encode a Lua table / tuple to box region.
*/
char *
luaT_tuple_encode(struct lua_State *L, int idx, size_t *tuple_len_ptr)
{
struct region *region = &fiber()->gc;
size_t region_svp = region_used(region);
if (luaT_tuple_encode_on_mpstream(L, idx,
luaT_mpstream_init_box_region) != 0) {
region_truncate(region, region_svp);
return NULL;
}
size_t tuple_len = region_used(region) - region_svp;
if (tuple_len_ptr != NULL)
*tuple_len_ptr = ibuf_used(tarantool_lua_ibuf);
return tarantool_lua_ibuf->buf;
*tuple_len_ptr = tuple_len;
char *tuple_data = region_join(region, tuple_len);
if (tuple_data == NULL) {
diag_set(OutOfMemory, tuple_len, "region", "tuple data");
region_truncate(region, region_svp);
return NULL;
}
return tuple_data;
}
/* }}} Encode a Lua table as an MsgPack array */
struct tuple *
luaT_tuple_new(struct lua_State *L, int idx, box_tuple_format_t *format)
{
......
......@@ -31,6 +31,7 @@
* SUCH DAMAGE.
*/
#include <stddef.h>
#include "trivia/util.h"
#if defined(__cplusplus)
extern "C" {
......@@ -79,6 +80,22 @@ luaT_pushtuple(struct lua_State *L, box_tuple_t *tuple);
box_tuple_t *
luaT_istuple(struct lua_State *L, int idx);
/**
* Encode a table or a tuple on the Lua stack as an MsgPack array.
*
* @param L Lua state.
* @param idx Acceptable index on the Lua stack.
* @param tuple_len_ptr Where to store tuple data size in bytes
* (or NULL).
*
* The storage for data is allocated on the box region. A caller
* should call <box_region_truncate>() to release the data.
*
* In case of an error set a diag and return NULL.
*/
API_EXPORT char *
luaT_tuple_encode(struct lua_State *L, int idx, size_t *tuple_len_ptr);
/** \endcond public */
/**
......
......@@ -406,6 +406,7 @@ EXPORT(luaT_istuple)
EXPORT(luaT_pushtuple)
EXPORT(luaT_state)
EXPORT(luaT_tolstring)
EXPORT(luaT_tuple_encode)
EXPORT(mp_char2escape)
EXPORT(mp_decode_double)
EXPORT(mp_decode_extl)
......
......@@ -555,6 +555,120 @@ test_box_region(struct lua_State *L)
/* }}} test_box_region */
/* {{{ test_tuple_encode */
static void
check_tuple_data(char *tuple_data, size_t tuple_size, int retvals)
{
assert(tuple_size == 4);
assert(tuple_data != NULL);
assert(!strncmp(tuple_data, "\x93\x01\x02\x03", 4));
assert(retvals == 0);
}
static void
check_encode_error(char *tuple_data, int retvals, const char *exp_err_type,
const char *exp_err_msg)
{
assert(tuple_data == NULL);
box_error_t *e = box_error_last();
assert(strcmp(box_error_type(e), exp_err_type) == 0);
assert(strcmp(box_error_message(e), exp_err_msg) == 0);
assert(retvals == 0);
}
/**
* Encode a Lua table or a tuple into a tuple.
*
* Similar to <luaT_tuple_new>() unit test.
*/
static int
test_tuple_encode(struct lua_State *L)
{
int top;
char *tuple_data;
size_t tuple_size;
size_t region_svp = box_region_used();
/*
* Case: a Lua table on idx == -2 as an input.
*/
/* Prepare the Lua stack. */
luaL_loadstring(L, "return {1, 2, 3}");
lua_call(L, 0, 1);
lua_pushnil(L);
/* Create and check a tuple. */
top = lua_gettop(L);
tuple_data = luaT_tuple_encode(L, -2, &tuple_size);
check_tuple_data(tuple_data, tuple_size, lua_gettop(L) - top);
/* Clean up. */
lua_pop(L, 2);
assert(lua_gettop(L) == 0);
/*
* Case: a tuple on idx == -1 as an input.
*/
/* Prepare the Lua stack. */
luaL_loadstring(L, "return box.tuple.new({1, 2, 3})");
lua_call(L, 0, 1);
/* Create and check a tuple. */
top = lua_gettop(L);
tuple_data = luaT_tuple_encode(L, -1, &tuple_size);
check_tuple_data(tuple_data, tuple_size, lua_gettop(L) - top);
/* Clean up. */
lua_pop(L, 1);
assert(lua_gettop(L) == 0);
/*
* Case: a Lua object of an unexpected type.
*/
/* Prepare the Lua stack. */
lua_pushinteger(L, 42);
/* Try to encode and check for the error. */
top = lua_gettop(L);
tuple_data = luaT_tuple_encode(L, -1, &tuple_size);
check_encode_error(tuple_data, lua_gettop(L) - top, "IllegalParams",
"A tuple or a table expected, got number");
/* Clean up. */
lua_pop(L, 1);
assert(lua_gettop(L) == 0);
/*
* Case: unserializable item within a Lua table.
*
* The function should not raise a Lua error.
*/
luaL_loadstring(L, "return {function() end}");
lua_call(L, 0, 1);
/* Try to encode and check for the error. */
top = lua_gettop(L);
tuple_data = luaT_tuple_encode(L, -1, &tuple_size);
check_encode_error(tuple_data, lua_gettop(L) - top, "LuajitError",
"unsupported Lua type 'function'");
/* Clean up. */
lua_pop(L, 1);
assert(lua_gettop(L) == 0);
box_region_truncate(region_svp);
lua_pushboolean(L, 1);
return 1;
}
/* }}} test_tuple_encode */
LUA_API int
luaopen_module_api(lua_State *L)
{
......@@ -585,6 +699,7 @@ luaopen_module_api(lua_State *L)
{"iscallable", test_iscallable},
{"iscdata", test_iscdata},
{"test_box_region", test_box_region},
{"test_tuple_encode", test_tuple_encode},
{NULL, NULL}
};
luaL_register(L, "module_api", lib);
......
......@@ -177,7 +177,7 @@ local function test_iscdata(test, module)
end
local test = require('tap').test("module_api", function(test)
test:plan(26)
test:plan(27)
local status, module = pcall(require, 'module_api')
test:is(status, true, "module")
test:ok(status, "module is loaded")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment