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 C9CD66BD0D; Sun, 11 Apr 2021 21:13:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C9CD66BD0D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618164809; bh=193vSAEencGeIqlhW4LcRz+gzz/SeaVzBkl1S8AsHHE=; 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=SYUZ5LrGhPiAJB5o0bKbDi+b3zuL/11UgKmG3zdOr3kuvaesdUN5OVNPx3enBrUNb nr9WMlT/HV4b7BqG1ap0LczcbaNR+bxlSyErxwekzFfHefEnvPYMzb0kjQMyB0UuA6 yl12Ovpzx5KbMPr4rCRUhtd42LXgj2CLfOmU3k6A= 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 28D736BD0C for ; Sun, 11 Apr 2021 21:13:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 28D736BD0C Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1lVeaO-0004Ma-Er; Sun, 11 Apr 2021 21:13:28 +0300 To: imeevma@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <25bd849d8ebd45d3865770f1c4c6fc0c02d53d6a.1617984948.git.imeevma@gmail.com> Message-ID: <58d97dd1-7090-3c2b-10c6-cdf6f5699bbc@tarantool.org> Date: Sun, 11 Apr 2021 20:13:27 +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: <25bd849d8ebd45d3865770f1c4c6fc0c02d53d6a.1617984948.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480EBD5CA77A668ECB87DA2124B0A8E6609182A05F53808504060DAC7299806EAE8B64DF6CDD3A7D5CBBDEFCB19603236BF3372D2AB08F15A02 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C27E92EFAD44F80DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063752AC809489EC5B9C8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B28A20AC6EEFE0E9109ED95B31C5A00D158E320D419CB56618D2E47CDBA5A96583C09775C1D3CA48CFE478A468B35FE767117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE767883B903EA3BAEA9FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E73542F54486E6D6388DC4224003CC83647689D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831784E5643C012509405D977CDE1DB6210 X-C1DE0DAB: 0D63561A33F958A59C272F90A9514692FC7EA7942F5CC5D5DC5885AC4765E8ABD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C264B329661203DA75EA761439B0EAFE9312BF50C5C04C5008788102CA731D7B0C7685B8C501697A1D7E09C32AA3244C95475DC4632BAD6EBF00E91E9FF5525E3A76366E8A9DE7CAFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyKKJYJ15DtKA1So0h5/Qfg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822FAE10B68E7013171D087F48CF4BCAABD3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v5 19/52] sql: introduce arithmetic operations for MEM 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" Good job on the fixes! >> The names could be mem_arith_plus(), mem_arith_mul(), mem_arith_minus(), >> etc. > Fixed. I named new functions mem_add(), mem_sub(), mem_mul(), mem_div() and > mem_rem(). Each of them simpler than this function. The last operation is called modulo. Usually shortened to mod. But I see we already use 'rem' in some other place, and in the token name. Up to you. See 1 comment below. > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 2d76ef88d..859e337aa 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -390,6 +390,240 @@ mem_concat(struct Mem *a, struct Mem *b, struct Mem *result) > + > +static int > +get_number(const struct Mem *mem, struct sql_num *number) > +{ > + if ((mem->flags & MEM_Real) != 0) { > + number->d = mem->u.r; > + number->type = MEM_Real; > + return 0; > + } > + if ((mem->flags & MEM_Int) != 0) { > + number->i = mem->u.i; > + number->type = MEM_Int; > + number->is_neg = true; > + return 0; > + } > + if ((mem->flags & MEM_UInt) != 0) { > + number->u = mem->u.u; > + number->type = MEM_UInt; > + number->is_neg = false; > + return 0; > + } > + if ((mem->flags & (MEM_Str | MEM_Blob)) == 0) > + return -1; > + if ((mem->flags & MEM_Subtype) != 0) > + return -1; > + if (sql_atoi64(mem->z, &number->i, &number->is_neg, mem->n) == 0) { > + number->type = number->is_neg ? MEM_Int : MEM_UInt; > + /* > + * The next line should be removed along with the is_neg field > + * of struct sql_num. The integer type tells us about the sign. > + * However, if it is removed, the behavior of arithmetic > + * operations will change. > + */ > + number->is_neg = (mem->flags & MEM_Int) != 0; I don't understand that. How is it possible it mismatches the value returned from sql_atoi64()? And why isn't it just 'false' then? Because a few lines above you already checked (mem->flags & MEM_Int) != 0 and it was false. > + return 0; > + } > + if (sqlAtoF(mem->z, &number->d, mem->n) != 0) { > + number->type = MEM_Real; > + return 0; > + } > + return -1; > +}