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 D60636EC5F; Fri, 9 Apr 2021 23:54:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D60636EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618001682; bh=XNKW4MomQ9gJc8kavDEViWkftDoiK4kuZn7cNKgbapI=; 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=gx2lNjSUhFu9KABG9+6rQQcqip5vSo+jTFAnKxznYTJwjJK7BpdlXcS5krHRIrWvB CLJpm0/a3FvaJHOK31juo4qDAa7MECOoDscuf8ChPCZ9IGXkfGpC4FMdz/rOTrmzqC Lr1mYS3oc/llHBqQdZB5goE+zxYbZ7+td2X1i3sg= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 9E7186C7D1 for ; Fri, 9 Apr 2021 23:53:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9E7186C7D1 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lUy8M-0006pg-Rv; Fri, 09 Apr 2021 23:53:43 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 9 Apr 2021 23:53:42 +0300 Message-Id: <83460913f3fdab50eb49ee0b3d84a69da6e29128.1618000037.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: 4F1203BC0FB41BD92FFCB8E6708E7480BE79914FF86F9151AC38CC435EA4A654182A05F53808504077B269236265315512C93E829A31330C2A7D371DAF8CBF30B7B672A69160FDBA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE760302A529BCAAAFCEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637A6A20D80F0832BC78638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B263C345D6B8ABD97B3175E7188621ED818CCF7685675CC1A7D2E47CDBA5A96583C09775C1D3CA48CFCA5A41EBD8A3A0199FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3ED8438A78DFE0A9E117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8BDC0F6C5B2EEF3D0C75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C9783113105DDC94723787B24383D33A8A987E X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD0035DD76F8A8A4F5E32C6C26CFB363AC1055612B90FA1F89C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C1D376EF32BB0896770F91886E46BA6879AC3E9A54E3D9831A271024601F042316CA396C835F8D9B1D7E09C32AA3244C0485946E10B1A7F0A67128E355D2095F60759606DA2E136AFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojqcJA+pXcDumrYvX+ANjBsA== X-Mailru-Sender: 689FA8AB762F73936BC43F508A06382235242C2C13D602B3FDE890AD08BC6BB983D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v5 43/52] sql: introduce mem_cast_explicit() 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 answer and new patch below. On 30.03.2021 02:08, Vladislav Shpilevoy wrote: > Thanks for the patch! > > In function names we use subject_action_object pattern. So it > should be mem_cast_explicit(), the same for the implicit cast. Fixed. New patch: commit 83460913f3fdab50eb49ee0b3d84a69da6e29128 Author: Mergen Imeev Date: Wed Mar 17 12:27:09 2021 +0300 sql: introduce mem_cast_explicit() This patch introduces mem_cast_explicit(). This function is used to convert a MEM to a given field type according to explicit cast rules. Part of #5818 diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index be7b47e76..45d2d5fe3 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -946,6 +946,131 @@ mem_to_str(struct Mem *mem) return -1; } +static inline int +bytes_to_uint(struct Mem *mem) +{ + bool is_neg; + int64_t i; + if (sql_atoi64(mem->z, &i, &is_neg, mem->n) != 0) + return -1; + if (is_neg) + return -1; + mem_set_uint(mem, (uint64_t)i); + return 0; +} + +static inline int +str_to_bool(struct Mem *mem) +{ + char *str = mem->z; + bool b; + const char *str_true = "TRUE"; + const char *str_false = "FALSE"; + uint32_t len_true = strlen(str_true); + uint32_t len_false = strlen(str_false); + + for (; str[0] == ' '; str++); + if (strncasecmp(str, str_true, len_true) == 0) { + b = true; + str += len_true; + } else if (strncasecmp(str, str_false, len_false) == 0) { + b = false; + str += len_false; + } else { + return -1; + } + for (; str[0] == ' '; str++); + if (str[0] != '\0') + return -1; + mem_set_bool(mem, b); + return 0; +} + +static inline int +int_to_bool(struct Mem *mem) +{ + mem->u.b = mem->u.i != 0; + mem->flags = MEM_Bool; + mem->field_type = FIELD_TYPE_BOOLEAN; + return 0; +} + +static inline int +double_to_bool(struct Mem *mem) +{ + mem->u.b = mem->u.r != 0.; + mem->flags = MEM_Bool; + mem->field_type = FIELD_TYPE_BOOLEAN; + return 0; +} + +static inline int +str_to_bin(struct Mem *mem) +{ + mem->flags = (mem->flags & (MEM_Dyn | MEM_Static | MEM_Ephem)) | + MEM_Blob; + mem->field_type = FIELD_TYPE_VARBINARY; + return 0; +} + +int +mem_cast_explicit(struct Mem *mem, enum field_type type) +{ + if ((mem->flags & MEM_Null) != 0) { + mem->field_type = type; + return 0; + } + switch (type) { + case FIELD_TYPE_UNSIGNED: + if ((mem->flags & MEM_UInt) != 0) + return 0; + if ((mem->flags & MEM_Int) != 0) + return -1; + if ((mem->flags & MEM_Blob) != 0 && + (mem->flags & MEM_Subtype) != 0) + return -1; + if ((mem->flags & (MEM_Str | MEM_Blob)) != 0) + return bytes_to_uint(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; + case FIELD_TYPE_STRING: + return mem_to_str(mem); + case FIELD_TYPE_DOUBLE: + return mem_to_double(mem); + case FIELD_TYPE_INTEGER: + return mem_to_int(mem); + case FIELD_TYPE_BOOLEAN: + if ((mem->flags & MEM_Bool) != 0) + return 0; + if ((mem->flags & (MEM_UInt | MEM_Int)) != 0) + return int_to_bool(mem); + if ((mem->flags & MEM_Str) != 0) + return str_to_bool(mem); + if ((mem->flags & MEM_Real) != 0) + return double_to_bool(mem); + return -1; + case FIELD_TYPE_VARBINARY: + if ((mem->flags & MEM_Blob) != 0) + return 0; + if ((mem->flags & MEM_Str) != 0) + return str_to_bin(mem); + return -1; + case FIELD_TYPE_NUMBER: + return mem_to_number(mem); + case FIELD_TYPE_SCALAR: + if ((mem->flags & MEM_Blob) != 0 && + (mem->flags & MEM_Subtype) != 0) + return -1; + return 0; + default: + break; + } + return -1; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -1647,42 +1772,6 @@ valueToText(sql_value * pVal) return pVal->z; } -/** - * According to ANSI SQL string value can be converted to boolean - * type if string consists of literal "true" or "false" and - * number of leading and trailing spaces. - * - * For instance, " tRuE " can be successfully converted to - * boolean value true. - * - * @param str String to be converted to boolean. Assumed to be - * null terminated. - * @param[out] result Resulting value of cast. - * @retval 0 If string satisfies conditions above. - * @retval -1 Otherwise. - */ -static int -str_cast_to_boolean(const char *str, bool *result) -{ - assert(str != NULL); - for (; *str == ' '; str++); - if (strncasecmp(str, SQL_TOKEN_TRUE, strlen(SQL_TOKEN_TRUE)) == 0) { - *result = true; - str += 4; - } else if (strncasecmp(str, SQL_TOKEN_FALSE, - strlen(SQL_TOKEN_FALSE)) == 0) { - *result = false; - str += 5; - } else { - return -1; - } - for (; *str != '\0'; ++str) { - if (*str != ' ') - return -1; - } - return 0; -} - /* * Convert a 64-bit IEEE double into a 64-bit signed integer. * If the double is out of range of a 64-bit signed integer then @@ -2018,113 +2107,6 @@ registerTrace(int iReg, Mem *p) { } #endif -/* - * Cast the datatype of the value in pMem according to the type - * @type. Casting is different from applying type in that a cast - * is forced. In other words, the value is converted into the desired - * type even if that results in loss of data. This routine is - * used (for example) to implement the SQL "cast()" operator. - */ -int -sqlVdbeMemCast(Mem * pMem, enum field_type type) -{ - assert(type < field_type_MAX); - if (pMem->flags & MEM_Null) - return 0; - switch (type) { - case FIELD_TYPE_SCALAR: - return 0; - case FIELD_TYPE_BOOLEAN: - if ((pMem->flags & MEM_Int) != 0) { - mem_set_bool(pMem, pMem->u.i); - return 0; - } - if ((pMem->flags & MEM_UInt) != 0) { - mem_set_bool(pMem, pMem->u.u); - return 0; - } - if ((pMem->flags & MEM_Real) != 0) { - mem_set_bool(pMem, pMem->u.r); - return 0; - } - if ((pMem->flags & MEM_Str) != 0) { - bool value; - if (str_cast_to_boolean(pMem->z, &value) != 0) - return -1; - mem_set_bool(pMem, value); - return 0; - } - if ((pMem->flags & MEM_Bool) != 0) - return 0; - return -1; - case FIELD_TYPE_INTEGER: - case FIELD_TYPE_UNSIGNED: - if ((pMem->flags & (MEM_Blob | MEM_Str)) != 0) { - bool is_neg; - int64_t val; - if (sql_atoi64(pMem->z, &val, &is_neg, pMem->n) != 0) - return -1; - if (type == FIELD_TYPE_UNSIGNED && is_neg) - return -1; - mem_set_int(pMem, val, is_neg); - return 0; - } - if ((pMem->flags & MEM_Bool) != 0) { - pMem->u.u = (uint64_t)pMem->u.b; - pMem->flags = MEM_UInt; - pMem->field_type = FIELD_TYPE_UNSIGNED; - return 0; - } - if ((pMem->flags & MEM_Real) != 0) { - double d = pMem->u.r; - if (d < 0. && d >= (double)INT64_MIN) { - pMem->u.i = (int64_t)d; - pMem->flags = MEM_Int; - pMem->field_type = FIELD_TYPE_INTEGER; - return 0; - } - if (d >= 0. && d < (double)UINT64_MAX) { - pMem->u.u = (uint64_t)d; - pMem->flags = MEM_UInt; - pMem->field_type = FIELD_TYPE_UNSIGNED; - return 0; - } - return -1; - } - if (type == FIELD_TYPE_UNSIGNED && - (pMem->flags & MEM_UInt) == 0) - return -1; - return 0; - case FIELD_TYPE_DOUBLE: - return mem_to_double(pMem); - case FIELD_TYPE_NUMBER: - return mem_to_number(pMem); - case FIELD_TYPE_VARBINARY: - if ((pMem->flags & MEM_Blob) != 0) - return 0; - if ((pMem->flags & MEM_Str) != 0) { - MemSetTypeFlag(pMem, MEM_Str); - return 0; - } - return -1; - default: - assert(type == FIELD_TYPE_STRING); - assert(MEM_Str == (MEM_Blob >> 3)); - if ((pMem->flags & MEM_Bool) != 0) { - const char *str_bool = SQL_TOKEN_BOOLEAN(pMem->u.b); - if (mem_copy_str0(pMem, str_bool) != 0) - return -1; - return 0; - } - pMem->flags |= (pMem->flags & MEM_Blob) >> 3; - sql_value_apply_type(pMem, FIELD_TYPE_STRING); - assert(pMem->flags & MEM_Str || pMem->db->mallocFailed); - pMem->flags &= - ~(MEM_Int | MEM_UInt | MEM_Real | MEM_Blob | MEM_Zero); - return 0; - } -} - /* * Make sure the given Mem is \u0000 terminated. */ @@ -2282,43 +2264,6 @@ mem_apply_type(struct Mem *record, enum field_type type) } } -/** - * Convert the numeric value contained in MEM to unsigned. - * - * @param mem The MEM that contains the numeric value. - * @retval 0 if the conversion was successful, -1 otherwise. - */ -static int -mem_convert_to_unsigned(struct Mem *mem) -{ - if ((mem->flags & MEM_UInt) != 0) - return 0; - if ((mem->flags & MEM_Int) != 0) - return -1; - if ((mem->flags & MEM_Real) == 0) - return -1; - double d = mem->u.r; - if (d < 0.0 || d >= (double)UINT64_MAX) - return -1; - 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) -{ - assert(mem_is_num(mem) && sql_type_is_numeric(type)); - assert(type != FIELD_TYPE_NUMBER); - if (type == FIELD_TYPE_DOUBLE) - return mem_to_double(mem); - if (type == FIELD_TYPE_UNSIGNED) - return mem_convert_to_unsigned(mem); - assert(type == FIELD_TYPE_INTEGER); - return mem_to_int(mem); -} - static int sqlVdbeMemGrow(struct Mem *pMem, int n, int bPreserve) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 146d08a2a..73d2ffd6a 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -522,6 +522,10 @@ mem_to_str(struct Mem *mem); int mem_to_str0(struct Mem *mem); +/** Convert the given MEM to given type according to explicit cast rules. */ +int +mem_cast_explicit(struct Mem *mem, enum field_type type); + /** * Simple type to str convertor. It is used to simplify * error reporting. @@ -555,7 +559,6 @@ registerTrace(int iReg, Mem *p); #define memIsValid(M) !mem_is_invalid(M) #endif -int sqlVdbeMemCast(struct Mem *, enum field_type type); int sqlVdbeMemNulTerminate(struct Mem *); int sqlVdbeMemExpandBlob(struct Mem *); #define ExpandBlob(P) (mem_is_zerobin(P)? sqlVdbeMemExpandBlob(P) : 0) @@ -598,17 +601,6 @@ void sql_value_apply_type(struct Mem *val, enum field_type type); int mem_apply_type(struct Mem *record, enum field_type type); -/** - * Convert the numeric value contained in MEM to another numeric - * type. - * - * @param mem The MEM that contains the numeric value. - * @param type The type to convert to. - * @retval 0 if the conversion was successful, -1 otherwise. - */ -int -mem_convert_to_numeric(struct Mem *mem, enum field_type type); - /** Setters = Change MEM value. */ int sqlVdbeMemClearAndResize(struct Mem * pMem, int n); @@ -622,12 +614,6 @@ struct Mem *sqlValueNew(struct sql *); void releaseMemArray(Mem * p, int N); -/* - * Clear any existing type flags from a Mem and replace them with f - */ -#define MemSetTypeFlag(p, f) \ - ((p)->flags = ((p)->flags&~(MEM_TypeMask|MEM_Zero))|f) - /** Getters. */ int diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 7880af248..29634841a 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1480,7 +1480,7 @@ case OP_Cast: { /* in1 */ pIn1 = &aMem[pOp->p1]; if (ExpandBlob(pIn1) != 0) goto abort_due_to_error; - rc = sqlVdbeMemCast(pIn1, pOp->p2); + rc = mem_cast_explicit(pIn1, pOp->p2); /* * SCALAR is not type itself, but rather an aggregation * of types. Hence, cast to this type shouldn't change @@ -2100,7 +2100,7 @@ case OP_ApplyType: { if (!mem_is_num(pIn1)) goto type_mismatch; /* Try to convert numeric-to-numeric. */ - if (mem_convert_to_numeric(pIn1, type) != 0) + if (mem_cast_explicit(pIn1, type) != 0) goto type_mismatch; } pIn1++;