From: Georgy Kirichenko <georgy@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Georgy Kirichenko <georgy@tarantool.org>
Subject: [tarantool-patches] [PATCH] Return valid lua error for func creation error
Date: Fri, 2 Nov 2018 14:30:54 +0300 [thread overview]
Message-ID: <c1c80fe6983ef992a1b066c7a2180680f0a0e572.1541158162.git.georgy@tarantool.org> (raw)
Return valid lua error if something fail while sql function creation.
---
https://github.com/tarantool/tarantool/issues/3724
https://github.com/tarantool/tarantool/tree/g.kirichenko/gh-3724-return-error-from-func-creation
src/box/lua/lua_sql.c | 3 +++
test/sql/func-recreate.result | 36 +++++++++++++++++++++++++++++++++
test/sql/func-recreate.test.lua | 17 ++++++++++++++++
3 files changed, 56 insertions(+)
create mode 100644 test/sql/func-recreate.result
create mode 100644 test/sql/func-recreate.test.lua
diff --git a/src/box/lua/lua_sql.c b/src/box/lua/lua_sql.c
index 9d78679fb..100f53b01 100644
--- a/src/box/lua/lua_sql.c
+++ b/src/box/lua/lua_sql.c
@@ -193,6 +193,9 @@ int lbox_sql_create_function(struct lua_State *L)
NULL, NULL, lua_sql_destroy);
free(normalized_name);
+ if (rc != 0) {
+ return luaL_error(L, sqlite3ErrStr(rc));
+ }
return rc;
}
diff --git a/test/sql/func-recreate.result b/test/sql/func-recreate.result
new file mode 100644
index 000000000..f12cc8d90
--- /dev/null
+++ b/test/sql/func-recreate.result
@@ -0,0 +1,36 @@
+test_run = require('test_run').new()
+---
+...
+engine = test_run:get_cfg('engine')
+---
+...
+box.sql.execute('pragma sql_default_engine=\''..engine..'\'')
+---
+...
+-- Check errors during function create process
+fiber = require('fiber')
+---
+...
+box.internal.sql_create_function('WAITFOR', function (n) fiber.sleep(n) return n end)
+---
+...
+ch = fiber.channel(1)
+---
+...
+_ = fiber.create(function () ch:put(box.sql.execute('select WAITFOR(0.2)')) end)
+---
+...
+fiber.sleep(0.1)
+---
+...
+box.internal.sql_create_function('WAITFOR', function (n) require('fiber').sleep(n) return n end)
+---
+- error: database is locked
+...
+ch:get()
+---
+- - [0.2]
+...
+box.internal.sql_create_function('WAITFOR', function (n) require('fiber').sleep(n) return n end)
+---
+...
diff --git a/test/sql/func-recreate.test.lua b/test/sql/func-recreate.test.lua
new file mode 100644
index 000000000..b105da8cb
--- /dev/null
+++ b/test/sql/func-recreate.test.lua
@@ -0,0 +1,17 @@
+test_run = require('test_run').new()
+engine = test_run:get_cfg('engine')
+box.sql.execute('pragma sql_default_engine=\''..engine..'\'')
+
+-- Check errors during function create process
+fiber = require('fiber')
+box.internal.sql_create_function('WAITFOR', function (n) fiber.sleep(n) return n end)
+
+ch = fiber.channel(1)
+
+_ = fiber.create(function () ch:put(box.sql.execute('select WAITFOR(0.2)')) end)
+fiber.sleep(0.1)
+
+box.internal.sql_create_function('WAITFOR', function (n) require('fiber').sleep(n) return n end)
+ch:get()
+box.internal.sql_create_function('WAITFOR', function (n) require('fiber').sleep(n) return n end)
+
--
2.19.1
next reply other threads:[~2018-11-02 11:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-02 11:30 Georgy Kirichenko [this message]
2018-11-02 13:46 ` [tarantool-patches] " n.pettik
2018-11-13 11:47 ` Kirill Yukhin
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=c1c80fe6983ef992a1b066c7a2180680f0a0e572.1541158162.git.georgy@tarantool.org \
--to=georgy@tarantool.org \
--cc=tarantool-patches@freelists.org \
--subject='Re: [tarantool-patches] [PATCH] Return valid lua error for func creation error' \
/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