From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v2 4/4] sql: introduce mem_cmp_msgpack() Date: Thu, 15 Jul 2021 09:58:30 +0300 [thread overview] Message-ID: <77745cdc-7f2f-99f2-740b-2e6f916ac76d@tarantool.org> (raw) In-Reply-To: <979cbfcf-896d-6d8e-fca4-0777cbd16378@tarantool.org> 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 '=='?
next prev parent reply other threads:[~2021-07-15 6:58 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-10 14:33 [Tarantool-patches] [PATCH v2 0/4] Follow ups for uuid introduction Mergen Imeev via Tarantool-patches 2021-07-10 14:33 ` [Tarantool-patches] [PATCH v2 1/4] sql: introduce uuid to quote() Mergen Imeev via Tarantool-patches 2021-07-10 14:33 ` [Tarantool-patches] [PATCH v2 2/4] sql: allow to bind uuid values Mergen Imeev via Tarantool-patches 2021-07-10 14:33 ` [Tarantool-patches] [PATCH v2 3/4] sql: introduce mem_cmp_scalar() Mergen Imeev via Tarantool-patches 2021-07-11 15:03 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-11 17:51 ` Mergen Imeev via Tarantool-patches 2021-07-12 21:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-13 8:04 ` Mergen Imeev via Tarantool-patches 2021-07-10 14:33 ` [Tarantool-patches] [PATCH v2 4/4] sql: introduce mem_cmp_msgpack() Mergen Imeev via Tarantool-patches 2021-07-11 15:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-11 17:59 ` Mergen Imeev via Tarantool-patches 2021-07-12 21:09 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-13 8:10 ` Mergen Imeev via Tarantool-patches 2021-07-13 20:39 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-14 6:51 ` Mergen Imeev via Tarantool-patches 2021-07-14 21:53 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-15 6:58 ` Mergen Imeev via Tarantool-patches [this message] 2021-07-15 20:44 ` [Tarantool-patches] [PATCH v2 0/4] Follow ups for uuid introduction Vladislav Shpilevoy via Tarantool-patches 2021-07-16 8:57 Mergen Imeev via Tarantool-patches 2021-07-16 8:57 ` [Tarantool-patches] [PATCH v2 4/4] sql: introduce mem_cmp_msgpack() Mergen Imeev via Tarantool-patches 2021-07-19 9:16 ` Timur Safin via Tarantool-patches 2021-07-19 10:07 ` Mergen Imeev via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=77745cdc-7f2f-99f2-740b-2e6f916ac76d@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 4/4] sql: introduce mem_cmp_msgpack()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox