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 1AD9D6EC5F; Thu, 15 Apr 2021 03:17:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1AD9D6EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618445865; bh=8bxZ7LjfxV0lPIA5XL3KHvvB9QJFky0Pc05MpVuJQok=; 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=Cn4DPs2+VhN18ETcPxL9MWZpRWqb06ASQO5z6FBe3Wt99HXBEPY45jqzCLEFdxYiv Qo8PtBvS/ZvbLsLP0KSRhfvxnLmOa/nj7tAfoMmA/Y9lMLhtziz08sOVC6idZyp9Ra 3pmG9huldLJSVGlMZYUE2IMzQxaYwSkQj4ED5fx0= Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [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 57C6C6EC5F for ; Thu, 15 Apr 2021 03:17:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 57C6C6EC5F Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1lWphW-0000PA-IW; Thu, 15 Apr 2021 03:17:42 +0300 To: Mergen Imeev Cc: tarantool-patches@dev.tarantool.org References: <3bba79b9-7bd4-541d-7287-f8e844e8c6c5@tarantool.org> <20210414010015.GA145710@tarantool.org> Message-ID: <29e44fdf-521e-9df9-e7df-605ca25478a6@tarantool.org> Date: Thu, 15 Apr 2021 02:17:41 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: <20210414010015.GA145710@tarantool.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E748094FADAEB10E66ADA4C48BE3C291E66DA182A05F53808504016C0C8E3E461C1C1B405E83F19CA58FBBB3C6CA6C2C893522532CF2591DA8181 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7D9C4478D0B876341EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063725FA9CD6081C82518638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2AFC255AD41E52C8D17B1E2DE93B7424D262F3407DF4BB9EED2E47CDBA5A96583C09775C1D3CA48CF7EF884183F8E4D67117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE709B92020B71E24959FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735C6C49853BF2B2AEEC4224003CC83647689D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C978312CF9A646B50A5AE0778C2F04FB368B36 X-C1DE0DAB: 0D63561A33F958A53143BA4920D4F94BC20FD7F9F85FBC2AAC97A9E7DC918631D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3483E1FCD56FEA62E66352B8A2F31721037AD1F1DE9FF6EB7766F3AE89D01448DF09DFF436F66A8C3C1D7E09C32AA3244CAFF40D8992639D5819AFD70F08A35805E646F07CC2D4F3D8729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojrcJA+pXcDumEQroEI45FIA== X-Mailru-Sender: 689FA8AB762F73936BC43F508A06382256EB93BAB676DE6FA6C4EE79BD9069273841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v5 47/52] sql: introduce mem_get_double() 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/vdbe.c b/src/box/sql/vdbe.c > index f7b6df0d9..1deb8e507 100644 > --- a/src/box/sql/vdbe.c > +++ b/src/box/sql/vdbe.c > @@ -2791,7 +2789,7 @@ case OP_SeekGT: { /* jump, in3 */ > * (x > 4.9) -> (x >= 5) > * (x <= 4.9) -> (x < 5) > */ > - if (pIn3->u.r<(double)iKey) { > + if (mem_get_double_unsafe(pIn3) < (double)iKey) { Why did you change this and below? There was a check above that pIn3 is double. So you can access u.r safely. > assert(OP_SeekGE==(OP_SeekGT-1)); > assert(OP_SeekLT==(OP_SeekLE-1)); > assert((OP_SeekLE & 0x0001)==(OP_SeekGT & 0x0001)); > @@ -2801,7 +2799,7 @@ case OP_SeekGT: { /* jump, in3 */ > /* If the approximation iKey is smaller than the actual real search > * term, substitute <= for < and > for >=. > */ > - else if (pIn3->u.r>(double)iKey) { > + else if (mem_get_double_unsafe(pIn3) > (double)iKey) { > assert(OP_SeekLE==(OP_SeekLT+1)); > assert(OP_SeekGT==(OP_SeekGE+1)); > assert((OP_SeekLT & 0x0001)==(OP_SeekGE & 0x0001));