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 0E8B76F3F2; Fri, 8 Oct 2021 20:38:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0E8B76F3F2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633714727; bh=ClRW9kIlE+d4OYJF7pHNzY/Wof72duKGO2JyBYiqekk=; 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=ZoFe/7Lyee2Gc3VJJgDf3N67tfAUu7lxcxFWsaIxRhEahLGvFlOLJhpDwRuBqxyH5 PwDNMb3natKhDpRDaPFGoyrNMkvJlOPMtd3JJQCJU874wsD0toh0xwByW0kysmp+PK nRdIIOt3Zx2Nb4c/zTjJOlj3MS2rgMDfqHDcBxd4= 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 90F156E46C for ; Fri, 8 Oct 2021 20:31:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 90F156E46C Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mYtix-00086K-23; Fri, 08 Oct 2021 20:31:59 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 8 Oct 2021 20:31:58 +0300 Message-Id: <0c9dfd1b90d72b6756c4a1312ed4c085e9255e47.1633713432.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: 4F1203BC0FB41BD9A6D4E3B1981C4C7D860EA8B700EC2F3556310D6870B6F840182A05F53808504004536C9532D6BF0596C72B3582FCCDB86546A74D59B519AC2EA9E02725889D93 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BC08626EA5717D14EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375E280A1EC162AD7D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F2CED17CA4096FE0CA0011CFC83C9410117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD182CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C650BD2383FF25EF512F9966A1FB66EB8AD7E346479B58D429C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D343C45ADCD169245FA7A2CBE6D9FA5664222763FCC6CBDB5CE8AEC695AF67836464FE9D85EFFA752211D7E09C32AA3244CB8D8DAC559E586500BA80E14D02D01FC6C24832127668422729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMZ06aokA6bqxJ9xWImHlAQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DF7101AAC7CF17CAA3F56D5DB4FFEB39E83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B 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 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index fb7fd772e..5e12ef729 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -1007,6 +1007,19 @@ 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. */ +static void +func_unicode(struct sql_context *ctx, int argc, struct Mem *argv) +{ + assert(argc == 1); + (void)argc; + if (mem_is_null(&argv[0])) + return; + assert(mem_is_str(&argv[0])); + const char *str = tt_cstr(argv[0].z, argv[0].n); + mem_set_uint(ctx->pOut, sqlUtf8Read((const unsigned char **)&str)); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1426,19 +1439,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 @@ -1874,7 +1874,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