From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 84CD96ECE3; Fri, 26 Nov 2021 10:48:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 84CD96ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1637912939; bh=bxhscAjizxe+zKlZDzNKyLukVaGsaU1ewfCgAkAE2so=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Mcfnd5DwVwq25b0qpKrAgB2iXR2XdHqli/lwB4ux8cld4MYUZ4S9G1VuoCikw72CG 5FEVDnwKF9wddlKF9TgmSAsjSb7ltJAf+lUVclJwNGkS9DXVbEKYUNIqGboZ5Jwskb 6jhX6/NIu7/nA2hw4jvG1AWoKpqJmfX27Duoy5a0= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id EA20A6ECE3 for ; Fri, 26 Nov 2021 10:48:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EA20A6ECE3 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mqVyb-0008UC-2b; Fri, 26 Nov 2021 10:48:57 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 26 Nov 2021 10:48:56 +0300 Message-Id: <402ddbcd02933505b245043b3ab522d903ce699a.1637912881.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9FE0487E502468146DA6F84D795BA86B848C0B828451394FB182A05F53808504041E58D8E15D695A46B816D2993B4F57BFAB5027A8825EDBAFAA6D8D751F97019 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE779AAD18609327F83EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E893C22CB255350D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D80A1054B63B86A71B84EAB61ADA00AA6E117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CFDB0F733DE27E913E35F32B20235E113FE0A947B32690B4D9C2B6934AE262D3EE7EAB7254005DCED42F5E56778F0CDB29510FB958DCE06DB6ED91DBE5ABE359A7EE5648E065588D469F8FEF10F1C2C2993EDB24507CE13387DFF0A840B692CF8 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34EE6683D9E546CC621502CA7E9154A5AE44B3FEECAB62EFDC872FBBD96D217BDBD428C7F5BE6CA3261D7E09C32AA3244C51A1014666E15A5524D9D2EDDEE706D75A1673A01BA68E40729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojSlgYgnOs4p6qS67TAZqU0Q== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D2F8107690BB6A3A3F7ACBBEE698871BF83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 1/1] sql: introduce binding for MAP X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" After this patch, MAP values can be used as bind variables. However, due to the current syntax for binding in Lua, the only possible way is to use MAP values as the named bind variable. Part of #4763 --- https://github.com/tarantool/tarantool/issues/4763 https://github.com/tarantool/tarantool/tree/imeevma/gh-4763-bindings-for-map src/box/bind.c | 7 +++---- src/box/lua/execute.c | 5 +---- src/box/sql/sqlInt.h | 3 +++ src/box/sql/vdbeapi.c | 8 ++++++++ test/sql-tap/map.test.lua | 25 ++++++++++++++++++++++++- test/sql/bind.result | 6 +++++- 6 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/box/bind.c b/src/box/bind.c index af9f9eac5..441c9f46f 100644 --- a/src/box/bind.c +++ b/src/box/bind.c @@ -100,15 +100,12 @@ sql_bind_decode(struct sql_bind *bind, int i, const char **packet) bind->s = mp_decode_bin(packet, &bind->bytes); break; case MP_ARRAY: + case MP_MAP: case MP_EXT: bind->s = *packet; mp_next(packet); bind->bytes = *packet - bind->s; break; - case MP_MAP: - diag_set(ClientError, ER_SQL_BIND_TYPE, "MAP", - sql_bind_name(bind)); - return -1; default: unreachable(); } @@ -189,6 +186,8 @@ sql_bind_column(struct sql_stmt *stmt, const struct sql_bind *p, 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_MAP: + return sql_bind_map_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 71d4d7fae..b3f81d709 100644 --- a/src/box/lua/execute.c +++ b/src/box/lua/execute.c @@ -386,6 +386,7 @@ 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_MAP: case MP_ARRAY: { size_t used = region_used(region); struct mpstream stream; @@ -410,10 +411,6 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i) 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)); - return -1; default: unreachable(); } diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 716110edc..0db16b293 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -559,6 +559,9 @@ 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_map_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 7349d6ece..74f1a0f7b 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -532,6 +532,14 @@ sql_bind_array_static(sql_stmt *stmt, int i, const char *str, uint32_t size) return sql_bind_type(vdbe, i, "array"); } +int +sql_bind_map_static(sql_stmt *stmt, int i, const char *str, uint32_t size) +{ + struct Vdbe *vdbe = (struct Vdbe *)stmt; + mem_set_map_static(&vdbe->aVar[i - 1], (char *)str, size); + return sql_bind_type(vdbe, i, "map"); +} + int sql_bind_uuid(struct sql_stmt *stmt, int i, const struct tt_uuid *uuid) { diff --git a/test/sql-tap/map.test.lua b/test/sql-tap/map.test.lua index 1afbb2b1d..8cdbb1662 100755 --- a/test/sql-tap/map.test.lua +++ b/test/sql-tap/map.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool local test = require("sqltester") -test:plan(110) +test:plan(112) box.schema.func.create('M1', { language = 'Lua', @@ -982,6 +982,29 @@ test:do_catchsql_test( 1, "Failed to execute SQL statement: wrong arguments for function ZEROBLOB()" }) +-- Make sure that MAP values can be used as a bound variable. +test:do_test( + "builtins-13.1", + function() + local res = box.execute([[SELECT #a;]], {{['#a'] = {abc = 2, [1] = 3}}}) + return {res.rows[1][1]} + end, { + {abc = 2, [1] = 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'] = {abc = 2, [1] = 3}}}) + return {res.rows[1][1]} + end, { + {abc = 2, [1] = 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 f269056e2..e738a91cd 100644 --- a/test/sql/bind.result +++ b/test/sql/bind.result @@ -276,7 +276,11 @@ parameters[1][':value'] = {kek = 300} ... execute('SELECT :value', parameters) --- -- error: Bind value type MAP for parameter ':value' is not supported +- metadata: + - name: COLUMN_1 + type: map + rows: + - [{'kek': 300}] ... -- gh-3810: bind values of integer in range up to 2^64 - 1. -- -- 2.25.1