From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id E5A8B2FAEC for ; Fri, 9 Nov 2018 07:18:31 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MlqudBdb2osX for ; Fri, 9 Nov 2018 07:18:31 -0500 (EST) Received: from smtp55.i.mail.ru (smtp55.i.mail.ru [217.69.128.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 2B4832FAEB for ; Fri, 9 Nov 2018 07:18:31 -0500 (EST) Date: Fri, 9 Nov 2018 15:18:28 +0300 From: Alexander Turenko Subject: [tarantool-patches] Re: [PATCH 2/2] sql: remove GLOB from Tarantool Message-ID: <20181109121828.mjdoouycwvonimms@tkn_work_nb> References: <76466086-2a5f-8f12-cbc3-4ddf26e30fd9@tarantool.org> <32D1E5EA-EA21-4E4B-B5F5-80B6578BFBED@tarantool.org> <3f8354cb-4a47-c3de-164b-c776c792b991@tarantool.org> <090683CD-6F88-492D-AF48-631220A24E36@tarantool.org> <20181021034805.alwhmkpz3fbopqjz@tkn_work_nb> <20181029121529.2d6ccnh5qayiz7ld@tkn_work_nb> <6F5AC823-3016-4918-A588-6BB6B621B777@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <6F5AC823-3016-4918-A588-6BB6B621B777@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: Nikita Tatunov Cc: tarantool-patches@freelists.org, korablev@tarantool.org Hi! See comments below. WBR, Alexander Turenko. On Thu, Nov 08, 2018 at 06:09:23PM +0300, Nikita Tatunov wrote: > Hello! thank you for the review. > > Issues: > https://github.com/tarantool/tarantool/issues/3251 > https://github.com/tarantool/tarantool/issues/3334 > > Branch: > https://github.com/tarantool/tarantool/tree/N_Tatunov/gh-3251-where-like-hangs > It seems you forgot to push the new changes. > @@ -913,7 +899,7 @@ likeFunc(sqlite3_context *context, int argc, sqlite3_value **argv) > sqlite3_like_count++; > #endif > int res; > - res = sql_utf8_pattern_compare(zB, zA, *is_like_ci, escape); > + res = sql_utf8_pattern_compare(zB, zA, is_like_ci, escape); > if (res == SQL_INVALID_PATTERN) { > const char *const err_msg = > "LIKE pattern can only contain UTF-8 characters"; > @@ -1698,24 +1684,20 @@ setLikeOptFlag(sqlite3 * db, const char *zName, u8 flagVal) > * @retval none. > */ > void > -sqlite3RegisterLikeFunctions(sqlite3 *db, int is_case_sensitive) > +sqlite3RegisterLikeFunctions(sqlite3 *db, int *is_case_insensitive) > { > /* > * FIXME: after introducing type LIKE must > * return that type: TRUE if the string matches the > * supplied pattern and FALSE otherwise. > */ > - int *is_like_ci; > - if (is_case_sensitive) > - is_like_ci = (void *)&case_sensitive_like; > - else > - is_like_ci = (void *)&case_insensitive_like; > - sqlite3CreateFunc(db, "LIKE", AFFINITY_INTEGER, 2, 0, is_like_ci, > - likeFunc, 0, 0, 0); > - sqlite3CreateFunc(db, "LIKE", AFFINITY_INTEGER, 3, 0, is_like_ci, > - likeFunc, 0, 0, 0); > + int is_like_ci = SQLITE_PTR_TO_INT(is_case_insensitive); > + sqlite3CreateFunc(db, "LIKE", AFFINITY_INTEGER, 2, 0, > + is_case_insensitive, likeFunc, 0, 0, 0); > + sqlite3CreateFunc(db, "LIKE", AFFINITY_INTEGER, 3, 0, > + is_case_insensitive, likeFunc, 0, 0, 0); > setLikeOptFlag(db, "LIKE", > - is_case_sensitive ? (SQLITE_FUNC_LIKE | > + !(is_like_ci) ? (SQLITE_FUNC_LIKE | > SQLITE_FUNC_CASE) : SQLITE_FUNC_LIKE); > } I think sqlite3RegisterLikeFunctions should accept int as the second parameter. BTW, it seems that we add SQLITE_FUNC_CASE into flags, so maybe we can read it in likeFunc and don't pass additional parameter at all? It is just raw idea, I don't know the mechanics of sql functions much. > diff --git a/test/sql-tap/collation.test.lua b/test/sql-tap/collation.test.lua > index eb4f43a90..dbbe1c0fe 100755 > --- a/test/sql-tap/collation.test.lua > +++ b/test/sql-tap/collation.test.lua > @@ -219,7 +219,7 @@ local like_testcases = > {0, {"Aab", "aaa"}} }, > {"2.1.2", > "EXPLAIN QUERY PLAN SELECT * FROM tx1 WHERE s1 LIKE 'A%';", > - {0, {0, 0, 0, "/USING COVERING INDEX I1/"}} }, > + {0, {0, 0, 0, "SEARCH TABLE TX1 USING COVERING INDEX I1 (S1>? AND S1