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 7048A6EC40; Mon, 9 Aug 2021 10:22:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7048A6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628493720; bh=pkDZ8NCvUZCYc+1GCUedopg1NwyIM77m5jHpWOn4Szs=; 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=o+PEK4mqPHZmCwjoogKOHwnCIKj3lI11bkzc7k2JfiaolpO8sdWmdfNH80TpSoAH4 PbhL4g1QQZDemREqPCVKBh7e28kVvZmSZPCGkBcAE75AOpQ78m8hLzrE9MlxmeJHNc +EaOEKgtyVOAm2H24h3F/gSvUZ3M+/FVEWRRTLkQ= Received: from smtp44.i.mail.ru (smtp44.i.mail.ru [94.100.177.104]) (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 13B9A6EC5B for ; Mon, 9 Aug 2021 10:19:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 13B9A6EC5B Received: by smtp44.i.mail.ru with esmtpa (envelope-from ) id 1mCzYu-0001aj-Va; Mon, 09 Aug 2021 10:19:05 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Mon, 9 Aug 2021 10:19:04 +0300 Message-Id: <79871a45476aca400ecb921a44550a3807c309ca.1628493342.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: 4F1203BC0FB41BD92087353F0EC44DD9736CF3E71F18CE0C3E1D5927724F4AAA182A05F538085040C1AEA83DFA6D061A71C4BEFA99B836B0176BA1A376AAFCB3E07D6352B05A6522 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE769420192704DB0E7EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006371750936FC250F8708638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D4806CA4704F5F049EFBFB5A7B25F210117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEC65AC60A1F0286FECAA9C333723BB66AD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3CE135D2742255B35C0837EA9F3D19764C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637AF8E4F18C523FAA9EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C72045CD04223AD152A78F9B35303F2DB2E588BD2B95E03D29C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF5218A6880B2A9D02699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34BD150993ED26DDF44D277655D45919C41BD80C8F83BDB9609D8E84ABAC199B4F31E4B292B991423E1D7E09C32AA3244CDDDC3D62746B15959B44935F16C8F963E3D93501275E802F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMTMPlNJj3ShU0gdqe7lMAw== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306ED4617CA3B6F06057071C4BEFA99B836B07345D355D45E21A65105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 6/6] sql: remove unnecessary function initialization 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 removing the SQL built-in functions from _func, the code used to initialize these SQL built-in functions is no longer used and should be removed. Follow-up #6106 --- src/box/func.c | 7 ------- src/box/func_def.c | 8 -------- src/box/sql/func.c | 49 ---------------------------------------------- 3 files changed, 64 deletions(-) diff --git a/src/box/func.c b/src/box/func.c index 731f18a3b..04ae1b958 100644 --- a/src/box/func.c +++ b/src/box/func.c @@ -394,10 +394,6 @@ restore_fail: static struct func * func_c_new(struct func_def *def); -/** Construct a SQL builtin function object. */ -extern struct func * -func_sql_builtin_new(struct func_def *def); - struct func * func_new(struct func_def *def) { @@ -409,9 +405,6 @@ func_new(struct func_def *def) case FUNC_LANGUAGE_LUA: func = func_lua_new(def); break; - case FUNC_LANGUAGE_SQL_BUILTIN: - func = func_sql_builtin_new(def); - break; default: unreachable(); } diff --git a/src/box/func_def.c b/src/box/func_def.c index 11d2bdb84..630b4a43c 100644 --- a/src/box/func_def.c +++ b/src/box/func_def.c @@ -116,14 +116,6 @@ func_def_check(struct func_def *def) return -1; } break; - case FUNC_LANGUAGE_SQL_BUILTIN: - if (def->body != NULL || def->is_sandboxed) { - diag_set(ClientError, ER_CREATE_FUNCTION, def->name, - "body and is_sandboxed options are not compatible " - "with SQL language"); - return -1; - } - break; default: break; } diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 2a3a5d457..50014b756 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -2789,55 +2789,6 @@ sql_built_in_functions_cache_free(void) mh_strnptr_delete(built_in_functions); } -struct func * -func_sql_builtin_new(struct func_def *def) -{ - assert(def->language == FUNC_LANGUAGE_SQL_BUILTIN); - /** Binary search for corresponding builtin entry. */ - int idx = -1, left = 0, right = nelem(sql_builtins) - 1; - while (left <= right) { - uint32_t mid = (left + right) / 2; - int rc = strcmp(def->name, sql_builtins[mid].name); - if (rc == 0) { - idx = mid; - break; - } - if (rc < 0) - right = mid - 1; - else - left = mid + 1; - } - /* - * All SQL built-in(s) (stubs) are defined in a snapshot. - * Implementation-specific metadata is defined in - * sql_builtins list. When a definition were not found - * above, the function name is invalid, i.e. it is - * not built-in function. - */ - if (idx == -1) { - diag_set(ClientError, ER_CREATE_FUNCTION, def->name, - "given built-in is not predefined"); - return NULL; - } - struct func_sql_builtin *func = - (struct func_sql_builtin *) calloc(1, sizeof(*func)); - if (func == NULL) { - diag_set(OutOfMemory, sizeof(*func), "malloc", "func"); - return NULL; - } - func->base.def = def; - func->base.vtab = &func_sql_builtin_vtab; - func->flags = sql_builtins[idx].flags; - func->call = sql_builtins[idx].call; - func->finalize = sql_builtins[idx].finalize; - def->param_count = sql_builtins[idx].param_count; - def->is_deterministic = sql_builtins[idx].is_deterministic; - def->returns = sql_builtins[idx].returns; - def->aggregate = sql_builtins[idx].aggregate; - def->exports.sql = sql_builtins[idx].export_to_sql; - return &func->base; -} - static void func_sql_builtin_destroy(struct func *func) { -- 2.25.1