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 3895C7F62A; Fri, 6 Aug 2021 22:42:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3895C7F62A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628278947; bh=ELbakMIk0zdiqrVEnZmfRCvhWkpWsv/zaTAQIL6rQFQ=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=FVz+cXfIOJJGzGo0lk3GdOSd2agKxFnaJlbonKvB5Fkbl1IKahP2oRbYtliky1G5J n0+OFCN2P02op4Kna07JXXAKZdcs11/m6Lba+S4f3g+no7VXli/0B3AKZXF0UE2J0p LIetb1qyCL6ogE0GAXV/Z5KrTjwLorQis+PM6yXM= Received: from smtp47.i.mail.ru (smtp47.i.mail.ru [94.100.177.107]) (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 F30DD7F627 for ; Fri, 6 Aug 2021 22:42:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F30DD7F627 Received: by smtp47.i.mail.ru with esmtpa (envelope-from ) id 1mC5jc-00062F-91; Fri, 06 Aug 2021 22:42:24 +0300 Date: Fri, 6 Aug 2021 22:42:23 +0300 To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210806194223.GB11107@tarantool.org> References: <1f3fed85601ae3bb7680d3ba8cb523fb0e412299.1628081224.git.imeevma@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD972FF4A7D76DB5E242D14FEF1BD8BF4AC182A05F538085040D861AC9802412A580B52F093478C6D18C56313EC4C8261A4E7FBF94D236CD444 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70D53446EB66A9CE1EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AF78C68CB7D402738638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D865D2EA23EEFB3CADF7DF04C70602CC32117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE7532CA1512B819811DBC1C451FC279AAD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE36FF1B927F95F331603F1AB874ED89028C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637AF8E4F18C523FAA9EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458F0AFF96BAACF4158235E5A14AD4A4A4625E192CAD1D9E79D94463893BF8742D0500FAB143AF5460D X-C1DE0DAB: 0D63561A33F958A534DDFA0AF9D0781146A076405D2E26648CA30B0D60E401EBD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75AF0B556A5A327A45410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A9A0A0BF1A2CAC6298F961A31036D3C19DF4C0D64E371F66FA2009BAF09124F7872959C01AF661511D7E09C32AA3244C4227FB8AD2199F8B6AE898494A2B52F833C9DC155518937F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojFhlvmGwdUwQZZ8+amjVaew== X-Mailru-Sender: 3A338A78718AEC5A7171F149183FF3A728DF36C8E6FB073F8E83F2A96ACDE3A9D6ABBC8983DD6D02A3E7B4BFDCAD2EFE027D9DD7AE851095A2E8D17B49942DB0CBEE3F9BE14373499437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 2/6] sql: introduce sql_func_find() 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: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thank you for the review! My answer, diff and new patch below. On Fri, Aug 06, 2021 at 12:15:20AM +0200, Vladislav Shpilevoy wrote: > Thanks for the patch! > > > diff --git a/src/box/sql/func.c b/src/box/sql/func.c > > index 28d383293..9514d070a 100644 > > --- a/src/box/sql/func.c > > +++ b/src/box/sql/func.c > > @@ -2655,6 +2643,30 @@ static struct { > > }, > > }; > > > > +struct func * > > +sql_func_find(struct Expr *expr) > > +{ > > + const char *name = expr->u.zToken; > > + struct func *func = func_by_name(name, strlen(name)); > > + if (func == NULL) { > > + diag_set(ClientError, ER_NO_SUCH_FUNCTION, name); > > + return NULL; > > + } > > + if (!func->def->exports.sql) { > > + diag_set(ClientError, ER_SQL_PARSER_GENERIC, > > + tt_sprintf("function %s() is not available in SQL", > > + name)); > > + return NULL; > > + } > > + int n = expr->x.pList ? expr->x.pList->nExpr : 0; > > != NULL. > Fixed. > > + if (func->def->param_count != -1 && func->def->param_count != n) { > > + diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, name, > > + tt_sprintf("%d", func->def->param_count), n); > > + return NULL; > > + } > > + return func; > > +} Diff: diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 9514d070a..7cdcce6bc 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -2658,7 +2658,7 @@ sql_func_find(struct Expr *expr) name)); return NULL; } - int n = expr->x.pList ? expr->x.pList->nExpr : 0; + int n = expr->x.pList != NULL ? expr->x.pList->nExpr : 0; if (func->def->param_count != -1 && func->def->param_count != n) { diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, name, tt_sprintf("%d", func->def->param_count), n); New patch: commit fbb57e6bf3a40d387a1641f4233680613d3b7f5e Author: Mergen Imeev Date: Sat Jul 31 19:05:05 2021 +0300 sql: introduce sql_func_find() This patch introduces the sql_func_find() function. This function allows us to centralize the look up of functions during parsing, which simplifies code and fixes some incorrect error messages. Part of #6106 diff --git a/src/box/sql/analyze.c b/src/box/sql/analyze.c index b87f69512..afa2331a1 100644 --- a/src/box/sql/analyze.c +++ b/src/box/sql/analyze.c @@ -719,6 +719,10 @@ callStatGet(Vdbe * v, int regStat4, int iParam, int regOut) { assert(regOut != regStat4 && regOut != regStat4 + 1); sqlVdbeAddOp2(v, OP_Integer, iParam, regStat4 + 1); + /* + * Function sql_func_by_signature() was removed, so after enabling this + * part should be changed. + */ struct func *func = sql_func_by_signature("_sql_stat_get", 2); assert(func != NULL); sqlVdbeAddOp4(v, OP_BuiltinFunction0, 0, regStat4, regOut, @@ -858,6 +862,10 @@ vdbe_emit_analyze_space(struct Parse *parse, struct space *space) sqlVdbeAddOp2(v, OP_Count, idx_cursor, stat4_reg + 3); sqlVdbeAddOp2(v, OP_Integer, part_count, stat4_reg + 1); sqlVdbeAddOp2(v, OP_Integer, part_count, stat4_reg + 2); + /* + * Function sql_func_by_signature() was removed, so after + * enabling this part should be changed. + */ struct func *init_func = sql_func_by_signature("_sql_stat_init", 3); assert(init_func != NULL); @@ -959,6 +967,10 @@ vdbe_emit_analyze_space(struct Parse *parse, struct space *space) sqlVdbeAddOp3(v, OP_MakeRecord, stat_key_reg, pk_part_count, key_reg); assert(chng_reg == (stat4_reg + 1)); + /* + * Function sql_func_by_signature() was removed, so after + * enabling this part should be changed. + */ struct func *push_func = sql_func_by_signature("_sql_stat_push", 3); assert(push_func != NULL); diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c index 80f2d349a..20d22455c 100644 --- a/src/box/sql/expr.c +++ b/src/box/sql/expr.c @@ -3957,7 +3957,6 @@ sqlExprCodeTarget(Parse * pParse, Expr * pExpr, int target) case TK_FUNCTION:{ ExprList *pFarg; /* List of function arguments */ int nFarg; /* Number of function arguments */ - const char *zId; /* The function name */ u32 constMask = 0; /* Mask of function arguments that are constant */ int i; /* Loop counter */ struct coll *coll = NULL; @@ -3970,11 +3969,8 @@ sqlExprCodeTarget(Parse * pParse, Expr * pExpr, int target) } nFarg = pFarg ? pFarg->nExpr : 0; assert(!ExprHasProperty(pExpr, EP_IntValue)); - zId = pExpr->u.zToken; - struct func *func = sql_func_by_signature(zId, nFarg); + struct func *func = sql_func_find(pExpr); if (func == NULL) { - diag_set(ClientError, ER_NO_SUCH_FUNCTION, - zId); pParse->is_aborted = true; break; } @@ -5431,14 +5427,8 @@ analyzeAggregate(Walker * pWalker, Expr * pExpr) pItem->iMem = ++pParse->nMem; assert(!ExprHasProperty (pExpr, EP_IntValue)); - const char *name = - pExpr->u.zToken; - uint32_t argc = - pExpr->x.pList != NULL ? - pExpr->x.pList->nExpr : 0; pItem->func = - sql_func_by_signature( - name, argc); + sql_func_find(pExpr); assert(pItem->func != NULL); assert(pItem->func->def-> language == diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 28d383293..7cdcce6bc 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -1934,24 +1934,12 @@ sql_is_like_func(struct Expr *expr) expr->x.pList->nExpr != 2) return 0; assert(!ExprHasProperty(expr, EP_xIsSelect)); - struct func *func = sql_func_by_signature(expr->u.zToken, 2); + struct func *func = sql_func_find(expr); if (func == NULL || !sql_func_flag_is_set(func, SQL_FUNC_LIKE)) return 0; return 1; } -struct func * -sql_func_by_signature(const char *name, int argc) -{ - struct func *base = func_by_name(name, strlen(name)); - if (base == NULL || !base->def->exports.sql) - return NULL; - - if (base->def->param_count != -1 && base->def->param_count != argc) - return NULL; - return base; -} - static int func_sql_builtin_call_stub(struct func *func, struct port *args, struct port *ret) @@ -2655,6 +2643,30 @@ static struct { }, }; +struct func * +sql_func_find(struct Expr *expr) +{ + const char *name = expr->u.zToken; + struct func *func = func_by_name(name, strlen(name)); + if (func == NULL) { + diag_set(ClientError, ER_NO_SUCH_FUNCTION, name); + return NULL; + } + if (!func->def->exports.sql) { + diag_set(ClientError, ER_SQL_PARSER_GENERIC, + tt_sprintf("function %s() is not available in SQL", + name)); + return NULL; + } + int n = expr->x.pList != NULL ? expr->x.pList->nExpr : 0; + if (func->def->param_count != -1 && func->def->param_count != n) { + diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, name, + tt_sprintf("%d", func->def->param_count), n); + return NULL; + } + return func; +} + uint32_t sql_func_flags(const char *name) { diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c index 11b6139e3..35faddab5 100644 --- a/src/box/sql/resolve.c +++ b/src/box/sql/resolve.c @@ -598,28 +598,8 @@ resolveExprStep(Walker * pWalker, Expr * pExpr) assert(!ExprHasProperty(pExpr, EP_xIsSelect)); zId = pExpr->u.zToken; nId = sqlStrlen30(zId); - struct func *func = func_by_name(zId, nId); + struct func *func = sql_func_find(pExpr); if (func == NULL) { - diag_set(ClientError, ER_NO_SUCH_FUNCTION, zId); - pParse->is_aborted = true; - pNC->nErr++; - return WRC_Abort; - } - if (!func->def->exports.sql) { - diag_set(ClientError, ER_SQL_PARSER_GENERIC, - tt_sprintf("function %.*s() is not " - "available in SQL", - nId, zId)); - pParse->is_aborted = true; - pNC->nErr++; - return WRC_Abort; - } - if (func->def->param_count != -1 && - func->def->param_count != n) { - uint32_t argc = func->def->param_count; - const char *err = tt_sprintf("%d", argc); - diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, - func->def->name, err, n); pParse->is_aborted = true; pNC->nErr++; return WRC_Abort; diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index a92de0a2f..c6927e1e4 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -4362,17 +4362,9 @@ sql_func_flag_is_set(struct func *func, uint16_t flag) return (((struct func_sql_builtin *)func)->flags & flag) != 0; } -/** - * A SQL method to find a function in a hash by its name and - * count of arguments. Only functions that have 'SQL' engine - * export field set true and have exactly the same signature - * are returned. - * - * Returns not NULL function pointer when a valid and exported - * to SQL engine function is found and NULL otherwise. - */ +/** Return a function that matches the parameters described in given expr. */ struct func * -sql_func_by_signature(const char *name, int argc); +sql_func_find(struct Expr *expr); /** * Return the parameters of the function with the given name. If the function diff --git a/src/box/sql/vdbemem.c b/src/box/sql/vdbemem.c index 2c5099616..499089c8d 100644 --- a/src/box/sql/vdbemem.c +++ b/src/box/sql/vdbemem.c @@ -148,7 +148,7 @@ valueFromFunction(sql * db, /* The database connection */ pList = p->x.pList; if (pList) nVal = pList->nExpr; - struct func *func = sql_func_by_signature(p->u.zToken, nVal); + struct func *func = sql_func_find(p); if (func == NULL || func->def->language != FUNC_LANGUAGE_SQL_BUILTIN || !func->def->is_deterministic || sql_func_flag_is_set(func, SQL_FUNC_NEEDCOLL)) diff --git a/test/sql-tap/func5.test.lua b/test/sql-tap/func5.test.lua index 9b1526aaf..13698582b 100755 --- a/test/sql-tap/func5.test.lua +++ b/test/sql-tap/func5.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool local test = require("sqltester") -test:plan(25) +test:plan(27) --!./tcltestrunner.lua -- 2010 August 27 @@ -314,4 +314,36 @@ test:do_execsql_test( box.func.COUNTER1:drop() box.func.COUNTER2:drop() +-- +-- Make sure the correct error is displayed if the function throws an error when +-- setting the default value. +-- +local body = 'function(x) return 1 end' +box.schema.func.create('F1', {language = 'Lua', returns = 'number', body = body, + param_list = {}, exports = {'LUA'}}); +box.execute([[CREATE TABLE t01(i INT PRIMARY KEY, a INT DEFAULT(f1(1)));]]) +test:do_catchsql_test( + "func-7.1", + [[ + INSERT INTO t01(i) VALUES(1); + ]], { + 1, "function F1() is not available in SQL" + }) + +box.schema.func.create('F2', {language = 'Lua', returns = 'number', body = body, + exports = {'LUA', 'SQL'}}); +box.execute([[CREATE TABLE t02(i INT PRIMARY KEY, a INT DEFAULT(f2(1)));]]) +test:do_catchsql_test( + "func-7.2", + [[ + INSERT INTO t02(i) VALUES(1); + ]], { + 1, "Wrong number of arguments is passed to F2(): expected 0, got 1" + }) + +box.func.F1:drop() +box.func.F2:drop() +box.space.T01:drop() +box.space.T02:drop() + test:finish_test()