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 00EAB6ECE3; Tue, 2 Nov 2021 14:42:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 00EAB6ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1635853333; bh=J2eDrh9grxlZlJyUfQexFjj+Wk6X8xDJUGmvbCiDN8s=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=fWxzkdbmbAESNiQQ/QIiKbmxObiF9AEwxMPs5+lnNMZwq6qBBSyZBmF+6WY+m6GXg dXBLywX13Buk4ip2ee4PO30WUjcgvc4exrihMI/1mGF8VzQTUikfpYlzHFlcZyWWML bRbPZdB8A9WXbbsrdJQVrjcIIi34N/iKuhXIQedI= 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 439B06ECE3 for ; Tue, 2 Nov 2021 14:42:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 439B06ECE3 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mhsB8-0004ix-KV; Tue, 02 Nov 2021 14:42:10 +0300 Date: Tue, 2 Nov 2021 14:42:09 +0300 To: Vladislav Shpilevoy , tarantool-patches@dev.tarantool.org Message-ID: <20211102114209.GC104458@tarantool.org> References: <0c9dfd1b90d72b6756c4a1312ed4c085e9255e47.1633713432.git.imeevma@gmail.com> <77fcefe4-cde9-ed81-4764-c539fe51ea23@tarantool.org> <20211025084047.GJ36295@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20211025084047.GJ36295@tarantool.org> X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD98893113B6235BE9154FDE3298F0A37FC272DDC0DDA52D3DE182A05F5380850406F8A48DBE6EA00A722C606D16DF93D746BA072F1A48BABB556CFA309B2C9E70E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7B264C8851FD8E810EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375D8840FA58F505298638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D873070D47A52C01144FC6CDFF5074356B117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5916E12B5893BB8EAC75B323A10864511A2BF153FEF1B1791D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA752DA3D96DA0CEF5C48E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34CC972AA0E2E780C4830523E70F95089C06B2E53AE5ADEBDE0659F120B5DFFC4F7B3CDD057959E4FC1D7E09C32AA3244CCD410A64C9DE7233E79796EA0ABC8A63F2F5F14F68F1805B729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyQYxHpRvLO6kIbeOn1Jbsw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D7D5DAD043DD926F729C7723F074C8A9B83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [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: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thank you for the review! I fixed the type of the argument passed to the U8_NEXT macro. Diff below. On Mon, Oct 25, 2021 at 11:40:47AM +0300, Mergen Imeev via Tarantool-patches wrote: Diff: diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 7e53cc1ce..69d4e7347 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -1049,7 +1049,7 @@ func_unicode(struct sql_context *ctx, int argc, struct Mem *argv) return mem_set_uint(ctx->pOut, 0); int pos = 0; UChar32 c; - U8_NEXT(arg->z, pos, arg->n, c); + U8_NEXT((uint8_t *)arg->z, pos, arg->n, c); (void)pos; mem_set_uint(ctx->pOut, (uint64_t)c); }