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 1761E6AAB3; Tue, 23 Mar 2021 12:57:49 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1761E6AAB3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616493469; bh=yAolW57jZNg17ky97y0yd7rcRCpjH+p+ZLZF8/cvmko=; 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=Qm/1Rda6jv7xJ1YCeMgnY+JDJOdMIq5OO7wPJ4D5DRnq2Bg0pONrQf38l7qT/sej9 tVfgypMZBzSsdqZJFOAa7MVM96P+WnRZzBw0ImcwqHMMUR91T//kt8WeZxmTDCmE7R SwY01+1f2B+u4PqBW2EGkpxdlYqtJp/ogU+5C9ds= Received: from smtp42.i.mail.ru (smtp42.i.mail.ru [94.100.177.102]) (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 5464C68F63 for ; Tue, 23 Mar 2021 12:36:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5464C68F63 Received: by smtp42.i.mail.ru with esmtpa (envelope-from ) id 1lOdSp-0001jr-JU; Tue, 23 Mar 2021 12:36:40 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 23 Mar 2021 12:36:39 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD95D6E7CC48CB1F5F1C82687294EF6886B62CC997B0B8C95C4182A05F53808504018EBEC5837F0DCA896F8D7DCC68E6B5417625C698CAEA67A1E4854C3FF7FBAC6 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE749E89BD568380EECC2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE7EA4B66823129EB3CEA1F7E6F0F101C67CDEEF6D7F21E0D1D174C73DBBBFC7664D54267400E4E38EC0FEE2F5E65094E3768EE495C10C12221389733CBF5DBD5E913377AFFFEAFD269A417C69337E82CC2CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C0D9442B0B5983000E8941B15DA834481F9449624AB7ADAF37BA3038C0950A5D3613377AFFFEAFD269176DF2183F8FC7C0F574DF318A3D05BE7B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050F7532CA1512B81981E45489B29CB19804B3661434B16C20AC78D18283394535A9E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD1CF19DD082D7633A0C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FC953A8A48A05D51F175ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4930A3850AC1BE2E73542F54486E6D6388DC4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F93F060FBA3C93C613B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C686AF563A045C75E36409AA18453890AE983B5422D30055F9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3438BC6CF312DA7315A40702CD15D9977E6A17D837EE783C732429170315850E646CB7C5F3A0C392911D7E09C32AA3244C4EDDE6B67AD7FC3732978C93C7B58E15408A6A02710B7304FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojWJZv20R+6UhncaJ4kYW5gQ== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306EDB87FF65A5B182AE596F8D7DCC68E6B54B67A942A63B4089A5105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 46/53] sql: introduce mem_implicit_cast() 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" This patch introduces mem_implicit_cast(). This function is used to convert a MEM to given type according to implicit cast rules. Part of #5818 --- src/box/sql/mem.c | 275 ++++++++++++++++++++++++------------------ src/box/sql/mem.h | 55 +-------- src/box/sql/vdbe.c | 21 +--- src/box/sql/vdbeaux.c | 2 +- 4 files changed, 168 insertions(+), 185 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 559bf6121..1baf4c482 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -943,6 +943,28 @@ mem_convert_to_string(struct Mem *mem) return -1; } +static inline int +mem_convert_double_to_unsigned(struct Mem *mem) +{ + double d = mem->u.r; + if (d >= 0 && d < (double)UINT64_MAX) { + mem_set_unsigned(mem, (uint64_t)d); + return 0; + } + return -1; +} + +static inline int +mem_convert_double_to_unsigned_lossless(struct Mem *mem) +{ + double d = mem->u.r; + if (d >= 0 && d < (double)UINT64_MAX && (double)(uint64_t)d == d) { + mem_set_unsigned(mem, (uint64_t)d); + return 0; + } + return -1; +} + static inline int mem_convert_varstring_to_unsigned(struct Mem *mem) { @@ -1071,6 +1093,140 @@ mem_explicit_cast(struct Mem *mem, enum field_type type) return -1; } +int +mem_implicit_cast(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_Real) != 0) + return mem_convert_double_to_unsigned(mem); + return -1; + case FIELD_TYPE_STRING: + if ((mem->flags & MEM_Str) != 0) + return 0; + return -1; + case FIELD_TYPE_DOUBLE: + if ((mem->flags & MEM_Real) != 0) + return 0; + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return mem_convert_integer_to_double(mem); + return -1; + case FIELD_TYPE_INTEGER: + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return 0; + if ((mem->flags & MEM_Real) != 0) + return mem_convert_double_to_integer(mem); + return -1; + case FIELD_TYPE_BOOLEAN: + if ((mem->flags & MEM_Bool) != 0) + return 0; + return -1; + case FIELD_TYPE_VARBINARY: + if ((mem->flags & MEM_Blob) != 0) + return 0; + return -1; + case FIELD_TYPE_NUMBER: + if ((mem->flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0) + return 0; + return -1; + case FIELD_TYPE_MAP: + if (mem_is_map(mem)) + return 0; + return -1; + case FIELD_TYPE_ARRAY: + if (mem_is_array(mem)) + return 0; + return -1; + case FIELD_TYPE_SCALAR: + if ((mem->flags & MEM_Blob) != 0 && + (mem->flags & MEM_Subtype) != 0) + return -1; + return 0; + case FIELD_TYPE_ANY: + return 0; + default: + break; + } + return -1; +} + +int +mem_implicit_cast_old(struct Mem *mem, enum field_type type) +{ + if (mem_is_null(mem)) + return 0; + switch (type) { + case FIELD_TYPE_UNSIGNED: + if ((mem->flags & MEM_UInt) != 0) + return 0; + if ((mem->flags & MEM_Real) != 0) + return mem_convert_double_to_unsigned_lossless(mem); + if ((mem->flags & MEM_Str) != 0) + return mem_convert_varstring_to_unsigned(mem); + return -1; + case FIELD_TYPE_STRING: + if ((mem->flags & (MEM_Str | MEM_Blob)) != 0) + return 0; + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return mem_convert_integer_to_string(mem); + if ((mem->flags & MEM_Real) != 0) + return mem_convert_double_to_string(mem); + return -1; + case FIELD_TYPE_DOUBLE: + if ((mem->flags & MEM_Real) != 0) + return 0; + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return mem_convert_integer_to_double(mem); + if ((mem->flags & MEM_Str) != 0) + return mem_convert_varstring_to_double(mem); + return -1; + case FIELD_TYPE_INTEGER: + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return 0; + if ((mem->flags & MEM_Str) != 0) + return mem_convert_varstring_to_integer(mem); + if (mem_is_double(mem)) + return mem_convert_double_to_integer_lossless(mem); + return -1; + case FIELD_TYPE_BOOLEAN: + if ((mem->flags & MEM_Bool) != 0) + return 0; + return -1; + case FIELD_TYPE_VARBINARY: + if ((mem->flags & MEM_Blob) != 0) + return 0; + return -1; + case FIELD_TYPE_NUMBER: + if ((mem->flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0) + return 0; + if ((mem->flags & MEM_Str) != 0) + return mem_convert_to_number(mem); + return -1; + case FIELD_TYPE_MAP: + if (mem_is_map(mem)) + return 0; + return -1; + case FIELD_TYPE_ARRAY: + if (mem_is_array(mem)) + return 0; + return -1; + 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) { @@ -2133,117 +2289,6 @@ sqlVdbeMemExpandBlob(Mem * pMem) return 0; } -/* - * Exported version of mem_apply_type(). This one works on sql_value*, - * not the internal Mem* type. - */ -void -sql_value_apply_type( - sql_value *pVal, - enum field_type type) -{ - mem_apply_type((Mem *) pVal, type); -} - -int -mem_apply_type(struct Mem *record, enum field_type type) -{ - if ((record->flags & MEM_Null) != 0) - return 0; - assert(type < field_type_MAX); - switch (type) { - case FIELD_TYPE_INTEGER: - case FIELD_TYPE_UNSIGNED: - if ((record->flags & (MEM_Bool | MEM_Blob)) != 0) - return -1; - if ((record->flags & MEM_UInt) == MEM_UInt) - return 0; - if ((record->flags & MEM_Real) == MEM_Real) { - double d = record->u.r; - if (d >= 0) { - if (double_compare_uint64(d, UINT64_MAX, - 1) > 0) - return 0; - if ((double)(uint64_t)d == d) - mem_set_unsigned(record, (uint64_t)d); - } else { - if (double_compare_nint64(d, INT64_MIN, 1) < 0) - return 0; - if ((double)(int64_t)d == d) { - mem_set_integer(record, (int64_t)d, - true); - } - } - return 0; - } - if ((record->flags & MEM_Str) != 0) { - bool is_neg; - int64_t i; - if (sql_atoi64(record->z, &i, &is_neg, record->n) != 0) - return -1; - mem_set_integer(record, i, is_neg); - } - if ((record->flags & MEM_Int) == MEM_Int) { - if (type == FIELD_TYPE_UNSIGNED) - return -1; - return 0; - } - return 0; - case FIELD_TYPE_BOOLEAN: - if ((record->flags & MEM_Bool) == MEM_Bool) - return 0; - return -1; - case FIELD_TYPE_NUMBER: - if ((record->flags & (MEM_Real | MEM_Int | MEM_UInt)) != 0) - return 0; - return mem_convert_to_double(record); - case FIELD_TYPE_DOUBLE: - if ((record->flags & MEM_Real) != 0) - return 0; - return mem_convert_to_double(record); - case FIELD_TYPE_STRING: - /* - * Only attempt the conversion to TEXT if there is - * an integer or real representation (BLOB and - * NULL do not get converted). - */ - if ((record->flags & MEM_Str) == 0 && - (record->flags & (MEM_Real | MEM_Int | MEM_UInt)) != 0) - mem_convert_to_string(record); - record->flags &= ~(MEM_Real | MEM_Int | MEM_UInt); - return 0; - case FIELD_TYPE_VARBINARY: - if ((record->flags & MEM_Blob) == 0) - return -1; - return 0; - case FIELD_TYPE_SCALAR: - /* Can't cast MAP and ARRAY to scalar types. */ - if ((record->flags & MEM_Subtype) != 0 && - record->subtype == SQL_SUBTYPE_MSGPACK) { - assert(mp_typeof(*record->z) == MP_MAP || - mp_typeof(*record->z) == MP_ARRAY); - return -1; - } - return 0; - case FIELD_TYPE_MAP: - if ((record->flags & MEM_Subtype) != 0 && - record->subtype == SQL_SUBTYPE_MSGPACK && - mp_typeof(*record->z) == MP_MAP) - return 0; - return -1; - case FIELD_TYPE_ARRAY: - if ((record->flags & MEM_Subtype) != 0 && - record->subtype == SQL_SUBTYPE_MSGPACK && - mp_typeof(*record->z) == MP_ARRAY) - return 0; - return -1; - case FIELD_TYPE_ANY: - return 0; - default: - return -1; - } -} - /* * Make sure pMem->z points to a writable allocation of at least * min(n,32) bytes. @@ -2769,14 +2814,6 @@ sqlMemCompare(const Mem * pMem1, const Mem * pMem2, const struct coll * pColl) return sqlBlobCompare(pMem1, pMem2); } -bool -mem_is_type_compatible(struct Mem *mem, enum field_type type) -{ - enum mp_type mp_type = mem_mp_type(mem); - assert(mp_type < MP_EXT); - return field_mp_plain_type_is_compatible(type, mp_type, true); -} - int sql_vdbemem_finalize(struct Mem *mem, struct func *func) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 922dad272..c0b9f4f99 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -339,6 +339,12 @@ mem_convert_to_string0(struct Mem *mem); int mem_explicit_cast(struct Mem *mem, enum field_type type); +int +mem_implicit_cast(struct Mem *mem, enum field_type type); + +int +mem_implicit_cast_old(struct Mem *mem, enum field_type type); + /** * Simple type to str convertor. It is used to simplify * error reporting. @@ -392,44 +398,6 @@ registerTrace(int iReg, Mem *p); int sqlVdbeMemNulTerminate(struct Mem *); int sqlVdbeMemExpandBlob(struct Mem *); #define ExpandBlob(P) (mem_is_zeroblob(P)? sqlVdbeMemExpandBlob(P) : 0) -void sql_value_apply_type(struct Mem *val, enum field_type type); - - -/** - * Processing is determined by the field type parameter: - * - * INTEGER: - * If memory holds floating point value and it can be - * converted without loss (2.0 - > 2), it's type is - * changed to INT. Otherwise, simply return success status. - * - * NUMBER: - * If memory holds INT or floating point value, - * no actions take place. - * - * STRING: - * Convert mem to a string representation. - * - * SCALAR: - * Mem is unchanged, but flag is set to BLOB in case of - * scalar-like type. Otherwise, (MAP, ARRAY) conversion - * is impossible. - * - * BOOLEAN: - * If memory holds BOOLEAN no actions take place. - * - * ANY: - * Mem is unchanged, no actions take place. - * - * MAP/ARRAY: - * These types can't be casted to scalar ones, or to each - * other. So the only valid conversion is to type itself. - * - * @param record The value to apply type to. - * @param type The type to be applied. - */ -int -mem_apply_type(struct Mem *record, enum field_type type); /** Setters = Change MEM value. */ @@ -494,17 +462,6 @@ int sqlVdbeMemTooBig(Mem *); int sqlMemCompare(const Mem *, const Mem *, const struct coll *); -/** - * Check that MEM_type of the mem is compatible with given type. - * - * @param mem The MEM that contains the value to check. - * @param type The type to check. - * @retval TRUE if the MEM_type of the value and the given type - * are compatible, FALSE otherwise. - */ -bool -mem_is_type_compatible(struct Mem *mem, enum field_type type); - /** MEM manipulate functions. */ /** diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index a567f69bd..389472941 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -2001,23 +2001,12 @@ case OP_ApplyType: { while((type = *(types++)) != field_type_MAX) { assert(pIn1 <= &p->aMem[(p->nMem+1 - p->nCursor)]); assert(memIsValid(pIn1)); - if (!mem_is_type_compatible(pIn1, type)) { - /* Implicit cast is allowed only to numeric type. */ - if (!sql_type_is_numeric(type)) - goto type_mismatch; - /* Implicit cast is allowed only from numeric type. */ - if (!mem_is_number(pIn1)) - goto type_mismatch; - /* Try to convert numeric-to-numeric. */ - if (mem_explicit_cast(pIn1, type) != 0) - goto type_mismatch; + if (mem_implicit_cast(pIn1, type) != 0) { + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, + mem_str(pIn1), field_type_strs[type]); + goto abort_due_to_error; } pIn1++; - continue; -type_mismatch: - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, - mem_str(pIn1), field_type_strs[type]); - goto abort_due_to_error; } break; } @@ -2076,7 +2065,7 @@ case OP_MakeRecord: { if (types != NULL) { pRec = pData0; do { - mem_apply_type(pRec++, *(types++)); + mem_implicit_cast_old(pRec++, *(types++)); } while(types[0] != field_type_MAX); } diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index ccabf6035..59fc313d4 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -2310,7 +2310,7 @@ sqlVdbeGetBoundValue(Vdbe * v, int iVar, u8 aff) sql_value *pRet = sqlValueNew(v->db); if (pRet) { mem_copy(pRet, pMem); - sql_value_apply_type(pRet, aff); + mem_implicit_cast_old(pRet, aff); } return pRet; } -- 2.25.1