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 883A670CAD; Fri, 8 Oct 2021 20:32:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 883A670CAD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633714334; bh=P+xxl8ceMrYjWxuxwSQ+N8rdriOBQCirl9T409DMzYs=; 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=gjyYxmcqoRXlDFi2BncAko3fmw3KuCd8Fi2Rad1wAkhzAIwkWikjxMSTjvpfrE4OB 3459jLKLgZ2098axpoZrzKiSo+JFPDGb/a56YAlBjB0hgvGjB9mVO2uAlHwaBV4Q1E OnnJ1xEVZozxyRr5elWV05YBArD7dxqKWyU17OIM= 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 0D35B6EC55 for ; Fri, 8 Oct 2021 20:31:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0D35B6EC55 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mYtiZ-00080F-DE; Fri, 08 Oct 2021 20:31:35 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 8 Oct 2021 20:31:35 +0300 Message-Id: <7a6d7ca687a6e4d06b087af5f2e442042b38cf7b.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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9A6D4E3B1981C4C7DD6313C0D12430C2EBE99D9AA6174C4CF182A05F5380850409FB93BB32149E97BB6579D07F49B67A32220869EDE969B7FF1D43ACB2D187C4D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73B44982FA5E78411EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063769AE3176B9E099158638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8B161A39D4D6FE68808ABAE6C25F71104117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8B8C7ADC89C2F0B2A5A471835C12D1D977C4224003CC8364762BB6847A3DEAEFB0F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7CD1D040B6C1ECEA3F43847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C650BD2383FF25EF55E591EF87D8781A9DAE180FE0139636C9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3453741B480A6503C3AED99AAC4B4C960BF2EE217F7B690F15440E1FAFB1FC3CA4555BC1EA61B6AB721D7E09C32AA3244C6CC07D8FC3C904A316DA262654F835EAF522A1CF68F4BE05729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMZ06aokA6bpKeqimzn/4yA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D96D04F63846D3E7A3AC3DAB14494DC5783D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 01/21] sql: refactor CHAR() 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 | 85 ++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index a3c7d8d20..dd5e7d785 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -738,6 +738,45 @@ func_substr_characters(struct sql_context *ctx, int argc, struct Mem *argv) ctx->is_aborted = true; } +/** Implementation of the CHAR() function. */ +static void +func_char(struct sql_context *ctx, int argc, struct Mem *argv) +{ + if (argc == 0) + return mem_set_str_static(ctx->pOut, "", 0); + char *str = sqlDbMallocRawNN(sql_get(), argc * 4); + if (str == NULL) { + ctx->is_aborted = true; + return; + } + uint8_t *ptr = (uint8_t *)str; + for (int i = 0; i < argc; ++i) { + uint32_t c; + if (mem_is_null(&argv[i])) + c = 0; + else if (!mem_is_uint(&argv[i]) || argv[i].u.u > 0x10ffff) + c = 0xfffd; + else + c = argv[i].u.u; + if (c < 0x80) { + *ptr++ = c & 0xFF; + } else if (c < 0x0800) { + *ptr++ = 0xC0 + ((c >> 6) & 0x1F); + *ptr++ = 0x80 + (c & 0x3F); + } else if (c < 0x10000) { + *ptr++ = 0xE0 + ((c >> 12) & 0x0F); + *ptr++ = 0x80 + ((c >> 6) & 0x3F); + *ptr++ = 0x80 + (c & 0x3F); + } else { + *ptr++ = 0xF0 + ((c >> 18) & 0x07); + *ptr++ = 0x80 + ((c >> 12) & 0x3F); + *ptr++ = 0x80 + ((c >> 6) & 0x3F); + *ptr++ = 0x80 + (c & 0x3F); + } + } + mem_set_str_allocated(ctx->pOut, str, (char *)ptr - str); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1469,50 +1508,6 @@ unicodeFunc(struct sql_context *context, int argc, struct Mem *argv) sql_result_uint(context, sqlUtf8Read(&z)); } -/* - * The char() function takes zero or more arguments, each of which is - * an integer. It constructs a string where each character of the string - * is the unicode character for the corresponding integer argument. - */ -static void -charFunc(struct sql_context *context, int argc, struct Mem *argv) -{ - unsigned char *z, *zOut; - int i; - zOut = z = sql_malloc64(argc * 4 + 1); - if (z == NULL) { - context->is_aborted = true; - return; - } - for (i = 0; i < argc; i++) { - uint64_t x; - unsigned c; - if (sql_value_type(&argv[i]) == MP_INT) - x = 0xfffd; - else - x = mem_get_uint_unsafe(&argv[i]); - if (x > 0x10ffff) - x = 0xfffd; - c = (unsigned)(x & 0x1fffff); - if (c < 0x00080) { - *zOut++ = (u8) (c & 0xFF); - } else if (c < 0x00800) { - *zOut++ = 0xC0 + (u8) ((c >> 6) & 0x1F); - *zOut++ = 0x80 + (u8) (c & 0x3F); - } else if (c < 0x10000) { - *zOut++ = 0xE0 + (u8) ((c >> 12) & 0x0F); - *zOut++ = 0x80 + (u8) ((c >> 6) & 0x3F); - *zOut++ = 0x80 + (u8) (c & 0x3F); - } else { - *zOut++ = 0xF0 + (u8) ((c >> 18) & 0x07); - *zOut++ = 0x80 + (u8) ((c >> 12) & 0x3F); - *zOut++ = 0x80 + (u8) ((c >> 6) & 0x3F); - *zOut++ = 0x80 + (u8) (c & 0x3F); - } - } - sql_result_text64(context, (char *)z, zOut - z, sql_free); -} - /* * The hex() function. Interpret the argument as a blob. Return * a hexadecimal rendering as text. @@ -1865,7 +1860,7 @@ static struct sql_func_definition definitions[] = { NULL}, {"AVG", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, step_avg, fin_avg}, {"AVG", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_avg, fin_avg}, - {"CHAR", -1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_STRING, charFunc, NULL}, + {"CHAR", -1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_STRING, func_char, NULL}, {"CHAR_LENGTH", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_INTEGER, func_char_length, NULL}, {"COALESCE", -1, {FIELD_TYPE_ANY}, FIELD_TYPE_SCALAR, sql_builtin_stub, -- 2.25.1