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 487FD6EC63; Fri, 9 Apr 2021 23:27:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 487FD6EC63 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618000044; bh=RfmbccNLJ0FDF6c2W7rZJ62KHJwt6Gez9rq/FpJG8uA=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=Sg/K26oPKXoyvtulqsw730CqEQxoFRvJ9iJtdkRxKTQI8Pc4lhRx83bANJA8QHPhM mp3dmflW3JKi2BvNH70VjhR3GC8NkmySp00azhZ20fHchk0sKn6zgaGsvJ96X5NsBZ wFu2bXMZkOl/wZqRdaZP0JE8K/nd0f5VeaXqmTg8= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 50CB06C182 for ; Fri, 9 Apr 2021 23:25:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 50CB06C182 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lUxhW-00058f-4K; Fri, 09 Apr 2021 23:25:58 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 9 Apr 2021 23:25:57 +0300 Message-Id: <8b70c648c1b907b04859cfc8bcef94870057bf9f.1617984948.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74806859AC5FE18436AEED970E897805ADA4182A05F53808504075B4930AA8CB00174D0587BEBE37EC8A93738F2F240AC7A8AF6A7A5B7669B353 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7B4D64F1449264784EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637525B22DCF689D4638638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B25D3782F3EA716765C77F51200A5A35ED088CACE0DB6A842FD2E47CDBA5A96583C09775C1D3CA48CF27ED053E960B195E117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE78C592797616C97AB9FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735E4A630A5B664A4FFC4224003CC83647689D4C264860C145E X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD0035DD76F8A8A4FCC5934A93F0D4624E02ED3829EFB50559C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D347215713CF3EEE9D168DE55EC3F928C4B28AEA25E6A6CAA7AADD168D2E10B818973C43D9337114A891D7E09C32AA3244C2086955DDF4E6EB1D2D43B6965585F3E55E75C8D0ED9F6EEFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyO2lHpuZu4SG3HbOSxgiKg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638220414B3365039ADFF00011EBEA3B813A783D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v5 39/52] sql: introduce mem_to_int*() functions 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: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thank you for the review! My answers and new patch below. On 30.03.2021 02:07, Vladislav Shpilevoy wrote: > Thanks for the patch! > > See 2 comments below. > > On 23.03.2021 10:36, imeevma@tarantool.org wrote: >> This patch introduces mem_convert_to_integer() which is used to convert >> a MEM to a MEM that contains integer value. >> >> Part of #5818 >> --- >> src/box/sql/mem.c | 114 +++++++++++++++++++++++++++++---------------- >> src/box/sql/mem.h | 7 ++- >> src/box/sql/vdbe.c | 19 ++++---- >> 3 files changed, 88 insertions(+), 52 deletions(-) >> >> diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c >> index 1209df1ce..b9bcd3d3a 100644 >> --- a/src/box/sql/mem.c >> +++ b/src/box/sql/mem.c >> @@ -695,6 +695,80 @@ mem_set_cleared(struct Mem *mem) > > <...> > >> + >> +static inline int >> +mem_convert_double_to_integer_lossless(struct Mem *mem) > > 1. Lets use 'precise'. Here and in other places. And shorten > the names. So it would be mem_convert_bool_to_int(), > mem_convert_to_int(), etc. > Thanks. Fixed. I shortened names of the functions to mem_to_int(), mem_to_double(), etc. Also, I shortened names of static functions to double_to_int(), int_to_string(), etc. Replaces "lossless" by "precise". >> +{ >> + double d = mem->u.r; >> + if (d < 0 && d >= (double)INT64_MIN && (double)(int64_t)d == d) { >> + mem_set_integer(mem, (int64_t)d, true); >> + return 0; >> + } >> + if (d >= 0 && d < (double)UINT64_MAX && (double)(uint64_t)d == d) { >> + mem_set_integer(mem, (int64_t)(uint64_t)d, false); > > 2. Isn't mem_set_unsigned() faster? Or we can't set FIELD_TYPE_UNSIGNED? Inlined setting of MEM here and in some other places. New patch: commit 8b70c648c1b907b04859cfc8bcef94870057bf9f Author: Mergen Imeev Date: Wed Mar 17 10:46:29 2021 +0300 sql: introduce mem_to_int*() functions This patch introduces mem_to_int() and mem_to_int_precise() functions. These functions are used to convert a MEM to a MEM that contains integer value. These functions defines the rules that are used during convertion from values of all other types to INTEGER. Part of #5818 diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 52b1891aa..d3a3215bc 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -687,6 +687,90 @@ mem_set_null_clear(struct Mem *mem) mem->flags = MEM_Null | MEM_Cleared; } +static inline int +bytes_to_int(struct Mem *mem) +{ + bool is_neg; + int64_t i; + if (sql_atoi64(mem->z, &i, &is_neg, mem->n) != 0) + return -1; + mem_set_int(mem, i, is_neg); + return 0; +} + +static inline int +double_to_int(struct Mem *mem) +{ + double d = mem->u.r; + if (d < 0 && d >= (double)INT64_MIN) { + mem->u.i = (int64_t)d; + mem->flags = MEM_Int; + mem->field_type = FIELD_TYPE_INTEGER; + return 0; + } + if (d >= 0 && d < (double)UINT64_MAX) { + mem->u.u = (uint64_t)d; + mem->flags = MEM_UInt; + mem->field_type = FIELD_TYPE_UNSIGNED; + return 0; + } + return -1; +} + +static inline int +double_to_int_precise(struct Mem *mem) +{ + double d = mem->u.r; + if (d < 0 && d >= (double)INT64_MIN && (double)(int64_t)d == d) { + mem->u.i = (int64_t)d; + mem->flags = MEM_Int; + mem->field_type = FIELD_TYPE_INTEGER; + return 0; + } + if (d >= 0 && d < (double)UINT64_MAX && (double)(uint64_t)d == d) { + mem->u.u = (uint64_t)d; + mem->flags = MEM_UInt; + mem->field_type = FIELD_TYPE_UNSIGNED; + return 0; + } + return -1; +} + +static inline int +bool_to_int(struct Mem *mem) +{ + mem->u.u = (uint64_t)mem->u.b; + mem->flags = MEM_UInt; + mem->field_type = FIELD_TYPE_UNSIGNED; + return 0; +} + +int +mem_to_int(struct Mem *mem) +{ + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return 0; + if ((mem->flags & (MEM_Str | MEM_Blob)) != 0) + return bytes_to_int(mem); + if ((mem->flags & MEM_Real) != 0) + return double_to_int(mem); + if ((mem->flags & MEM_Bool) != 0) + return bool_to_int(mem); + return -1; +} + +int +mem_to_int_precise(struct Mem *mem) +{ + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return 0; + if ((mem->flags & MEM_Str) != 0) + return bytes_to_int(mem); + if ((mem->flags & MEM_Real) != 0) + return double_to_int_precise(mem); + return -1; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -1924,26 +2008,6 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type) } } -/* - * The MEM structure is already a MEM_Real. Try to also make it a - * MEM_Int if we can. - */ -int -mem_apply_integer_type(Mem *pMem) -{ - int rc; - i64 ix; - assert(pMem->flags & MEM_Real); - assert(EIGHT_BYTE_ALIGNMENT(pMem)); - - if ((rc = doubleToInt64(pMem->u.r, (int64_t *) &ix)) == 0) { - pMem->u.i = ix; - pMem->flags = pMem->u.r <= -1 ? MEM_Int : MEM_UInt; - pMem->field_type = FIELD_TYPE_INTEGER; - } - return rc; -} - /* * Add MEM_Str to the set of representations for the given Mem. Numbers * are converted using sql_snprintf(). Converting a BLOB to a string @@ -2215,34 +2279,6 @@ mem_convert_to_unsigned(struct Mem *mem) return 0; } -/** - * Convert the numeric value contained in MEM to integer. - * - * @param mem The MEM that contains the numeric value. - * @retval 0 if the conversion was successful, -1 otherwise. - */ -static int -mem_convert_to_integer(struct Mem *mem) -{ - if ((mem->flags & (MEM_UInt | MEM_Int)) != 0) - return 0; - if ((mem->flags & MEM_Real) == 0) - return -1; - double d = mem->u.r; - if (d >= (double)UINT64_MAX || d < (double)INT64_MIN) - return -1; - if (d < 0.) { - mem->u.i = (int64_t)d; - mem->flags = MEM_Int; - mem->field_type = FIELD_TYPE_INTEGER; - } else { - mem->u.u = (uint64_t)d; - mem->flags = MEM_UInt; - mem->field_type = FIELD_TYPE_UNSIGNED; - } - return 0; -} - int mem_convert_to_numeric(struct Mem *mem, enum field_type type) { @@ -2253,7 +2289,7 @@ mem_convert_to_numeric(struct Mem *mem, enum field_type type) if (type == FIELD_TYPE_UNSIGNED) return mem_convert_to_unsigned(mem); assert(type == FIELD_TYPE_INTEGER); - return mem_convert_to_integer(mem); + return mem_to_int(mem); } static int diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index ce5076361..d3eb04c44 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -473,6 +473,24 @@ int mem_compare(const struct Mem *left, const struct Mem *right, int *result, enum field_type type, struct coll *coll); +/** + * Convert the given MEM to INTEGER. This function and the function below define + * the rules that are used to convert values of all other types to INTEGER. In + * this function, the conversion from double to integer may result in loss of + * precision. + */ +int +mem_to_int(struct Mem *mem); + +/** + * Convert the given MEM to INTEGER. This function and the function above define + * the rules that are used to convert values of all other types to INTEGER. In + * this function, the conversion from double to integer is only possible if it + * is lossless. + */ +int +mem_to_int_precise(struct Mem *mem); + /** * Simple type to str convertor. It is used to simplify * error reporting. @@ -533,7 +551,6 @@ int vdbe_mem_numerify(struct Mem *mem); int sqlVdbeMemCast(struct Mem *, enum field_type type); -int mem_apply_integer_type(struct Mem *); int sqlVdbeMemStringify(struct Mem *); int sqlVdbeMemNulTerminate(struct Mem *); int sqlVdbeMemExpandBlob(struct Mem *); diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 71a827034..e61ad4251 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1432,17 +1432,14 @@ case OP_AddImm: { /* in1 */ */ case OP_MustBeInt: { /* jump, in1 */ pIn1 = &aMem[pOp->p1]; - if (!mem_is_int(pIn1)) { - mem_apply_type(pIn1, FIELD_TYPE_INTEGER); - if (!mem_is_int(pIn1)) { - if (pOp->p2==0) { - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, - mem_str(pIn1), "integer"); - goto abort_due_to_error; - } else { - goto jump_to_p2; - } - } + if (mem_is_int(pIn1)) + break; + if (mem_to_int_precise(pIn1) != 0) { + if (pOp->p2 !=0 ) + goto jump_to_p2; + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, + mem_str(pIn1), "integer"); + goto abort_due_to_error; } break; }