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 B484E6CE3F; Thu, 11 Nov 2021 13:57:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B484E6CE3F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1636628226; bh=Zci7dyums1bNtcUT6nq2JPldjCY/D6ettogD5Zf8NQI=; 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=aa6ZTIB0C/a1xJTG26pWaKqtLrfmHKUHvrynXu2KLhbQMGPvB9b5MA93PS+Cjf2MT UBL0in53G3seyNz6/M4C8J35nIUEkZeS+7fJRYwNep4sNrSKkxpAc5CXOJNN0/SaFV yGJOB+U6CuTkEUS2bv695Olz1JQRXKIIPlpIx4+o= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 D2C287106C for ; Thu, 11 Nov 2021 13:49:15 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D2C287106C Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1ml7dq-00056P-VG; Thu, 11 Nov 2021 13:49:15 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Thu, 11 Nov 2021 13:49:14 +0300 Message-Id: <35be4ae88f66961d77314fdecd8c7f00746056a6.1636627580.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: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD9731B3922EC0639796C498EBF619285F2FA7E0E589BD7410700894C459B0CD1B94C82E22CBFC630F4606276A95002484DBD7B9CED87D2556797FFBCB1194FBF86 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73B44982FA5E78411EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E149C29A36E092738638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D82B909B03A8E07D66CA75363F10E6D59D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18618001F51B5FD3F9D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C7E9FEBB9C11794A13C7E5F6ED542A30FB04A3CDA399082429C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFCDE59DDCCE53AF2B699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D95739AEDB3821B4734B107328570167CE2B4B8BB005D6DC479FD541EFBC8776A63F69370B891BA11D7E09C32AA3244C2442BBE5867F9916F71E67CF6BBC4DBF30363D8B7DA7DD44729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj4t8MBgWr8bKVkYCYRn95CQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D758BD17FC1A7AB62A123991EFB48F27883D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 14/21] sql: refactor UNICODE() 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" Part of #4145 --- src/box/sql/func.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 59447df56..69d4e7347 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -1030,6 +1030,30 @@ func_version(struct sql_context *ctx, int argc, struct Mem *argv) return mem_set_str0_static(ctx->pOut, (char *)tarantool_version()); } +/** + * Implementation of the UNICODE() function. + * + * Return the Unicode code point value for the first character of the input + * string. + */ +static void +func_unicode(struct sql_context *ctx, int argc, struct Mem *argv) +{ + assert(argc == 1); + (void)argc; + struct Mem *arg = &argv[0]; + if (mem_is_null(arg)) + return; + assert(mem_is_str(arg)); + if (arg->n == 0) + return mem_set_uint(ctx->pOut, 0); + int pos = 0; + UChar32 c; + U8_NEXT((uint8_t *)arg->z, pos, arg->n, c); + (void)pos; + mem_set_uint(ctx->pOut, (uint64_t)c); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1451,19 +1475,6 @@ quoteFunc(struct sql_context *context, int argc, struct Mem *argv) } } -/* - * The unicode() function. Return the integer unicode code-point value - * for the first character of the input string. - */ -static void -unicodeFunc(struct sql_context *context, int argc, struct Mem *argv) -{ - const unsigned char *z = mem_as_ustr(&argv[0]); - (void)argc; - if (z && z[0]) - sql_result_uint(context, sqlUtf8Read(&z)); -} - /* * The replace() function. Three arguments are all strings: call * them A, B, and C. The result is also a string which is derived @@ -1897,7 +1908,7 @@ static struct sql_func_definition definitions[] = { FIELD_TYPE_VARBINARY, func_trim_bin, NULL}, {"TYPEOF", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, func_typeof, NULL}, - {"UNICODE", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_INTEGER, unicodeFunc, + {"UNICODE", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_INTEGER, func_unicode, NULL}, {"UNLIKELY", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_BOOLEAN, sql_builtin_stub, NULL}, -- 2.25.1