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 9331C74173; Fri, 6 Aug 2021 01:15:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9331C74173 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628201724; bh=hIBL2cUY9Rc0fSKwmLo8tLafQGe64NuZC8ZzBxX1b6M=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=R0TSDgcVi/NiCYuHd35KKmEmrOMhURG7SlRlwIWV0I/IWuuIbD/2aCsHkfRPrXxhU m6dX8m2+LexyTwoS6heV1iOt5bkJDV6InhCbaWfGLZSMspIc3hvzeneHDFetlBkNkb 3+B74RYyC+bYJiMpv17YxqjGZh3oxgDJrwllzFT8= Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (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 E89F27030F for ; Fri, 6 Aug 2021 01:15:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E89F27030F Received: by smtp40.i.mail.ru with esmtpa (envelope-from ) id 1mBle5-0004SX-9g; Fri, 06 Aug 2021 01:15:21 +0300 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <1f3fed85601ae3bb7680d3ba8cb523fb0e412299.1628081224.git.imeevma@gmail.com> Message-ID: Date: Fri, 6 Aug 2021 00:15:20 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <1f3fed85601ae3bb7680d3ba8cb523fb0e412299.1628081224.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD9BCE6B93DE0C6C3914462CDB1732D383C182A05F5380850406F56E333F055533A332EAD0E3C6F93FB234EBD87E93EA102F5B2DB967B27180F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE781307CBDB76B677BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637826327602763C04B8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D875F4554F220981FFB42289C9A30156ED117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE437C869540D2AB0FA9D86F9317F2E7ACD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3724336BCC0EE1BA8302FCEF25BFAB345C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637C970FD8DF19C51D2EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458F0AFF96BAACF4158235E5A14AD4A4A4625E192CAD1D9E79D94463893BF8742D0CFEAB56884AF5198 X-C1DE0DAB: 0D63561A33F958A5848E7630A1F08B4772F2F2206E05BED6255639A9CEAB416ED59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7501A9DF589746230F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34023CA4E4726A7D6CBC0812A474A6D1B0BAF89BFCACF36371D381451C71C674BF5CEE93E990C9DF191D7E09C32AA3244C5C5E2498B452ABC6B7B96ED91A28BC497C0C08F7987826B9729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojFhlvmGwdUwTxBTRfITDJDg== X-Mailru-Sender: 1F3202E75A95DDEFC23907419AE0C7D78445CD04E9EC9EC3631A11CE157F2F016CDAAAF1CD4B0D7707784C02288277CA03E0582D3806FB6A5317862B1921BA260ED6CFD6382C13A6112434F685709FCF0DA7A0AF5A3A8387 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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. > + 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; > +}