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 07ED06EC55; Tue, 13 Jul 2021 23:39:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 07ED06EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626208748; bh=wJ9+QPJnPaJIfxS576G40jEkcpu1fp4nyJJGTU0kk1c=; 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=xuAXdk3icRN/nwNPDTuUNCW8gLigDO4Ash9amAKWkQdMrjMH3IM5PGzCR9DmhaXKp 2B6jwLrZmC0LIhSRarwgPwrSihUPzTGoSXWXCvn/B6uohxnIZ/p9dTamKubsqrjvks WsBG8ii+NvPT7jRTPmBfVQhjY/1xI+qkKAjeAkd4= 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 4AC056EC55 for ; Tue, 13 Jul 2021 23:39:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4AC056EC55 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1m3PBJ-0004Bp-GJ; Tue, 13 Jul 2021 23:39:05 +0300 To: Mergen Imeev Cc: tarantool-patches@dev.tarantool.org References: <28d370911c40124da91441be2f25cad49e4973b4.1625926838.git.imeevma@gmail.com> <20c6c37d-6364-8fdb-0aa5-c7c82407b143@tarantool.org> <20210711175916.GB99369@tarantool.org> <913595cc-0d71-1a69-7997-ca4a136f97a1@tarantool.org> <20210713081007.GB104775@tarantool.org> Message-ID: Date: Tue, 13 Jul 2021 22:39:04 +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: <20210713081007.GB104775@tarantool.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD97BB0EF39AD2B33D5391930EFB6A35F20EC172CEE85ECBD22182A05F538085040A96F185E64BA829DBC8A06BAE29DC478CC3481D8E1BBF32EA24D4F5CD4A8E14C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7FFA2A8BF6367A61CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378B49D47CE295E66E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8A0C46434B2D550E697086194E69C3ACB117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8B8C7ADC89C2F0B2A5A471835C12D1D977C4224003CC8364762BB6847A3DEAEFB0F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7CB24F08513AFFAC7943847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: 0D63561A33F958A580C0FAD5C6F4EB523A0686B58521DC2F6F17E5C4A3787D96D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA753753CEE10E4ED4A7410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D341E2D05735FCBECD1C5F22E95B7A9E1BB7875A2D371278DB9AA5D677AD7C276C5BCE8CB289B16F1F91D7E09C32AA3244C05D236B0B9800CDBD9AF064ED961F43CB4DF56057A86259F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojDdSFIg49M1Smneoj29/mYQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DF29EB92D63FF4D198F0F8A021C8F19233841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B 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 fixes! > diff --git a/src/box/sql.c b/src/box/sql.c > index 790ca7f70..c1271ee0a 100644 > --- a/src/box/sql.c > +++ b/src/box/sql.c > @@ -765,10 +765,14 @@ tarantoolsqlIdxKeyCompare(struct BtCursor *cursor, > } > } > next_fieldno = fieldno + 1; > - rc = sqlVdbeCompareMsgpack(&p, unpacked, i); > + struct key_part *part = &unpacked->key_def->parts[i]; > + struct Mem *mem = unpacked->aMem + i; > + struct coll *coll = part->coll; > + /* In case of fail make rc equal to 0. */ The comment isn't really necessary I would say. Does not help much. The same in the other place below. > + if (mem_cmp_msgpack(mem, &p, &rc, coll) != 0) > + rc = 0; > if (rc != 0) { > - if (unpacked->key_def->parts[i].sort_order != > - SORT_ORDER_ASC) > + if (part->sort_order == SORT_ORDER_ASC) Why did you change != to ==? > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index da27cd191..8e176e418 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -2721,13 +2586,16 @@ sqlVdbeRecordCompareMsgpack(const void *key1, > n = MIN(n, key2->nField); > > for (i = 0; i != n; i++) { > - rc = sqlVdbeCompareMsgpack((const char**)&key1, key2, i); > + struct key_part *part = &key2->key_def->parts[i]; > + struct Mem *mem = key2->aMem + i; > + struct coll *coll = part->coll; > + /* In case of fail make rc equal to 0. */ > + if (mem_cmp_msgpack(mem, (const char **)&key1, &rc, coll) != 0) > + rc = 0;