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 1D0E66EC40; Mon, 9 Aug 2021 10:21:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1D0E66EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628493689; bh=TOknBEicCG24nWF71PFgCPb67tBcHo8Bv1Tazfaqwfw=; 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=E65WpArrgkJB6/W0GjNWGDJqmdxdYQAoLX87El5gBSigRu+BikFtxoSOd4VzNg45a N0TJ53Dz7w4ZMul3hCy5CuJHraViXnmg9T0iX9eQtuAMfRn8kDCSHEJFfJ7/zyam6V HLdX8GLZyRGM0BfNciwQSidiaQUgY8nEgCuarIX4= Received: from smtp54.i.mail.ru (smtp54.i.mail.ru [217.69.128.34]) (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 A39726EC45 for ; Mon, 9 Aug 2021 10:19:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A39726EC45 Received: by smtp54.i.mail.ru with esmtpa (envelope-from ) id 1mCzYs-0007vL-RY; Mon, 09 Aug 2021 10:19:03 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Mon, 9 Aug 2021 10:19:02 +0300 Message-Id: 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: 4F1203BC0FB41BD92087353F0EC44DD9736CF3E71F18CE0C3E1D5927724F4AAA182A05F53808504013717CB3C4E492DE52C805896859A4A04837DF3669EFD371F185DE581EBCB289 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7DB45732B85BEE83BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375F0BD5CF353A411D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D83EC7AB503A829FE657CB0915A34FE87D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE140C956E756FBB7ACAA9C333723BB66AD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3FA486DC37A503D0BAD7EC71F1DB88427C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637AF8E4F18C523FAA9EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B505D8E9F0B02E82798D733F6905F4CBADC7 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C72045CD04223AD151ECA4CF364F6645116A4068E92EA31CA9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF5218A6880B2A9D02699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C0DDD40374D35017F20394E4F213B67FD0FCC679D74CF37DF7149E3088A17540E2D6D64345F4FB351D7E09C32AA3244CEDE88EED59A11DE50A5FE586F91487769CA7333006C390A0729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMTMPlNJj3SgBkWUu/iCKSg== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306EDB923DCC0C2FB4F9552C805896859A4A0E28E2421BF3B429A5105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 5/6] alter: disallow creation of SQL built-in function 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 prohibits creation of user-defined functions with SQL_BUILTIN engine. Closes #6106 --- src/box/alter.cc | 38 +++++++++++++++++++++++++++++++++++++ test/box/function1.result | 7 ++++++- test/box/function1.test.lua | 3 +++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/box/alter.cc b/src/box/alter.cc index 217b882ba..8a4f0b5a6 100644 --- a/src/box/alter.cc +++ b/src/box/alter.cc @@ -3213,6 +3213,36 @@ on_replace_dd_user(struct trigger * /* trigger */, void *event) return 0; } +/** + * Check if the version of the data dictionary is lower than 2.9.0 and return + * new func def if it is the case. If it is the case, then it is possible to + * insert values with the "SQL_BUILTIN" language into _func, otherwise it is + * prohibited. This is for upgradeability from 2.1.3 to 2.3.0. Since all we need + * is to allow such inserts, we set func def to its default values. + */ +static int +func_def_create_sql_built_in(struct func_def *def) +{ + if (dd_version_id >= version_id(2, 9, 0)) { + diag_set(ClientError, ER_FUNCTION_LANGUAGE, "SQL_BUILTIN", + def->name); + return -1; + } + def->body = NULL; + def->comment = NULL; + def->setuid = 1; + def->is_deterministic = false; + def->is_sandboxed = false; + def->param_count = 0; + def->returns = FIELD_TYPE_ANY; + def->aggregate = FUNC_AGGREGATE_NONE; + def->language = FUNC_LANGUAGE_LUA; + def->exports.lua = true; + def->exports.sql = true; + func_opts_create(&def->opts); + return 0; +} + /** * Get function identifiers from a tuple. * @@ -3344,6 +3374,14 @@ func_def_new_from_tuple(struct tuple *tuple) language, def->name); return NULL; } + if (def->language == FUNC_LANGUAGE_SQL_BUILTIN) { + if (func_def_create_sql_built_in(def) != 0) + return NULL; + if (func_def_check(def) != 0) + return NULL; + def_guard.is_active = false; + return def; + } } else { /* Lua is the default. */ def->language = FUNC_LANGUAGE_LUA; diff --git a/test/box/function1.result b/test/box/function1.result index a49a133f7..a1c89850d 100644 --- a/test/box/function1.result +++ b/test/box/function1.result @@ -372,7 +372,7 @@ c:close() box.schema.func.create('WAITFOR', {language = 'SQL_BUILTIN', \ param_list = {'integer'}, returns = 'integer',exports = {'SQL'}}) --- -- error: 'Failed to create function ''WAITFOR'': given built-in is not predefined' +- error: Unsupported language 'SQL_BUILTIN' specified for function 'WAITFOR' ... test_run:cmd("setopt delimiter ';'") --- @@ -1078,3 +1078,8 @@ box.func['test'].is_multikey == true box.func['test']:drop() --- ... +-- gh-6106: Check that user-defined functions cannot have SQL_BUILTIN engine. +box.schema.func.create("ABS", {language = 'SQL_BUILTIN', returns = 'integer'}) +--- +- error: Unsupported language 'SQL_BUILTIN' specified for function 'ABS' +... diff --git a/test/box/function1.test.lua b/test/box/function1.test.lua index 4fdd48520..e635b6e18 100644 --- a/test/box/function1.test.lua +++ b/test/box/function1.test.lua @@ -389,3 +389,6 @@ box.func.LUA:call({"return 1 + 1"}) box.schema.func.create('test', {body = "function(tuple) return tuple end", is_deterministic = true, opts = {is_multikey = true}}) box.func['test'].is_multikey == true box.func['test']:drop() + +-- gh-6106: Check that user-defined functions cannot have SQL_BUILTIN engine. +box.schema.func.create("ABS", {language = 'SQL_BUILTIN', returns = 'integer'}) -- 2.25.1