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 36B2F6EC55; Sun, 11 Jul 2021 18:05:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 36B2F6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626015941; bh=Yi7KhhikTSr7p5wiy272f6HaCWN1QBThaPTeQabrFVo=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ssv/bhr2C8rPQkVtPkY2WP+2ZQNk7locQ95koKGS65enOQmbvDvZ7ItcryZ4GeT/2 iIW41XQDJeLbwqvkxkXX8mi5Cgq7WQ9WeEyRrQafqX3vzzE3eHHhHDtiUDKC8dZwk3 CvfvXML6whPW++7wX0MjPKBUwUPE1gmJz9kCD4Ww= 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 6A9C46EC55 for ; Sun, 11 Jul 2021 18:05:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6A9C46EC55 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1m2b1X-0005oK-KU; Sun, 11 Jul 2021 18:05:40 +0300 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <28d370911c40124da91441be2f25cad49e4973b4.1625926838.git.imeevma@gmail.com> Message-ID: <20c6c37d-6364-8fdb-0aa5-c7c82407b143@tarantool.org> Date: Sun, 11 Jul 2021 17:05:38 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <28d370911c40124da91441be2f25cad49e4973b4.1625926838.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FBE6FDDB4BD448567E7B50CED82977CC0D182A05F5380850409370CD3671799FA71664A0DF914E5838C63F1CF9C2CE21F356684E0CF964053C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A3DED2DACB82E709C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE7387B291F9AC4D188EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F2E714A5B3E2283CA164E00B4FD400BF47CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F924B32C592EA89F389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8989FD0BDF65E50FBF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B2303E78B907142AC75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A599473D6C498A50631A0B4B203EC3AA1295638107D5DA56BDD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA753753CEE10E4ED4A7410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349320586B19AD2C726B104B6765A62BE58B62B6893544851603AB5A4FF69134DB6D900B5EA560689C1D7E09C32AA3244C19B93EDF9CC87691F381D448374B2691408A6A02710B7304729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj/3sbGI30XhdzVZJBa0ca5g== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D878D6F78AAABC934BEC96DCF6F4269BF3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 4/4] sql: introduce mem_cmp_msgpack() 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for the patch! See 4 comments below. On 10.07.2021 16:33, Mergen Imeev via Tarantool-patches wrote: > This patch introduces the mem_cmp_scalar() function that compares MEM 1. scalar -> msgpack. > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 576596c9f..471b69a18 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -2073,35 +2073,72 @@ mem_cmp_scalar(const struct Mem *a, const struct Mem *b, int *result, <...> > - > -/* > - * The input pBlob is guaranteed to be a Blob that is not marked > - * with MEM_Zero. Return true if it could be a zero-blob. > - */ > -static int > -isAllZero(const char *z, int n) > +int > +mem_cmp_msgpack(const struct Mem *a, const char *b, int *result, > + const struct coll *coll) 2. Maybe better make the function return 'b' after decoding via making it an out parameter. So as the caller could save mp_next() call. > { > - int i; > - for (i = 0; i < n; i++) { > - if (z[i]) > - return 0; > + struct Mem mem; > + switch (mp_typeof(*b)) { > + case MP_NIL: > + mem.type = MEM_TYPE_NULL; > + break; > + case MP_BOOL: > + mem.type = MEM_TYPE_BOOL; > + mem.u.b = mp_decode_bool(&b); > + break; > + case MP_UINT: > + mem.type = MEM_TYPE_UINT; > + mem.u.u = mp_decode_uint(&b); > + break; > + case MP_INT: > + mem.type = MEM_TYPE_INT; > + mem.u.i = mp_decode_int(&b); > + break; > + case MP_FLOAT: > + mem.type = MEM_TYPE_DOUBLE; > + mem.u.r = mp_decode_float(&b); > + break; > + case MP_DOUBLE: > + mem.type = MEM_TYPE_DOUBLE; > + mem.u.r = mp_decode_double(&b); > + break; > + case MP_STR: > + mem.type = MEM_TYPE_STR; > + mem.n = mp_decode_strl(&b); > + mem.z = (char *)b; > + mem.flags = MEM_Ephem; > + break; > + case MP_BIN: > + mem.type = MEM_TYPE_BIN; > + mem.n = mp_decode_binl(&b); > + mem.z = (char *)b; 3. Shouldn't this also have MEM_Ephem? > + break; > + case MP_ARRAY: > + case MP_MAP: > + *result = -1; > + return 0; > + case MP_EXT: { > + int8_t type; > + const char *buf = b; > + uint32_t len = mp_decode_extl(&b, &type); > + if (type == MP_UUID) { > + assert(len == UUID_LEN); > + mem.type = MEM_TYPE_UUID; > + b = buf; 4. You can decode &buf below without changing b. > + if (mp_decode_uuid(&b, &mem.u.uuid) == NULL) > + return -1; > + break; > + } > + b += len; > + mem.type = MEM_TYPE_BIN; > + mem.z = (char *)buf; > + mem.n = b - buf; > + break; > } > - return 1; > + default: > + unreachable(); > + } > + return mem_cmp_scalar(a, &mem, result, coll); > }