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 3D9F66E459; Thu, 18 Nov 2021 17:09:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3D9F66E459 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1637244587; bh=mWNX9tHq3yVR5TSxH5Cl6ZG3OmI4s5o69vLCpQuqzs0=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=Pz8fyFf91tcrrjJm1l1rqNohzqd5D7U9GVzN/+opJH4zocFyGlBcag5mb9DJEFSdr mg/cOKVFQP7f6R8NQX2+giRAlgNOZ/N0frjMa+HshWIzxsiwKea0QNsiyu9QSlEee0 mH5bAl3T99Cr+lTQGYw0EQbyR6gIqM2jU+b9MuRc= 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 C13EF70292 for ; Thu, 18 Nov 2021 17:08:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C13EF70292 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mni5m-00038O-2G; Thu, 18 Nov 2021 17:08:46 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Thu, 18 Nov 2021 17:08:45 +0300 Message-Id: <4ecfb3439688bef76c96270624410dee8822176f.1637244389.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9731B3922EC063979CAB00300CDA98DC51CCA794E1CC6B18A00894C459B0CD1B9F6D676F27CC862BAE2D133589F220A20BC0CDECF27E180F645678E5A44F257A1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72AC9FB60380F23AEEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373D332FFE8BBF4EB58638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D865466C59A6C9471DCB707EAB00A05721117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6300D3B61E77C8D3B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B50517E1FE11F3714074A04A3C566C88C263 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C4C7A0BC55FA0FE5FCA8002A2F25B7E1A644B8A071B0D6F29D1932A6DAECFECB48B1881A6453793CE9C32612AADDFBE061C61BE10805914D3804EBA3D8E7E5B87ABF8C51168CD8EBDBF87214F1A954108EDC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34128DEC38EFF4BE5ADFD33692DF7A59D95D3B4D7D9A27E17E0F42108E94100BE99A4A215687089E291D7E09C32AA3244C7EADAEA5BFE7DDADA55C156CE3F7E97B30363D8B7DA7DD44729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojb91S64R+cbu4Lw0xq0YuEA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D37647673EA62B16057813A16714808C583D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 2/2] sql: introduce syntax for MAP values 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" This patch introduces a new syntax that allows to create MAP values in an SQL query. Part of #4762 @TarantoolBot document Title: Syntax for MAP in SQL The syntax for creating document values is available in SQL. You can use `{`, ':' and `}` to create a MAP value. Only INTEGER, STRING and UUID values can be keys in MAP values. Examples: ``` tarantool> box.execute("SELECT {1 : 'a', 'asd' : 1.5, uuid() : true};") --- - metadata: - name: COLUMN_1 type: map rows: - [{1: 'a', 91ca4dbb-c6d4-4468-b4a4-ab1e409dd87e: true, 'asd': 1.5}] ... ``` ``` tarantool> box.execute("SELECT {'h' : ['abc', 321], 7 : {'b' : 1.5}};") --- - metadata: - name: COLUMN_1 type: map rows: - [{7: {'b': 1.5}, 'h': ['abc', 321]}] ... ``` --- src/box/sql/expr.c | 33 +++++++++ src/box/sql/mem.c | 39 +++++++++++ src/box/sql/mem.h | 16 +++++ src/box/sql/parse.y | 35 +++++++++- src/box/sql/tokenize.c | 21 +++++- src/box/sql/vdbe.c | 20 ++++++ test/sql-tap/map.test.lua | 138 +++++++++++++++++++++++++++++++++++++- 7 files changed, 296 insertions(+), 6 deletions(-) diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c index 74a98c550..789d8906c 100644 --- a/src/box/sql/expr.c +++ b/src/box/sql/expr.c @@ -3432,6 +3432,35 @@ expr_code_array(struct Parse *parser, struct Expr *expr, int reg) sqlVdbeAddOp3(vdbe, OP_Array, count, reg, values_reg); } +static void +expr_code_map(struct Parse *parser, struct Expr *expr, int reg) +{ + struct Vdbe *vdbe = parser->pVdbe; + struct ExprList *list = expr->x.pList; + if (list == NULL) { + sqlVdbeAddOp3(vdbe, OP_Map, 0, reg, 0); + return; + } + int count = list->nExpr; + assert(count % 2 == 0); + for (int i = 0; i < count / 2; ++i) { + struct Expr *expr = list->a[2 * i].pExpr; + enum field_type type = sql_expr_type(expr); + if (expr->op != TK_VARIABLE && type != FIELD_TYPE_INTEGER && + type != FIELD_TYPE_UNSIGNED && type != FIELD_TYPE_STRING && + type != FIELD_TYPE_UUID) { + diag_set(ClientError, ER_SQL_PARSER_GENERIC, "Only " + "integer, string and uuid can be keys in map"); + parser->is_aborted = true; + return; + } + } + int values_reg = parser->nMem + 1; + parser->nMem += count; + sqlExprCodeExprList(parser, list, values_reg, 0, SQL_ECEL_FACTOR); + sqlVdbeAddOp3(vdbe, OP_Map, count, reg, values_reg); +} + /* * Erase column-cache entry number i */ @@ -3887,6 +3916,10 @@ sqlExprCodeTarget(Parse * pParse, Expr * pExpr, int target) expr_code_array(pParse, pExpr, target); break; + case TK_MAP: + expr_code_map(pParse, pExpr, target); + return target; + case TK_LT: case TK_LE: case TK_GT: diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index b598fe5c2..fe7029341 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -3043,6 +3043,45 @@ mem_encode_array(const struct Mem *mems, uint32_t count, uint32_t *size, return array; } +char * +mem_encode_map(const struct Mem *mems, uint32_t count, uint32_t *size, + struct region *region) +{ + assert(count % 2 == 0); + size_t used = region_used(region); + bool is_error = false; + struct mpstream stream; + mpstream_init(&stream, region, region_reserve_cb, region_alloc_cb, + set_encode_error, &is_error); + mpstream_encode_map(&stream, (count + 1) / 2); + for (uint32_t i = 0; i < count / 2; ++i) { + const struct Mem *key = &mems[2 * i]; + const struct Mem *value = &mems[2 * i + 1]; + if (mem_is_metatype(key) || + (key->type & (MEM_TYPE_UINT | MEM_TYPE_INT | MEM_TYPE_UUID | + MEM_TYPE_STR)) == 0) { + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, + mem_str(key), "integer, string or uuid"); + return NULL; + } + mem_to_mpstream(key, &stream); + mem_to_mpstream(value, &stream); + } + mpstream_flush(&stream); + if (is_error) { + diag_set(OutOfMemory, stream.pos - stream.buf, + "mpstream_flush", "stream"); + return NULL; + } + *size = region_used(region) - used; + char *map = region_join(region, *size); + if (map == NULL) { + diag_set(OutOfMemory, *size, "region_join", "map"); + return NULL; + } + return map; +} + /** * Allocate a sequence of initialized vdbe memory registers * on region. diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index b0128921f..83bb30ccf 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -861,3 +861,19 @@ mem_to_mpstream(const struct Mem *var, struct mpstream *stream); char * mem_encode_array(const struct Mem *mems, uint32_t count, uint32_t *size, struct region *region); + +/** + * Encode array of MEMs as msgpack map on region. Values in even position are + * treated as keys in MAP, values in odd position are treated as values in MAP. + * number of MEMs should be even. + * + * @param mems array of MEMs to encode. + * @param count number of elements in the array. + * @param[out] size Size of encoded msgpack map. + * @param region Region to use. + * @retval NULL on error, diag message is set. + * @retval Pointer to valid msgpack map on success. + */ +char * +mem_encode_map(const struct Mem *mems, uint32_t count, uint32_t *size, + struct region *region); diff --git a/src/box/sql/parse.y b/src/box/sql/parse.y index 06e6244e3..db7fef71a 100644 --- a/src/box/sql/parse.y +++ b/src/box/sql/parse.y @@ -1100,12 +1100,12 @@ expr(A) ::= VARNUM(X). { sqlExprAssignVarNumber(pParse, A.pExpr, X.n); } } -expr(A) ::= VARIABLE(X) id(Y). { +expr(A) ::= COLON|VARIABLE(X) id(Y). { A.pExpr = expr_variable(pParse, &X, &Y); A.zStart = X.z; A.zEnd = &Y.z[Y.n]; } -expr(A) ::= VARIABLE(X) INTEGER(Y). { +expr(A) ::= COLON|VARIABLE(X) INTEGER(Y). { A.pExpr = expr_variable(pParse, &X, &Y); A.zStart = X.z; A.zEnd = &Y.z[Y.n]; @@ -1140,6 +1140,37 @@ expr(A) ::= LB(X) exprlist(Y) RB(E). { spanSet(&A, &X, &E); } +expr(A) ::= LCB(X) maplist(Y) RCB(E). { + struct sql *db = pParse->db; + struct Expr *expr = sql_expr_new_dequoted(db, TK_MAP, NULL); + if (expr == NULL) { + sql_expr_list_delete(db, Y); + pParse->is_aborted = true; + return; + } + expr->x.pList = Y; + expr->type = FIELD_TYPE_MAP; + sqlExprSetHeightAndFlags(pParse, expr); + A.pExpr = expr; + spanSet(&A, &X, &E); +} + +maplist(A) ::= nmaplist(A). +maplist(A) ::= . {A = 0;} +nmaplist(A) ::= nmaplist(A) COMMA expr(X) COLON expr(Y). { + A = sql_expr_list_append(pParse->db, A, X.pExpr); + A = sql_expr_list_append(pParse->db, A, Y.pExpr); +} +nmaplist(A) ::= expr(X) COLON expr(Y). { + A = sql_expr_list_append(pParse->db, NULL, X.pExpr); + A = sql_expr_list_append(pParse->db, A, Y.pExpr); +} + +%type maplist {ExprList*} +%destructor maplist {sql_expr_list_delete(pParse->db, $$);} +%type nmaplist {ExprList*} +%destructor nmaplist {sql_expr_list_delete(pParse->db, $$);} + expr(A) ::= TRIM(X) LP trim_operands(Y) RP(E). { A.pExpr = sqlExprFunction(pParse, Y, &X); spanSet(&A, &X, &E); diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c index 8bc519b9d..9e85801a3 100644 --- a/src/box/sql/tokenize.c +++ b/src/box/sql/tokenize.c @@ -58,7 +58,9 @@ #define CC_KYWD 1 /* Alphabetics or '_'. Usable in a keyword */ #define CC_ID 2 /* unicode characters usable in IDs */ #define CC_DIGIT 3 /* Digits */ -/** SQL variables: '@', '#', ':', and '$'. */ +/** Character ':'. */ +#define CC_COLON 4 +/** SQL variable special characters: '@', '#', and '$'. */ #define CC_VARALPHA 5 #define CC_VARNUM 6 /* '?'. Numeric SQL variables */ #define CC_SPACE 7 /* Space characters */ @@ -85,17 +87,21 @@ #define CC_LINEFEED 28 /* '\n' */ #define CC_LB 29 /* '[' */ #define CC_RB 30 /* ']' */ +/** Character '{'. */ +#define CC_LCB 31 +/** Character '}'. */ +#define CC_RCB 32 static const char sql_ascii_class[] = { /* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xa xb xc xd xe xf */ /* 0x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 7, 28, 7, 7, 7, 27, 27, /* 1x */ 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, /* 2x */ 7, 15, 9, 5, 5, 22, 24, 8, 17, 18, 21, 20, 23, 11, 26, 16, -/* 3x */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 19, 12, 14, 13, 6, +/* 3x */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 19, 12, 14, 13, 6, /* 4x */ 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 5x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 29, 27, 30, 27, 1, /* 6x */ 27, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -/* 7x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 27, 10, 27, 25, 27, +/* 7x */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 31, 10, 32, 25, 27, /* 8x */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 9x */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* Ax */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -228,6 +234,12 @@ sql_token(const char *z, int *type, bool *is_reserved) case CC_RB: *type = TK_RB; return 1; + case CC_LCB: + *type = TK_LCB; + return 1; + case CC_RCB: + *type = TK_RCB; + return 1; case CC_SEMI: *type = TK_SEMI; return 1; @@ -371,6 +383,9 @@ sql_token(const char *z, int *type, bool *is_reserved) case CC_VARNUM: *type = TK_VARNUM; return 1; + case CC_COLON: + *type = TK_COLON; + return 1; case CC_VARALPHA: *type = TK_VARIABLE; return 1; diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 55e494332..86de3f98a 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1438,6 +1438,26 @@ case OP_Array: { break; } +/** + * Opcode: Map P1 P2 P3 * * + * Synopsis: r[P2] = map(P3@P1) + * + * Construct an MAP value from P1 registers starting at reg(P3). + */ +case OP_Map: { + pOut = &aMem[pOp->p2]; + + uint32_t size; + struct region *region = &fiber()->gc; + size_t svp = region_used(region); + char *val = mem_encode_map(&aMem[pOp->p3], pOp->p1, &size, region); + if (val == NULL || mem_copy_map(pOut, val, size) != 0) { + region_truncate(region, svp); + goto abort_due_to_error; + } + break; +} + /* Opcode: Eq P1 P2 P3 P4 P5 * Synopsis: IF r[P3]==r[P1] * diff --git a/test/sql-tap/map.test.lua b/test/sql-tap/map.test.lua index 1afbb2b1d..de1e495f3 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(126) box.schema.func.create('M1', { language = 'Lua', @@ -982,6 +982,142 @@ test:do_catchsql_test( 1, "Failed to execute SQL statement: wrong arguments for function ZEROBLOB()" }) +-- Make sure syntax for MAP values works as intended. +test:do_execsql_test( + "map-13.1", + [[ + SELECT {'a': a, 'g': g, 't': t, 'n': n, 'f': f, 'i': i, 'b': b, 'v': v, + 's': s, 'd': d, 'u': u} FROM t1 WHERE id = 1; + ]], { + {t = "1", f = 1, n = 1, v = "1", g = 1, b = true, s = 1, + d = require('decimal').new(1), a = {a = 1}, i = 1, + u = require('uuid').fromstr('11111111-1111-1111-1111-111111111111')} + }) + +test:do_execsql_test( + "map-13.2", + [[ + SELECT {'q': 1, 'w': true, 'e': 1.5e0, 'r': ['asd', x'32'], 't': 123.0}; + ]], { + {w = true, e = 1.5, r = {'asd', '2'}, t = require('decimal').new(123), + q = 1} + }) + +test:do_execsql_test( + "map-13.3", + [[ + SELECT typeof({1: 1}); + ]], { + "map" + }) + +-- Make sure MAP() accepts only INTEGER, STRING and UUID as keys. +test:do_execsql_test( + "map-13.4", + [[ + SELECT {1: 1}; + ]], { + {[1] = 1} + }) + +test:do_execsql_test( + "map-13.5", + [[ + SELECT {-1: 1}; + ]], { + {[-1] = 1} + }) + +test:do_execsql_test( + "map-13.6", + [[ + SELECT {'a': 1}; + ]], { + {a = 1} + }) + +test:do_execsql_test( + "map-13.6", + [[ + SELECT typeof({UUID(): 1}); + ]], { + "map" + }) + +test:do_catchsql_test( + "map-13.7", + [[ + SELECT {1.5e0: 1}; + ]], { + 1, "Only integer, string and uuid can be keys in map" + }) + +test:do_catchsql_test( + "map-13.8", + [[ + SELECT {1.5: 1}; + ]], { + 1, "Only integer, string and uuid can be keys in map" + }) + +test:do_catchsql_test( + "map-13.9", + [[ + SELECT {x'33': 1}; + ]], { + 1, "Only integer, string and uuid can be keys in map" + }) + +test:do_catchsql_test( + "map-13.10", + [[ + SELECT {[1, 2, 3]: 1}; + ]], { + 1, "Only integer, string and uuid can be keys in map" + }) + +test:do_catchsql_test( + "map-13.11", + [[ + SELECT {{'a': 1}: 1}; + ]], { + 1, + 'Only integer, string and uuid can be keys in map' + }) + +test:do_catchsql_test( + "map-13.12", + [[ + SELECT {CAST(1 AS NUMBER): 1}; + ]], { + 1, 'Only integer, string and uuid can be keys in map' + }) + +test:do_catchsql_test( + "map-13.13", + [[ + SELECT {CAST(1 AS SCALAR): 1}; + ]], { + 1, 'Only integer, string and uuid can be keys in map' + }) + +test:do_catchsql_test( + "map-13.14", + [[ + SELECT {CAST(1 AS ANY): 1}; + ]], { + 1, 'Only integer, string and uuid can be keys in map' + }) + +test:do_test( + "map-13.15", + function() + local res = {pcall(box.execute, [[SELECT {?: 1};]], {1.5})} + return {tostring(res[3])} + end, { + "Type mismatch: can not convert double(1.5) to integer, string or uuid" + }) + box.execute([[DROP TABLE t1;]]) box.execute([[DROP TABLE t;]]) -- 2.25.1