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 BA5AC6EC55; Sun, 11 Jul 2021 18:03:37 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BA5AC6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626015817; bh=vNMGgfOkPOmKAc0TEAkYI5m+Y+AHDuPdxvJI5U4zVFA=; 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=sNopRYntQwRapKTtkhr+d3L/8zGdnYeeF14ocQO7vPotHVlfTkq9PCD7XuqMoXW55 03bqefVPp1OJzEW5Ciqezcki2jvSMKLMaFe4Jyi4f1pmLRARHOn2imLpotGN3cF+Hq GT43pOOSyasTsrZC8RfLNUzLpJgx8tjNHuGsYQHY= 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 5E0A66EC55 for ; Sun, 11 Jul 2021 18:03:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5E0A66EC55 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1m2azX-0007Fy-H0; Sun, 11 Jul 2021 18:03:35 +0300 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: Message-ID: Date: Sun, 11 Jul 2021 17:03:34 +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: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FB0C620705B15DE32D6B8174B3EFF2BD9A182A05F538085040185DCF6B6A6D7CA6A51F0C018A8D39B8C5B29A1618F2644F875FD9608BC5D4D3 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE712EB008F780777E9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D7F1BE85E7B0CA818638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8046EBA0E635BC1D04ED1304C88AF0D71117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18618001F51B5FD3F9D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6AC294AFEFA671E80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A563C935F59CA7E897917940B656AB24FDF2E598D87EA2AA0CD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA753753CEE10E4ED4A7410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3435BBF0AC4E3A921C99D780A133913A160625FC05AB5288890944B02E20AFCCB3F5F3E08AF18A307F1D7E09C32AA3244C48DE4F4D0550234D417DEFAA72D19119B038C9161EF167A1729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj/3sbGI30XhfbuZYDF38beg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D45B168F9C21DD937CFA16712523F79F23841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 3/4] sql: introduce mem_cmp_scalar() 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 patch! See 3 comments below. > diff --git a/src/box/sql/func.c b/src/box/sql/func.c > index aa565277c..dc99bd390 100644 > --- a/src/box/sql/func.c > +++ b/src/box/sql/func.c > @@ -144,11 +144,10 @@ minmaxFunc(sql_context * context, int argc, sql_value ** argv) > for (i = 1; i < argc; i++) { > if (mem_is_null(argv[i])) > return; > - if ((sqlMemCompare(argv[iBest], argv[i], pColl) ^ mask) >= > - 0) { > - testcase(mask == 0); > + int res; > + mem_cmp_scalar(argv[iBest], argv[i], &res, pColl); > + if ((res ^ mask) >= 0) 1. It seems that under certain conditions if cmp_scalar fails, res remains not initialized. Which can lead to behaviour changing from run to run. The same in the other places below. > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 2595e2fd4..576596c9f 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -59,6 +59,40 @@ enum { > BUF_SIZE = 32, > }; > > +enum mem_class { > + MEM_CLASS_NULL, > + MEM_CLASS_BOOL, > + MEM_CLASS_NUMBER, > + MEM_CLASS_STR, > + MEM_CLASS_BIN, > + MEM_CLASS_UUID, > + mem_class_max, > +}; 2. It might make sense to add a comment that these must be sorted exactly like enum mp_class. > + > +static inline enum mem_class > +mem_type_class(enum mem_type type) > +{ > + switch (type) { > + case MEM_TYPE_NULL: > + return MEM_CLASS_NULL; > + case MEM_TYPE_UINT: > + case MEM_TYPE_INT: > + case MEM_TYPE_DOUBLE: > + return MEM_CLASS_NUMBER; > + case MEM_TYPE_STR: > + return MEM_CLASS_STR; > + case MEM_TYPE_BIN: > + return MEM_CLASS_BIN; > + case MEM_TYPE_BOOL: > + return MEM_CLASS_BOOL; > + case MEM_TYPE_UUID: > + return MEM_CLASS_UUID; 3. It might work faster without branching if done like 'static enum mp_class mp_classes[]' - would allow to take the class for any type as simple as an array access operation.