From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Kirill Shcherbatov Subject: [PATCH v1 10/12] sql: remove SQL_PreferBuiltin flag Date: Mon, 8 Jul 2019 14:26:16 +0300 Message-Id: <98cecfef619fddd6ee5df67f29a4e5c95f88c588.1562584567.git.kshcherbatov@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: tarantool-patches@freelists.org, korablev@tarantool.org Cc: kostja@tarantool.org, vdavydov.dev@gmail.com, Kirill Shcherbatov List-ID: The SQL_PreferBuiltin flag is redundant (because builtin names are forbidden for UDFs) so we may to remove it. Needed for #4113, #2200, #2233 --- src/box/sql/callback.c | 5 +---- src/box/sql/sqlInt.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/box/sql/callback.c b/src/box/sql/callback.c index 49197532e..42fec2c6a 100644 --- a/src/box/sql/callback.c +++ b/src/box/sql/callback.c @@ -191,7 +191,6 @@ sqlFindFunction(sql * db, /* An open database */ int bestScore = 0; /* Score of best match */ int h; /* Hash value */ int nName; /* Length of the name */ - struct session *user_session = current_session(); assert(nArg >= (-2)); assert(nArg >= (-1) || createFlag == 0); @@ -221,9 +220,7 @@ sqlFindFunction(sql * db, /* An open database */ * new function. But the FuncDefs for built-in functions are read-only. * So we must not search for built-ins when creating a new function. */ - if (!createFlag && - (pBest == 0 - || (user_session->sql_flags & SQL_PreferBuiltin) != 0)) { + if (!createFlag && (pBest == NULL)) { bestScore = 0; h = (sqlUpperToLower[(u8) zName[0]] + nName) % SQL_FUNC_HASH_SZ; diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 11e7596d1..ce15500e5 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -1104,7 +1104,6 @@ struct sql { #define SQL_ReverseOrder 0x00020000 /* Reverse unordered SELECTs */ #define SQL_RecTriggers 0x00040000 /* Enable recursive triggers */ #define SQL_AutoIndex 0x00100000 /* Enable automatic indexes */ -#define SQL_PreferBuiltin 0x00200000 /* Preference to built-in funcs */ #define SQL_EnableTrigger 0x01000000 /* True to enable triggers */ #define SQL_DeferFKs 0x02000000 /* Defer all FK constraints */ #define SQL_VdbeEQP 0x08000000 /* Debug EXPLAIN QUERY PLAN */ -- 2.21.0