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 18C936EC55; Thu, 15 Jul 2021 09:58:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 18C936EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626332312; bh=bPJNLlsTyLkoOPNrcMqmHRJBUXUYzz/izpnjvADvJTQ=; 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=MbHOC8yutQwSZYv/WtUwbWA5VzEjyaqtEz2rY5vLrSTj2tbOxnW7gywA2FHfVLsep kcrCvyJC3OUMQYJAL4Xnvuqzvxt90I0ekYlh4b2g0ckPae1SyrMVYh/5Rvni50hteT cu6X7g2dmcQyO2ylnGpMOHfrDFQSZH81hBsr/jAQ= 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 663536EC55 for ; Thu, 15 Jul 2021 09:58:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 663536EC55 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1m3vKI-00044T-JB; Thu, 15 Jul 2021 09:58:30 +0300 To: Vladislav Shpilevoy 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> <979cbfcf-896d-6d8e-fca4-0777cbd16378@tarantool.org> Message-ID: <77745cdc-7f2f-99f2-740b-2e6f916ac76d@tarantool.org> Date: Thu, 15 Jul 2021 09:58:30 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <979cbfcf-896d-6d8e-fca4-0777cbd16378@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD941C43E597735A9C3FDAB68B812060C779F2375474EF21E8A182A05F53808504017DCC19100A967C76615F20722C5D0998A47B0A18D518FA90D600B91EC3BCFF0 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F65C230EDDCD559EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063757004B04402545C58638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D853EBD8376DDA61C6DC020D2EF52FDAAC117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAE9A1BBD95851C5BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735201E561CDFBCA1751FCB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A54E4F3DBA20D544C8CF99AC0E476CE04143A725CF3383FBDAD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7501A9DF589746230F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D346B222596F62B8FA9BAE8074F3F4E5E913A93A8CB385591500525370F679C2F5ADC7DE574A9D32C0B1D7E09C32AA3244C5C4DF117B7779A557C25B9333E8AE2AA795D98D676DD64D0729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojSyb42jm8PHJNgOSxsrd4BA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D100722650EB9D5202C27CA4B61D7038883D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B 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: Mergen Imeev via Tarantool-patches Reply-To: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thank you for the review! My answer below. On 15.07.2021 00:53, Vladislav Shpilevoy wrote: > 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? There I changed returned value instead of operation. > >> @@ -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`? Although it is true that I have not changed '!=' to '==', now in case '!=' the function returns rc, and in the case of '==' it returns -rc. Previously it was -rc for '!=' and rc for '=='. Is there any other reason to change '!=' to '=='?