* [Tarantool-patches] [PATCH v1 1/1] sql: introduce binding for ARRAY
@ 2021-11-25 12:54 Mergen Imeev via Tarantool-patches
2021-12-02 23:00 ` Vladislav Shpilevoy via Tarantool-patches
0 siblings, 1 reply; 4+ messages in thread
From: Mergen Imeev via Tarantool-patches @ 2021-11-25 12:54 UTC (permalink / raw)
To: v.shpilevoy; +Cc: tarantool-patches
After this patch, ARRAY values can be used as bind variables. However,
due to the current syntax for binding in Lua, the only possible way is
to use ARRAY values as the named bind variable.
Part of #4762
---
https://github.com/tarantool/tarantool/issues/4762
https://github.com/tarantool/tarantool/tree/imeevma/gh-4762-bindings-for-array
src/box/bind.c | 7 +++----
src/box/lua/execute.c | 32 +++++++++++++++++++++++++++-----
src/box/sql/sqlInt.h | 3 +++
src/box/sql/vdbeapi.c | 8 ++++++++
test/sql-tap/array.test.lua | 25 ++++++++++++++++++++++++-
test/sql/bind.result | 7 -------
test/sql/bind.test.lua | 2 --
7 files changed, 65 insertions(+), 19 deletions(-)
diff --git a/src/box/bind.c b/src/box/bind.c
index e75e36283..af9f9eac5 100644
--- a/src/box/bind.c
+++ b/src/box/bind.c
@@ -99,15 +99,12 @@ sql_bind_decode(struct sql_bind *bind, int i, const char **packet)
case MP_BIN:
bind->s = mp_decode_bin(packet, &bind->bytes);
break;
+ case MP_ARRAY:
case MP_EXT:
bind->s = *packet;
mp_next(packet);
bind->bytes = *packet - bind->s;
break;
- case MP_ARRAY:
- diag_set(ClientError, ER_SQL_BIND_TYPE, "ARRAY",
- sql_bind_name(bind));
- return -1;
case MP_MAP:
diag_set(ClientError, ER_SQL_BIND_TYPE, "MAP",
sql_bind_name(bind));
@@ -190,6 +187,8 @@ sql_bind_column(struct sql_stmt *stmt, const struct sql_bind *p,
return sql_bind_null(stmt, pos);
case MP_BIN:
return sql_bind_bin_static(stmt, pos, p->s, p->bytes);
+ case MP_ARRAY:
+ return sql_bind_array_static(stmt, pos, p->s, p->bytes);
case MP_EXT:
assert(p->ext_type == MP_UUID || p->ext_type == MP_DECIMAL);
if (p->ext_type == MP_UUID)
diff --git a/src/box/lua/execute.c b/src/box/lua/execute.c
index 18a45a5d5..71d4d7fae 100644
--- a/src/box/lua/execute.c
+++ b/src/box/lua/execute.c
@@ -8,6 +8,8 @@
#include "box/bind.h"
#include "box/sql_stmt_cache.h"
#include "box/schema.h"
+#include "mpstream/mpstream.h"
+#include "box/sql/vdbeInt.h"
/**
* Serialize a description of the prepared statement.
@@ -331,6 +333,8 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i)
}
if (luaL_tofield(L, luaL_msgpack_default, -1, &field) < 0)
return -1;
+ bind->type = field.type;
+ bind->ext_type = field.ext_type;
switch (field.type) {
case MP_UINT:
bind->u64 = field.ival;
@@ -382,10 +386,30 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i)
diag_set(ClientError, ER_SQL_BIND_TYPE, "USERDATA",
sql_bind_name(bind));
return -1;
- case MP_ARRAY:
- diag_set(ClientError, ER_SQL_BIND_TYPE, "ARRAY",
- sql_bind_name(bind));
+ case MP_ARRAY: {
+ size_t used = region_used(region);
+ struct mpstream stream;
+ bool is_error = false;
+ mpstream_init(&stream, region, region_reserve_cb,
+ region_alloc_cb, set_encode_error, &is_error);
+ lua_pushvalue(L, -1);
+ luamp_encode_r(L, luaL_msgpack_default, &stream, &field, 0);
+ lua_pop(L, 1);
+ mpstream_flush(&stream);
+ if (is_error) {
+ region_truncate(region, used);
+ diag_set(OutOfMemory, stream.pos - stream.buf,
+ "mpstream_flush", "stream");
+ return -1;
+ }
+ bind->bytes = region_used(region) - used;
+ bind->s = region_join(region, bind->bytes);
+ if (bind->s != NULL)
+ break;
+ region_truncate(region, used);
+ diag_set(OutOfMemory, bind->bytes, "region_join", "bind->s");
return -1;
+ }
case MP_MAP:
diag_set(ClientError, ER_SQL_BIND_TYPE, "MAP",
sql_bind_name(bind));
@@ -393,8 +417,6 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i)
default:
unreachable();
}
- bind->type = field.type;
- bind->ext_type = field.ext_type;
lua_pop(L, lua_gettop(L) - idx);
return 0;
}
diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
index dcd71e5bd..716110edc 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -556,6 +556,9 @@ sql_bind_str_static(sql_stmt *stmt, int i, const char *str, uint32_t len);
int
sql_bind_bin_static(sql_stmt *stmt, int i, const char *str, uint32_t size);
+int
+sql_bind_array_static(sql_stmt *stmt, int i, const char *str, uint32_t size);
+
int
sql_bind_uuid(struct sql_stmt *stmt, int i, const struct tt_uuid *uuid);
diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index 3894bb943..7349d6ece 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -524,6 +524,14 @@ sql_bind_bin_static(sql_stmt *stmt, int i, const char *str, uint32_t size)
return sql_bind_type(vdbe, i, "text");
}
+int
+sql_bind_array_static(sql_stmt *stmt, int i, const char *str, uint32_t size)
+{
+ struct Vdbe *vdbe = (struct Vdbe *)stmt;
+ mem_set_array_static(&vdbe->aVar[i - 1], (char *)str, size);
+ return sql_bind_type(vdbe, i, "array");
+}
+
int
sql_bind_uuid(struct sql_stmt *stmt, int i, const struct tt_uuid *uuid)
{
diff --git a/test/sql-tap/array.test.lua b/test/sql-tap/array.test.lua
index 752cb24f2..ef8e763a5 100755
--- a/test/sql-tap/array.test.lua
+++ b/test/sql-tap/array.test.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env tarantool
local test = require("sqltester")
-test:plan(110)
+test:plan(112)
box.schema.func.create('A1', {
language = 'Lua',
@@ -979,6 +979,29 @@ test:do_catchsql_test(
1, "Failed to execute SQL statement: wrong arguments for function ZEROBLOB()"
})
+-- Make sure that ARRAY values can be used as bound variable.
+test:do_test(
+ "builtins-13.1",
+ function()
+ local res = box.execute([[SELECT #a;]], {{['#a'] = {1, 2, 3}}})
+ return {res.rows[1][1]}
+ end, {
+ {1, 2, 3}
+ })
+
+local remote = require('net.box')
+box.cfg{listen = os.getenv('LISTEN')}
+local cn = remote.connect(box.cfg.listen)
+test:do_test(
+ "builtins-13.2",
+ function()
+ local res = cn:execute([[SELECT #a;]], {{['#a'] = {1, 2, 3}}})
+ return {res.rows[1][1]}
+ end, {
+ {1, 2, 3}
+ })
+cn:close()
+
box.execute([[DROP TABLE t1;]])
box.execute([[DROP TABLE t;]])
diff --git a/test/sql/bind.result b/test/sql/bind.result
index cb0302885..f269056e2 100644
--- a/test/sql/bind.result
+++ b/test/sql/bind.result
@@ -249,13 +249,6 @@ execute('SELECT ? AS big_uint', {0xefffffffffffffff})
- [17293822569102704640]
...
-- Bind incorrect parameters.
-ok, err = pcall(execute, 'SELECT ?', { {1, 2, 3} })
----
-...
-ok
----
-- false
-...
parameters = {}
---
...
diff --git a/test/sql/bind.test.lua b/test/sql/bind.test.lua
index 2ced7775a..4ad227d95 100644
--- a/test/sql/bind.test.lua
+++ b/test/sql/bind.test.lua
@@ -82,8 +82,6 @@ execute(sql, parameters)
-- suitable method in its bind API.
execute('SELECT ? AS big_uint', {0xefffffffffffffff})
-- Bind incorrect parameters.
-ok, err = pcall(execute, 'SELECT ?', { {1, 2, 3} })
-ok
parameters = {}
parameters[1] = {}
parameters[1][100] = 200
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [Tarantool-patches] [PATCH v1 1/1] sql: introduce binding for ARRAY
@ 2021-12-15 10:57 Mergen Imeev via Tarantool-patches
2021-12-16 15:01 ` Kirill Yukhin via Tarantool-patches
0 siblings, 1 reply; 4+ messages in thread
From: Mergen Imeev via Tarantool-patches @ 2021-12-15 10:57 UTC (permalink / raw)
To: kyukhin; +Cc: tarantool-patches
After this patch, ARRAY values can be used as bind variables. However,
due to the current syntax for binding in Lua, the only possible way is
to use ARRAY values as the named bind variable.
Part of #4762
---
https://github.com/tarantool/tarantool/issues/4762
https://github.com/tarantool/tarantool/tree/imeevma/gh-4762-bindings-for-array
src/box/bind.c | 7 +++----
src/box/lua/execute.c | 32 +++++++++++++++++++++++++++-----
src/box/sql/sqlInt.h | 3 +++
src/box/sql/vdbeapi.c | 8 ++++++++
test/sql-tap/array.test.lua | 25 ++++++++++++++++++++++++-
test/sql/bind.result | 7 -------
test/sql/bind.test.lua | 2 --
7 files changed, 65 insertions(+), 19 deletions(-)
diff --git a/src/box/bind.c b/src/box/bind.c
index e75e36283..af9f9eac5 100644
--- a/src/box/bind.c
+++ b/src/box/bind.c
@@ -99,15 +99,12 @@ sql_bind_decode(struct sql_bind *bind, int i, const char **packet)
case MP_BIN:
bind->s = mp_decode_bin(packet, &bind->bytes);
break;
+ case MP_ARRAY:
case MP_EXT:
bind->s = *packet;
mp_next(packet);
bind->bytes = *packet - bind->s;
break;
- case MP_ARRAY:
- diag_set(ClientError, ER_SQL_BIND_TYPE, "ARRAY",
- sql_bind_name(bind));
- return -1;
case MP_MAP:
diag_set(ClientError, ER_SQL_BIND_TYPE, "MAP",
sql_bind_name(bind));
@@ -190,6 +187,8 @@ sql_bind_column(struct sql_stmt *stmt, const struct sql_bind *p,
return sql_bind_null(stmt, pos);
case MP_BIN:
return sql_bind_bin_static(stmt, pos, p->s, p->bytes);
+ case MP_ARRAY:
+ return sql_bind_array_static(stmt, pos, p->s, p->bytes);
case MP_EXT:
assert(p->ext_type == MP_UUID || p->ext_type == MP_DECIMAL);
if (p->ext_type == MP_UUID)
diff --git a/src/box/lua/execute.c b/src/box/lua/execute.c
index 18a45a5d5..71d4d7fae 100644
--- a/src/box/lua/execute.c
+++ b/src/box/lua/execute.c
@@ -8,6 +8,8 @@
#include "box/bind.h"
#include "box/sql_stmt_cache.h"
#include "box/schema.h"
+#include "mpstream/mpstream.h"
+#include "box/sql/vdbeInt.h"
/**
* Serialize a description of the prepared statement.
@@ -331,6 +333,8 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i)
}
if (luaL_tofield(L, luaL_msgpack_default, -1, &field) < 0)
return -1;
+ bind->type = field.type;
+ bind->ext_type = field.ext_type;
switch (field.type) {
case MP_UINT:
bind->u64 = field.ival;
@@ -382,10 +386,30 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i)
diag_set(ClientError, ER_SQL_BIND_TYPE, "USERDATA",
sql_bind_name(bind));
return -1;
- case MP_ARRAY:
- diag_set(ClientError, ER_SQL_BIND_TYPE, "ARRAY",
- sql_bind_name(bind));
+ case MP_ARRAY: {
+ size_t used = region_used(region);
+ struct mpstream stream;
+ bool is_error = false;
+ mpstream_init(&stream, region, region_reserve_cb,
+ region_alloc_cb, set_encode_error, &is_error);
+ lua_pushvalue(L, -1);
+ luamp_encode_r(L, luaL_msgpack_default, &stream, &field, 0);
+ lua_pop(L, 1);
+ mpstream_flush(&stream);
+ if (is_error) {
+ region_truncate(region, used);
+ diag_set(OutOfMemory, stream.pos - stream.buf,
+ "mpstream_flush", "stream");
+ return -1;
+ }
+ bind->bytes = region_used(region) - used;
+ bind->s = region_join(region, bind->bytes);
+ if (bind->s != NULL)
+ break;
+ region_truncate(region, used);
+ diag_set(OutOfMemory, bind->bytes, "region_join", "bind->s");
return -1;
+ }
case MP_MAP:
diag_set(ClientError, ER_SQL_BIND_TYPE, "MAP",
sql_bind_name(bind));
@@ -393,8 +417,6 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i)
default:
unreachable();
}
- bind->type = field.type;
- bind->ext_type = field.ext_type;
lua_pop(L, lua_gettop(L) - idx);
return 0;
}
diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
index dcd71e5bd..716110edc 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -556,6 +556,9 @@ sql_bind_str_static(sql_stmt *stmt, int i, const char *str, uint32_t len);
int
sql_bind_bin_static(sql_stmt *stmt, int i, const char *str, uint32_t size);
+int
+sql_bind_array_static(sql_stmt *stmt, int i, const char *str, uint32_t size);
+
int
sql_bind_uuid(struct sql_stmt *stmt, int i, const struct tt_uuid *uuid);
diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index 4ce5feeae..3ea155d17 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -524,6 +524,14 @@ sql_bind_bin_static(sql_stmt *stmt, int i, const char *str, uint32_t size)
return sql_bind_type(vdbe, i, "text");
}
+int
+sql_bind_array_static(sql_stmt *stmt, int i, const char *str, uint32_t size)
+{
+ struct Vdbe *vdbe = (struct Vdbe *)stmt;
+ mem_set_array_static(&vdbe->aVar[i - 1], (char *)str, size);
+ return sql_bind_type(vdbe, i, "array");
+}
+
int
sql_bind_uuid(struct sql_stmt *stmt, int i, const struct tt_uuid *uuid)
{
diff --git a/test/sql-tap/array.test.lua b/test/sql-tap/array.test.lua
index 79a1c831d..3387742bf 100755
--- a/test/sql-tap/array.test.lua
+++ b/test/sql-tap/array.test.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env tarantool
local test = require("sqltester")
-test:plan(115)
+test:plan(117)
box.schema.func.create('A1', {
language = 'Lua',
@@ -1024,6 +1024,29 @@ test:do_execsql_test(
"array"
})
+-- Make sure that ARRAY values can be used as bound variable.
+test:do_test(
+ "builtins-14.1",
+ function()
+ local res = box.execute([[SELECT #a;]], {{['#a'] = {1, 2, 3}}})
+ return {res.rows[1][1]}
+ end, {
+ {1, 2, 3}
+ })
+
+local remote = require('net.box')
+box.cfg{listen = os.getenv('LISTEN')}
+local cn = remote.connect(box.cfg.listen)
+test:do_test(
+ "builtins-14.2",
+ function()
+ local res = cn:execute([[SELECT #a;]], {{['#a'] = {1, 2, 3}}})
+ return {res.rows[1][1]}
+ end, {
+ {1, 2, 3}
+ })
+cn:close()
+
box.execute([[DROP TABLE t1;]])
box.execute([[DROP TABLE t;]])
diff --git a/test/sql/bind.result b/test/sql/bind.result
index cb0302885..f269056e2 100644
--- a/test/sql/bind.result
+++ b/test/sql/bind.result
@@ -249,13 +249,6 @@ execute('SELECT ? AS big_uint', {0xefffffffffffffff})
- [17293822569102704640]
...
-- Bind incorrect parameters.
-ok, err = pcall(execute, 'SELECT ?', { {1, 2, 3} })
----
-...
-ok
----
-- false
-...
parameters = {}
---
...
diff --git a/test/sql/bind.test.lua b/test/sql/bind.test.lua
index 2ced7775a..4ad227d95 100644
--- a/test/sql/bind.test.lua
+++ b/test/sql/bind.test.lua
@@ -82,8 +82,6 @@ execute(sql, parameters)
-- suitable method in its bind API.
execute('SELECT ? AS big_uint', {0xefffffffffffffff})
-- Bind incorrect parameters.
-ok, err = pcall(execute, 'SELECT ?', { {1, 2, 3} })
-ok
parameters = {}
parameters[1] = {}
parameters[1][100] = 200
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-16 15:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-25 12:54 [Tarantool-patches] [PATCH v1 1/1] sql: introduce binding for ARRAY Mergen Imeev via Tarantool-patches
2021-12-02 23:00 ` Vladislav Shpilevoy via Tarantool-patches
2021-12-15 10:57 Mergen Imeev via Tarantool-patches
2021-12-16 15:01 ` Kirill Yukhin via Tarantool-patches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox