Tarantool development patches archive
 help / color / mirror / Atom feed
From: Nikita Pettik <korablev@tarantool.org>
To: tarantool-patches@freelists.org
Cc: v.shpilevoy@tarantool.org, Nikita Pettik <korablev@tarantool.org>
Subject: [tarantool-patches] [PATCH 2/3] sql: remove sql_like_count global counter
Date: Sat,  9 Mar 2019 20:00:01 +0300	[thread overview]
Message-ID: <a2f4ed039f49b78290a75393e86836fb5f6c0bb8.1552149462.git.korablev@tarantool.org> (raw)
In-Reply-To: <cover.1552149462.git.korablev@tarantool.org>
In-Reply-To: <cover.1552149462.git.korablev@tarantool.org>

We don't rely on this debug facility anymore, so let's remove it.
---
 src/box/sql/func.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/box/sql/func.c b/src/box/sql/func.c
index a0df830f6..0c07f7e3c 100644
--- a/src/box/sql/func.c
+++ b/src/box/sql/func.c
@@ -800,14 +800,6 @@ sql_strlike_ci(const char *zPattern, const char *zStr, unsigned int esc)
 		                        zStr + strlen(zStr), 1, esc);
 }
 
-/**
- * Count the number of times that the LIKE operator gets called.
- * This is used for testing only.
- */
-#ifdef SQL_TEST
-int sql_like_count = 0;
-#endif
-
 /**
  * Implementation of the like() SQL function. This function
  * implements the built-in LIKE operator. The first argument to
@@ -828,9 +820,6 @@ likeFunc(sql_context *context, int argc, sql_value **argv)
 
 	if (sql_value_type(argv[0]) == SQL_BLOB
 	    || sql_value_type(argv[1]) == SQL_BLOB) {
-#ifdef SQL_TEST
-		sql_like_count++;
-#endif
 		sql_result_int(context, 0);
 		return;
 	}
@@ -874,9 +863,6 @@ likeFunc(sql_context *context, int argc, sql_value **argv)
 	}
 	if (!zA || !zB)
 		return;
-#ifdef SQL_TEST
-	sql_like_count++;
-#endif
 	int res;
 	res = sql_utf8_pattern_compare(zB, zA, zB_end, zA_end,
 				       is_like_ci, escape);
-- 
2.15.1

  parent reply	other threads:[~2019-03-09 17:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-09 16:59 [tarantool-patches] [PATCH 0/3] Make LIKE accept only arguments of type TEXT Nikita Pettik
2019-03-09 17:00 ` [tarantool-patches] [PATCH 1/3] sql: remove SQL_LIKE_DOESNT_MATCH_BLOBS Nikita Pettik
2019-03-11  8:07   ` [tarantool-patches] " Konstantin Osipov
2019-03-11 12:12     ` n.pettik
2019-03-09 17:00 ` Nikita Pettik [this message]
2019-03-09 17:00 ` [tarantool-patches] [PATCH 3/3] sql: make LIKE accept only TEXT arguments Nikita Pettik
2019-03-15 14:41 ` [tarantool-patches] Re: [PATCH 0/3] Make LIKE accept only arguments of type TEXT Vladislav Shpilevoy
2019-03-15 14:49 ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a2f4ed039f49b78290a75393e86836fb5f6c0bb8.1552149462.git.korablev@tarantool.org \
    --to=korablev@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [tarantool-patches] [PATCH 2/3] sql: remove sql_like_count global counter' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox