From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id B9826267C5 for ; Sat, 19 Jan 2019 08:21:45 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TaShQiyD1OLJ for ; Sat, 19 Jan 2019 08:21:45 -0500 (EST) Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 804D6267D9 for ; Sat, 19 Jan 2019 08:20:26 -0500 (EST) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v8 4/6] lua: create method dump_lua for port_sql Date: Sat, 19 Jan 2019 16:20:24 +0300 Message-Id: In-Reply-To: References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org Diff between versions: commit 02605eb00e06bbf105ee391d51f810fc94c4ab36 Author: Mergen Imeev Date: Thu Jan 17 14:26:33 2019 +0300 Temporary: Review fixes diff --git a/src/box/execute.c b/src/box/execute.c index 78aab93..7abf5a6 100644 --- a/src/box/execute.c +++ b/src/box/execute.c @@ -149,7 +149,6 @@ port_sql_dump_msgpack(struct port *port, struct obuf *out); /** * Dump data from port to Lua stack. Data in port contains tuples, * metadata, or information obtained from an executed SQL query. - * The port is destroyed. * * @param port Port that contains SQL response. * @param L Lua stack. @@ -750,7 +749,6 @@ port_sql_dump_lua(struct port *port, struct lua_State *L) lua_setfield(L, -2, "autoincrement_ids"); } } - port_destroy(port); } /** diff --git a/src/box/lua/sql.c b/src/box/lua/sql.c index f18a797..2a9ad3b 100644 --- a/src/box/lua/sql.c +++ b/src/box/lua/sql.c @@ -128,6 +128,7 @@ lbox_execute(struct lua_State *L) &fiber()->gc) != 0) return luaT_error(L); port_dump_lua(&port, L); + port_destroy(&port); return 1; } New version: commit 78e3d54239d51ad52ebf377acb016c66426299ec Author: Mergen Imeev Date: Fri Dec 21 16:48:37 2018 +0300 lua: create method dump_lua for port_sql This patch creates the dump_lua method for port_sql. It also defines a new function box.sql.new_execute(), which will be converted to box.sql.execute(). Part of ...3505 diff --git a/src/box/execute.c b/src/box/execute.c index 1658d9b..7abf5a6 100644 --- a/src/box/execute.c +++ b/src/box/execute.c @@ -43,6 +43,7 @@ #include "port.h" #include "tuple.h" #include "sql/vdbe.h" +#include "lua/utils.h" const char *sql_type_strs[] = { NULL, @@ -145,6 +146,16 @@ static_assert(sizeof(struct port_sql) <= sizeof(struct port), static int port_sql_dump_msgpack(struct port *port, struct obuf *out); +/** + * Dump data from port to Lua stack. Data in port contains tuples, + * metadata, or information obtained from an executed SQL query. + * + * @param port Port that contains SQL response. + * @param L Lua stack. + */ +static void +port_sql_dump_lua(struct port *port, struct lua_State *L); + static void port_sql_destroy(struct port *base) { @@ -155,7 +166,7 @@ port_sql_destroy(struct port *base) static const struct port_vtab port_sql_vtab = { /* .dump_msgpack = */ port_sql_dump_msgpack, /* .dump_msgpack_16 = */ NULL, - /* .dump_lua = */ NULL, + /* .dump_lua = */ port_sql_dump_lua, /* .dump_plain = */ NULL, /* .destroy = */ port_sql_destroy, }; @@ -671,6 +682,76 @@ port_sql_dump_msgpack(struct port *port, struct obuf *out) } /** + * Serialize a description of the prepared statement. + * + * @param stmt Prepared statement. + * @param L Lua stack. + * @param column_count Statement's column count. + */ +static inline void +lua_sql_get_description(struct sqlite3_stmt *stmt, struct lua_State *L, + int column_count) +{ + assert(column_count > 0); + lua_createtable(L, column_count, 0); + for (int i = 0; i < column_count; ++i) { + lua_createtable(L, 0, 2); + const char *name = sqlite3_column_name(stmt, i); + const char *type = sqlite3_column_datatype(stmt, i); + /* + * Can not fail, since all column names are + * preallocated during prepare phase and the + * column_name simply returns them. + */ + assert(name != NULL); + assert(type != NULL); + lua_pushstring(L, name); + lua_setfield(L, -2, "name"); + lua_pushstring(L, type); + lua_setfield(L, -2, "type"); + lua_rawseti(L, -2, i + 1); + } +} + +static void +port_sql_dump_lua(struct port *port, struct lua_State *L) +{ + assert(port->vtab == &port_sql_vtab); + sqlite3 *db = sql_get(); + struct sqlite3_stmt *stmt = ((struct port_sql *)port)->stmt; + int column_count = sqlite3_column_count(stmt); + if (column_count > 0) { + lua_createtable(L, 0, 2); + lua_sql_get_description(stmt, L, column_count); + lua_setfield(L, -2, "metadata"); + port_tuple_vtab.dump_lua(port, L); + lua_setfield(L, -2, "rows"); + } else { + assert(((struct port_tuple *)port)->size == 0); + struct stailq *autoinc_id_list = + vdbe_autoinc_id_list((struct Vdbe *)stmt); + lua_createtable(L, 0, stailq_empty(autoinc_id_list) ? 1 : 2); + + luaL_pushuint64(L, db->nChange); + lua_setfield(L, -2, "rowcount"); + + if (!stailq_empty(autoinc_id_list)) { + lua_newtable(L); + int i = 1; + struct autoinc_id_entry *id_entry; + stailq_foreach_entry(id_entry, autoinc_id_list, link) { + if (id_entry->id >= 0) + luaL_pushuint64(L, id_entry->id); + else + luaL_pushint64(L, id_entry->id); + lua_rawseti(L, -2, i++); + } + lua_setfield(L, -2, "autoincrement_ids"); + } + } +} + +/** * Execute prepared SQL statement. * * This function uses region to allocate memory for temporary diff --git a/src/box/lua/sql.c b/src/box/lua/sql.c index 6923666..2a9ad3b 100644 --- a/src/box/lua/sql.c +++ b/src/box/lua/sql.c @@ -6,6 +6,7 @@ #include #include "lua/info.h" #include "lua/utils.h" +#include "box/execute.h" static void lua_push_column_names(struct lua_State *L, struct sqlite3_stmt *stmt) @@ -111,6 +112,27 @@ sqlerror: } static int +lbox_execute(struct lua_State *L) +{ + struct sql_bind *bind = NULL; + int bind_count = 0; + size_t length; + struct port port; + int top = lua_gettop(L); + + if (top != 1 || ! lua_isstring(L, 1)) + return luaL_error(L, "Usage: box.execute(sqlstring)"); + + const char *sql = lua_tolstring(L, 1, &length); + if (sql_prepare_and_execute(sql, length, bind, bind_count, &port, + &fiber()->gc) != 0) + return luaT_error(L); + port_dump_lua(&port, L); + port_destroy(&port); + return 1; +} + +static int lua_sql_debug(struct lua_State *L) { struct info_handler info; @@ -124,6 +146,7 @@ box_lua_sqlite_init(struct lua_State *L) { static const struct luaL_Reg module_funcs [] = { {"execute", lua_sql_execute}, + {"new_execute", lbox_execute}, {"debug", lua_sql_debug}, {NULL, NULL} }; -- 2.7.4