From: imeevma@tarantool.org To: v.shpilevoy@tarantool.org, tarantool-patches@freelists.org Subject: [tarantool-patches] [PATCH v5 5/5] sql: check new box.sql.execute() Date: Sat, 22 Dec 2018 14:32:00 +0300 [thread overview] Message-ID: <c412340f7cadd07d442117f56eb68b3a137e81e4.1545477494.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1545477494.git.imeevma@gmail.com> This commit checks that new implementation of box.sql.execute() is able to pass all tests. This is temporary commit and should be dropped later. Even though this commit is temporary it shows that this patch-set should be pushed after patch for issue #3832. Needed for #3505 --- src/box/execute.c | 14 +++++++++----- src/box/execute.h | 2 +- src/box/iproto.cc | 2 +- src/box/lua/schema.lua | 23 +++++++++++++++++++++++ src/box/lua/sql.c | 12 ++++++++---- 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/box/execute.c b/src/box/execute.c index f538441..8a70bc4 100644 --- a/src/box/execute.c +++ b/src/box/execute.c @@ -678,6 +678,8 @@ sql_get_description(struct sqlite3_stmt *stmt, struct obuf *out, * column_name simply returns them. */ assert(name != NULL); + if (type == NULL) + type = "UNKNOWN"; size += mp_sizeof_str(strlen(name)); size += mp_sizeof_str(strlen(type)); char *pos = (char *) obuf_alloc(out, size); @@ -696,7 +698,7 @@ sql_get_description(struct sqlite3_stmt *stmt, struct obuf *out, static inline int sql_execute(sqlite3 *db, struct sqlite3_stmt *stmt, struct port *port, - struct region *region) + struct region *region, int error_id) { int rc, column_count = sqlite3_column_count(stmt); if (column_count > 0) { @@ -713,7 +715,7 @@ sql_execute(sqlite3 *db, struct sqlite3_stmt *stmt, struct port *port, assert(rc != SQLITE_ROW && rc != SQLITE_OK); } if (rc != SQLITE_DONE) { - diag_set(ClientError, ER_SQL_EXECUTE, sqlite3_errmsg(db)); + diag_set(ClientError, error_id, sqlite3_errmsg(db)); return -1; } return 0; @@ -722,7 +724,7 @@ sql_execute(sqlite3 *db, struct sqlite3_stmt *stmt, struct port *port, int sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, uint32_t bind_count, struct port *port, - struct region *region) + struct region *region, int error_id) { struct sqlite3_stmt *stmt; sqlite3 *db = sql_get(); @@ -731,13 +733,13 @@ sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, return -1; } if (sqlite3_prepare_v2(db, sql, len, &stmt, NULL) != SQLITE_OK) { - diag_set(ClientError, ER_SQL_EXECUTE, sqlite3_errmsg(db)); + diag_set(ClientError, error_id, sqlite3_errmsg(db)); return -1; } assert(stmt != NULL); port_tuple_create(port); if (sql_bind(stmt, bind, bind_count) == 0 && - sql_execute(db, stmt, port, region) == 0) { + sql_execute(db, stmt, port, region, error_id) == 0) { port_tuple_to_port_sql(port, stmt); return 0; } @@ -888,6 +890,8 @@ lua_sql_get_description(struct sqlite3_stmt *stmt, struct lua_State *L, * column_name simply returns them. */ assert(name != NULL); + if (type == NULL) + type = "UNKNOWN"; lua_pushlstring(L, name, strlen(name)); lua_setfield(L, -2, "name"); lua_pushlstring(L, type, strlen(type)); diff --git a/src/box/execute.h b/src/box/execute.h index bc2d6a5..81f96bf 100644 --- a/src/box/execute.h +++ b/src/box/execute.h @@ -125,7 +125,7 @@ lua_sql_bind_list_decode(struct lua_State *L, struct sql_bind **out_bind, int sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, uint32_t bind_count, struct port *port, - struct region *region); + struct region *region, int error_id); #if defined(__cplusplus) } /* extern "C" { */ diff --git a/src/box/iproto.cc b/src/box/iproto.cc index ee704e0..fe890e7 100644 --- a/src/box/iproto.cc +++ b/src/box/iproto.cc @@ -1631,7 +1631,7 @@ tx_process_sql(struct cmsg *m) sql = msg->sql.sql_text; sql = mp_decode_str(&sql, &len); if (sql_prepare_and_execute(sql, len, bind, bind_count, &port, - &fiber()->gc) != 0) + &fiber()->gc, ER_SQL_EXECUTE) != 0) goto error; /* * Take an obuf only after execute(). Else the buffer can diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua index 8a804f0..02ec2fd 100644 --- a/src/box/lua/schema.lua +++ b/src/box/lua/schema.lua @@ -2456,3 +2456,26 @@ box.feedback.save = function(file_name) end box.NULL = msgpack.NULL + +box.sql.execute = function(sql) + local result = box.sql.new_execute(sql) + if result == nil then return end + local ret = nil + if result.rows ~= nil then + ret = {} + for key, row in pairs(result.rows) do + if type(row) == 'cdata' then + table.insert(ret, row:totable()) + end + end + end + if result.metadata ~= nil then + if ret == nil then ret = {} end + ret[0] = {} + for key, row in pairs(result.metadata) do + table.insert(ret[0], row['name']) + end + setmetatable(ret, {__serialize = 'sequence'}) + end + if ret ~= nil then return ret end +end diff --git a/src/box/lua/sql.c b/src/box/lua/sql.c index 354321f..2a2e566 100644 --- a/src/box/lua/sql.c +++ b/src/box/lua/sql.c @@ -129,13 +129,17 @@ lbox_execute(struct lua_State *L) if (lua_gettop(L) == 2 && (bind_count = lua_sql_bind_list_decode(L, &bind, 2)) < 0) - return luaT_error(L); + goto sqlerror; if (sql_prepare_and_execute(sql, length, bind, bind_count, &port, - &fiber()->gc) != 0) - return luaT_error(L); + &fiber()->gc, ER_SYSTEM) != 0) + goto sqlerror; port_dump_lua(&port, L); return 1; + +sqlerror: + lua_pushstring(L, sqlite3_errmsg(db)); + return lua_error(L); } static int @@ -151,7 +155,7 @@ void box_lua_sqlite_init(struct lua_State *L) { static const struct luaL_Reg module_funcs [] = { - {"execute", lua_sql_execute}, + {"old_execute", lua_sql_execute}, {"new_execute", lbox_execute}, {"debug", lua_sql_debug}, {NULL, NULL} -- 2.7.4
prev parent reply other threads:[~2018-12-22 11:32 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-22 11:31 [tarantool-patches] [PATCH v5 0/5] sql: remove box.sql.execute imeevma 2018-12-22 11:31 ` [tarantool-patches] [PATCH v5 1/5] iproto: move map creation to sql_response_dump() imeevma 2018-12-22 11:31 ` [tarantool-patches] [PATCH v5 2/5] iproto: create port_sql imeevma 2018-12-25 14:57 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-22 11:31 ` [tarantool-patches] [PATCH v5 3/5] sql: create method dump_lua for port_sql imeevma 2018-12-25 14:57 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-22 11:31 ` [tarantool-patches] [PATCH v5 4/5] sql: parameter binding for new execute() imeevma 2018-12-25 14:57 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-22 11:32 ` imeevma [this message]
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=c412340f7cadd07d442117f56eb68b3a137e81e4.1545477494.git.imeevma@gmail.com \ --to=imeevma@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [tarantool-patches] [PATCH v5 5/5] sql: check new box.sql.execute()' \ /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