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 D937B6EC55; Thu, 15 Jul 2021 00:53:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D937B6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626299628; bh=El1k9Ci8hSK81mlfdMlKhyk9zy8D2hYE2nKqyPAPwyw=; 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=ps20Jp7fg6w6pzfU7//FTXWnwPZtjKiCI2UOANPzmF9wLTTx5MELU/B1Soi+Bfv1m y/TG+UPmjnW7Mq5jkBv/gfQLfVzUJ0yRaldqhdsxeyUywujiKvK7F5X/su9Gsxg+Fn YnS1Y5w9R8qqbncGY8BMfZy3A6WNFtw5QENaObYQ= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [94.100.177.149]) (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 1D79A6EC55 for ; Thu, 15 Jul 2021 00:53:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1D79A6EC55 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1m3mp8-0001Kr-AZ; Thu, 15 Jul 2021 00:53:46 +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> <20210714065137.GA7470@tarantool.org> Message-ID: <979cbfcf-896d-6d8e-fca4-0777cbd16378@tarantool.org> Date: Wed, 14 Jul 2021 23:53:45 +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: <20210714065137.GA7470@tarantool.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD97BB0EF39AD2B33D598226807B8A1E9DC331E3F9997896515182A05F538085040DA67BB0317E9CBDA69FD7357379386819D2798C7B7261A402BC6E8ECC29D9A6E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F65C230EDDCD559EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378A9F193E39E334918638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D85683C2E99BA3A6ED3490450CB5EF32ED117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735201E561CDFBCA1751FF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8BB07C9E286C61B7F975ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A58686DC3AEA5779076DD74285730CDC4AD2FB0D82B14078BAD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7501A9DF589746230F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3474B2583E5131598451DEF92204EC5702A9274CF38AC7A9D9BF5D53BC09143BF4E1FD6FF6A30480A91D7E09C32AA3244C9E3842293B0A930927F8B9A6451FBC9563871F383B54D9B3729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojDdSFIg49M1TfIr513PZbdg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D167A74CAFDF286F5E2EA1C19F5CF32CB3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B 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" Hi! Thanks for the fixes! >>> + 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 ==? >> > I did this because function sqlVdbeCompareMsgpack() compared packed value as > left operand and MEM as right operand. In mem_cmp_msgpack() order was reversed, > now MEM is left operand and packed value is right operand. Shouldn't you then change the other place too? > @@ -2721,13 +2586,15 @@ 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; > + if (mem_cmp_msgpack(mem, (const char **)&key1, &rc, coll) != 0) > + rc = 0; > if (rc != 0) { > - if (key2->key_def->parts[i].sort_order != > - SORT_ORDER_ASC) { > - rc = -rc; > - } > - return rc; > + if (part->sort_order != SORT_ORDER_ASC) > + return rc; > + return -rc; > } Here it was cmp(key1, key), now it is cmp(key2, key1). Shouldn't then the sort_order check become `== SORT_ORDER_ASC`?