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 685D26EC5F; Thu, 15 Apr 2021 02:40:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 685D26EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618443633; bh=6msUME99+ztrzXveAFyMOl6JzwctQJQfBd4LJuFkDhI=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=oHi7DEwCIvk3mUx3JN8/uESnQ22B8TocWqjDJWWvsYKYg81c9HXFWYXFL4ErQP00v QlDqSzabt5hDOwoOOjx0M8utcKwDJfEpnM9zXSINMNyCjeLj+2AxEovL5AdXM3IYP9 pvNezCMPd0V5GrmYUcxmEe0GmBoUScmrlPN6BUsE= Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (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 CD2BF6EC5F for ; Thu, 15 Apr 2021 02:40:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CD2BF6EC5F Received: by smtp38.i.mail.ru with esmtpa (envelope-from ) id 1lWp7W-0002T0-Sv; Thu, 15 Apr 2021 02:40:31 +0300 Date: Thu, 15 Apr 2021 02:40:29 +0300 To: Vladislav Shpilevoy Message-ID: <20210414234029.GA339734@tarantool.org> References: <5a71515faac5f305fc3bd1ebbc20d1dd65bf027c.1617984948.git.imeevma@gmail.com> <85edf743-dd85-d4f7-2aad-05802ea67e9e@tarantool.org> <20210413183304.GA270088@tarantool.org> <503a35db-f243-d9d2-7afb-f222a52fa1b8@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <503a35db-f243-d9d2-7afb-f222a52fa1b8@tarantool.org> X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480D608FE24BC85426BB1B55F651FED8C70182A05F5380850404C50B8E8F9E45B397218D21120F84DD60978AC97D7F05FE6AD50C298439F9513 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A3295C83650092F9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637BA14B6CBCF09CA1D8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B257AE977ADE0323169A48E41C91B492D58CCF7685675CC1A7D2E47CDBA5A96583C09775C1D3CA48CFCA5A41EBD8A3A0199FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3ED8438A78DFE0A9E117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CF3F51460C0C148B02BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B6E0E7F94A307E583776E601842F6C81A1F004C906525384307823802FF610243D2EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE72128E1227B50B07D731C566533BA786AA5CC5B56E945C8DA X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2368A440D3B0F6089093C9A16E5BC824A2A04A2ABAA09D2538DECB10C4E1BE3BCB8CCF60F6B7FD3948E1CD14B953EB46DA42F006BC6D86A5E355D89D7DBCDD132 X-C1DE0DAB: 0D63561A33F958A574671D9BAC5B0441D88373447BCCAC7CE733B0CE6368275DD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34DFB7A809FB53708738F44099D72F2D29252F05CCD8372BB98293B7532E89817B3DD1D093D3B10B701D7E09C32AA3244CBD2C8D15B024DF816237BB6E00FB9E7760759606DA2E136AFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojrcJA+pXcDunmtBi9+m25Ww== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306EDA8CF0320F56C83787218D21120F84DD6CA71892AC981DD5F5105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v5 20/52] sql: introduce mem_compare() 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: Mergen Imeev Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thank you for review and suggestion! I applied your diff and tested. New patch below. On Thu, Apr 15, 2021 at 01:20:21AM +0200, Vladislav Shpilevoy wrote: > Nice fixes! > > Consider mine below: > > ==================== > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 9de57bcb4..a7c2c16cb 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -481,7 +481,7 @@ mem_rem(const struct Mem *left, const struct Mem *right, struct Mem *result) > int > mem_cmp_bool(const struct Mem *a, const struct Mem *b, int *result) > { > - if ((a->flags & MEM_Bool) == 0 || (b->flags & MEM_Bool) == 0) > + if ((a->flags & b->flags & MEM_Bool) == 0) > return -1; > if (a->u.b == b->u.b) > *result = 0; > @@ -495,7 +495,7 @@ mem_cmp_bool(const struct Mem *a, const struct Mem *b, int *result) > int > mem_cmp_bin(const struct Mem *a, const struct Mem *b, int *result) > { > - if ((a->flags & MEM_Blob) == 0 || (b->flags & MEM_Blob) == 0) > + if ((a->flags & b->flags & MEM_Blob) == 0) > return -1; > int an = a->n; > int bn = b->n; > @@ -640,7 +640,7 @@ mem_cmp_str(const struct Mem *left, const struct Mem *right, int *result, > sql_snprintf(BUF_SIZE, b, "%!.15g", right->u.r); > bn = strlen(b); > } > - if (coll) { > + if (coll != NULL) { > *result = coll->cmp(a, an, b, bn, coll); > return 0; > } New patch: commit 37f32ea303fe8c01683a4f77ac87350b15f4a82e Author: Mergen Imeev Date: Sun Mar 14 13:13:34 2021 +0300 sql: introduce mem_cmp_*() functions This patch introduces set of mem_cmp_*() functions. These functions are used to compare MEMs. Part of #5818 diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index a8bbfd3ea..529982624 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -479,6 +479,180 @@ mem_rem(const struct Mem *left, const struct Mem *right, struct Mem *result) return 0; } +int +mem_cmp_bool(const struct Mem *a, const struct Mem *b, int *result) +{ + if ((a->flags & b->flags & MEM_Bool) == 0) + return -1; + if (a->u.b == b->u.b) + *result = 0; + else if (a->u.b) + *result = 1; + else + *result = -1; + return 0; +} + +int +mem_cmp_bin(const struct Mem *a, const struct Mem *b, int *result) +{ + if ((a->flags & b->flags & MEM_Blob) == 0) + return -1; + int an = a->n; + int bn = b->n; + int minlen = MIN(an, bn); + + /* + * It is possible to have a Blob value that has some non-zero content + * followed by zero content. But that only comes up for Blobs formed + * by the OP_MakeRecord opcode, and such Blobs never get passed into + * mem_compare(). + */ + assert((a->flags & MEM_Zero) == 0 || an == 0); + assert((b->flags & MEM_Zero) == 0 || bn == 0); + + if ((a->flags & b->flags & MEM_Zero) != 0) { + *result = a->u.nZero - b->u.nZero; + return 0; + } + if ((a->flags & MEM_Zero) != 0) { + for (int i = 0; i < minlen; ++i) { + if (b->z[i] != 0) { + *result = -1; + return 0; + } + } + *result = a->u.nZero - bn; + return 0; + } + if ((b->flags & MEM_Zero) != 0) { + for (int i = 0; i < minlen; ++i) { + if (a->z[i] != 0){ + *result = 1; + return 0; + } + } + *result = b->u.nZero - an; + return 0; + } + *result = memcmp(a->z, b->z, minlen); + if (*result != 0) + return 0; + *result = an - bn; + return 0; +} + +int +mem_cmp_num(const struct Mem *left, const struct Mem *right, int *result) +{ + struct sql_num a, b; + /* TODO: Here should be check for right value type. */ + if (get_number(right, &b) != 0) { + *result = -1; + return 0; + } + if (get_number(left, &a) != 0) + return -1; + if (a.type == MEM_Real) { + if (b.type == MEM_Real) { + if (a.d > b.d) + *result = 1; + else if (a.d < b.d) + *result = -1; + else + *result = 0; + return 0; + } + if (b.type == MEM_Int) + *result = double_compare_nint64(a.d, b.i, 1); + else + *result = double_compare_uint64(a.d, b.u, 1); + return 0; + } + if (a.type == MEM_Int) { + if (b.type == MEM_Int) { + if (a.i > b.i) + *result = 1; + else if (a.i < b.i) + *result = -1; + else + *result = 0; + return 0; + } + if (b.type == MEM_UInt) + *result = -1; + else + *result = double_compare_nint64(b.d, a.i, -1); + return 0; + } + assert(a.type == MEM_UInt); + if (b.type == MEM_UInt) { + if (a.u > b.u) + *result = 1; + else if (a.u < b.u) + *result = -1; + else + *result = 0; + return 0; + } + if (b.type == MEM_Int) + *result = 1; + else + *result = double_compare_uint64(b.d, a.u, -1); + return 0; +} + +int +mem_cmp_str(const struct Mem *left, const struct Mem *right, int *result, + const struct coll *coll) +{ + char *a; + uint32_t an; + char bufl[BUF_SIZE]; + if ((left->flags & MEM_Str) != 0) { + a = left->z; + an = left->n; + } else { + assert((left->flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0); + a = &bufl[0]; + if ((left->flags & MEM_Int) != 0) + sql_snprintf(BUF_SIZE, a, "%lld", left->u.i); + else if ((left->flags & MEM_UInt) != 0) + sql_snprintf(BUF_SIZE, a, "%llu", left->u.u); + else + sql_snprintf(BUF_SIZE, a, "%!.15g", left->u.r); + an = strlen(a); + } + + char *b; + uint32_t bn; + char bufr[BUF_SIZE]; + if ((right->flags & MEM_Str) != 0) { + b = right->z; + bn = right->n; + } else { + assert((right->flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0); + b = &bufr[0]; + if ((right->flags & MEM_Int) != 0) + sql_snprintf(BUF_SIZE, b, "%lld", right->u.i); + else if ((right->flags & MEM_UInt) != 0) + sql_snprintf(BUF_SIZE, b, "%llu", right->u.u); + else + sql_snprintf(BUF_SIZE, b, "%!.15g", right->u.r); + bn = strlen(b); + } + if (coll != NULL) { + *result = coll->cmp(a, an, b, bn, coll); + return 0; + } + uint32_t minlen = MIN(an, bn); + *result = memcmp(a, b, minlen); + if (*result != 0) + return 0; + *result = an - bn; + return 0; +} + static inline bool mem_has_msgpack_subtype(struct Mem *mem) { @@ -1926,45 +2100,6 @@ sqlVdbeMemTooBig(Mem * p) return 0; } -/* - * Compare two blobs. Return negative, zero, or positive if the first - * is less than, equal to, or greater than the second, respectively. - * If one blob is a prefix of the other, then the shorter is the lessor. - */ -static SQL_NOINLINE int -sqlBlobCompare(const Mem * pB1, const Mem * pB2) -{ - int c; - int n1 = pB1->n; - int n2 = pB2->n; - - /* It is possible to have a Blob value that has some non-zero content - * followed by zero content. But that only comes up for Blobs formed - * by the OP_MakeRecord opcode, and such Blobs never get passed into - * sqlMemCompare(). - */ - assert((pB1->flags & MEM_Zero) == 0 || n1 == 0); - assert((pB2->flags & MEM_Zero) == 0 || n2 == 0); - - if ((pB1->flags | pB2->flags) & MEM_Zero) { - if (pB1->flags & pB2->flags & MEM_Zero) { - return pB1->u.nZero - pB2->u.nZero; - } else if (pB1->flags & MEM_Zero) { - if (!isAllZero(pB2->z, pB2->n)) - return -1; - return pB1->u.nZero - n2; - } else { - if (!isAllZero(pB1->z, pB1->n)) - return +1; - return n1 - pB2->u.nZero; - } - } - c = memcmp(pB1->z, pB2->z, n1 > n2 ? n2 : n1); - if (c) - return c; - return n1 - n2; -} - /* * Compare the values contained by the two memory cells, returning * negative, zero or positive if pMem1 is less than, equal to, or greater @@ -1978,6 +2113,7 @@ int sqlMemCompare(const Mem * pMem1, const Mem * pMem2, const struct coll * pColl) { int f1, f2; + int res; int combined_flags; f1 = pMem1->flags; @@ -2007,57 +2143,12 @@ sqlMemCompare(const Mem * pMem1, const Mem * pMem2, const struct coll * pColl) /* At least one of the two values is a number */ if ((combined_flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0) { - if ((f1 & f2 & MEM_Int) != 0) { - if (pMem1->u.i < pMem2->u.i) - return -1; - if (pMem1->u.i > pMem2->u.i) - return +1; - return 0; - } - if ((f1 & f2 & MEM_UInt) != 0) { - if (pMem1->u.u < pMem2->u.u) - return -1; - if (pMem1->u.u > pMem2->u.u) - return +1; - return 0; - } - if ((f1 & f2 & MEM_Real) != 0) { - if (pMem1->u.r < pMem2->u.r) - return -1; - if (pMem1->u.r > pMem2->u.r) - return +1; - return 0; - } - if ((f1 & MEM_Int) != 0) { - if ((f2 & MEM_Real) != 0) { - return double_compare_nint64(pMem2->u.r, - pMem1->u.i, -1); - } else { - return -1; - } - } - if ((f1 & MEM_UInt) != 0) { - if ((f2 & MEM_Real) != 0) { - return double_compare_uint64(pMem2->u.r, - pMem1->u.u, -1); - } else if ((f2 & MEM_Int) != 0) { - return +1; - } else { - return -1; - } - } - if ((f1 & MEM_Real) != 0) { - if ((f2 & MEM_Int) != 0) { - return double_compare_nint64(pMem1->u.r, - pMem2->u.i, 1); - } else if ((f2 & MEM_UInt) != 0) { - return double_compare_uint64(pMem1->u.r, - pMem2->u.u, 1); - } else { - return -1; - } - } - return +1; + if ((f1 & (MEM_Real | MEM_Int | MEM_UInt)) == 0) + return +1; + if ((f2 & (MEM_Real | MEM_Int | MEM_UInt)) == 0) + return -1; + mem_cmp_num(pMem1, pMem2, &res); + return res; } /* If one value is a string and the other is a blob, the string is less. @@ -2070,27 +2161,13 @@ sqlMemCompare(const Mem * pMem1, const Mem * pMem2, const struct coll * pColl) if ((f2 & MEM_Str) == 0) { return -1; } - /* The collation sequence must be defined at this point, even if - * the user deletes the collation sequence after the vdbe program is - * compiled (this was not always the case). - */ - if (pColl) { - return vdbeCompareMemString(pMem1, pMem2, pColl); - } else { - size_t n = pMem1->n < pMem2->n ? pMem1->n : pMem2->n; - int res; - res = memcmp(pMem1->z, pMem2->z, n); - if (res == 0) - res = (int)pMem1->n - (int)pMem2->n; - return res; - } - /* If a NULL pointer was passed as the collate function, fall through - * to the blob case and use memcmp(). - */ + mem_cmp_str(pMem1, pMem2, &res, pColl); + return res; } /* Both values must be blobs. Compare using memcmp(). */ - return sqlBlobCompare(pMem1, pMem2); + mem_cmp_bin(pMem1, pMem2, &res); + return res; } bool diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 9539fbbd1..7e498356b 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -364,6 +364,39 @@ mem_div(const struct Mem *left, const struct Mem *right, struct Mem *result); int mem_rem(const struct Mem *left, const struct Mem *right, struct Mem *result); +/** + * Compare two MEMs and return the result of comparison. MEMs should be of + * BOOLEAN type or their values are converted to VARBINARY according to implicit + * cast rules. Original MEMs are not changed. + */ +int +mem_cmp_bool(const struct Mem *a, const struct Mem *b, int *result); + +/** + * Compare two MEMs and return the result of comparison. MEMs should be of + * VARBINARY type or their values are converted to VARBINARY according to + * implicit cast rules. Original MEMs are not changed. + */ +int +mem_cmp_bin(const struct Mem *a, const struct Mem *b, int *result); + +/** + * Compare two MEMs and return the result of comparison. MEMs should be of + * STRING type or their values are converted to VARBINARY according to + * implicit cast rules. Original MEMs are not changed. + */ +int +mem_cmp_str(const struct Mem *left, const struct Mem *right, int *result, + const struct coll *coll); + +/** + * Compare two MEMs and return the result of comparison. MEMs should be of + * NUMBER type or their values are converted to NUMBER according to + * implicit cast rules. Original MEMs are not changed. + */ +int +mem_cmp_num(const struct Mem *a, const struct Mem *b, int *result); + /** * Simple type to str convertor. It is used to simplify * error reporting. diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index fb2a5ccc1..2fbbf32a0 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1607,15 +1607,10 @@ case OP_Le: /* same as TK_LE, jump, in1, in3 */ case OP_Gt: /* same as TK_GT, jump, in1, in3 */ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ int res, res2; /* Result of the comparison of pIn1 against pIn3 */ - u32 flags1; /* Copy of initial value of pIn1->flags */ - u32 flags3; /* Copy of initial value of pIn3->flags */ pIn1 = &aMem[pOp->p1]; pIn3 = &aMem[pOp->p3]; - flags1 = pIn1->flags; - flags3 = pIn3->flags; - enum field_type ft_p1 = pIn1->field_type; - enum field_type ft_p3 = pIn3->field_type; + enum field_type type = pOp->p5 & FIELD_TYPE_MASK; if (mem_is_any_null(pIn1, pIn3)) { /* One or both operands are NULL */ if (pOp->p5 & SQL_NULLEQ) { @@ -1649,82 +1644,54 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ } break; } - } else if (mem_is_bool(pIn1) || mem_is_bool(pIn3) || - mem_is_bin(pIn1) || mem_is_bin(pIn3)) { - if (!mem_is_same_type(pIn1, pIn3)) { - char *inconsistent_type = mem_is_bool(pIn1) || - mem_is_bin(pIn1) ? - mem_type_to_str(pIn3) : - mem_type_to_str(pIn1); - char *expected_type = mem_is_bool(pIn1) || - mem_is_bin(pIn1) ? - mem_type_to_str(pIn1) : - mem_type_to_str(pIn3); - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, - inconsistent_type, expected_type); + } else if (mem_is_bool(pIn3) || mem_is_bool(pIn1)) { + if (mem_cmp_bool(pIn3, pIn1, &res) != 0) { + char *str = !mem_is_bool(pIn3) ? + mem_type_to_str(pIn3) : + mem_type_to_str(pIn1); + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, str, + "boolean"); + goto abort_due_to_error; + } + } else if (mem_is_bin(pIn3) || mem_is_bin(pIn1)) { + if (mem_cmp_bin(pIn3, pIn1, &res) != 0) { + char *str = !mem_is_bin(pIn3) ? + mem_type_to_str(pIn3) : + mem_type_to_str(pIn1); + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, str, + "varbinary"); + goto abort_due_to_error; + } + } else if (type == FIELD_TYPE_STRING) { + if (mem_cmp_str(pIn3, pIn1, &res, pOp->p4.pColl) != 0) { + const char *str = mem_apply_type(pIn3, type) != 0 ? + mem_str(pIn3) : mem_str(pIn1); + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, str, + "string"); + goto abort_due_to_error; + } + } else if (sql_type_is_numeric(type) || mem_is_num(pIn3) || + mem_is_num(pIn1)) { + type = FIELD_TYPE_NUMBER; + if (mem_cmp_num(pIn3, pIn1, &res) != 0) { + const char *str = mem_apply_type(pIn3, type) != 0 ? + mem_str(pIn3) : mem_str(pIn1); + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, str, + "numeric"); goto abort_due_to_error; } - res = sqlMemCompare(pIn3, pIn1, NULL); } else { - enum field_type type = pOp->p5 & FIELD_TYPE_MASK; - if (sql_type_is_numeric(type)) { - if (mem_is_str(pIn1)) { - mem_apply_numeric_type(pIn1); - flags3 = pIn3->flags; - } - if (mem_is_str(pIn3)) { - if (mem_apply_numeric_type(pIn3) != 0) { - diag_set(ClientError, - ER_SQL_TYPE_MISMATCH, - mem_str(pIn3), - "numeric"); - goto abort_due_to_error; - } - } - /* Handle the common case of integer comparison here, as an - * optimization, to avoid a call to sqlMemCompare() - */ - if (mem_is_int(pIn1) && mem_is_int(pIn3)) { - if (mem_is_nint(pIn1) && mem_is_nint(pIn3)) { - if (pIn3->u.i > pIn1->u.i) - res = +1; - else if (pIn3->u.i < pIn1->u.i) - res = -1; - else - res = 0; - goto compare_op; - } - if (mem_is_uint(pIn1) && mem_is_uint(pIn3)) { - if (pIn3->u.u > pIn1->u.u) - res = +1; - else if (pIn3->u.u < pIn1->u.u) - res = -1; - else - res = 0; - goto compare_op; - } - if (mem_is_uint(pIn1) && mem_is_nint(pIn3)) { - res = -1; - goto compare_op; - } - res = 1; - goto compare_op; - } - } else if (type == FIELD_TYPE_STRING) { - if (!mem_is_str(pIn1) && mem_is_num(pIn1)) { - sqlVdbeMemStringify(pIn1); - flags1 = (pIn1->flags & ~MEM_TypeMask) | (flags1 & MEM_TypeMask); - assert(pIn1!=pIn3); - } - if (!mem_is_str(pIn3) && mem_is_num(pIn3)) { - sqlVdbeMemStringify(pIn3); - flags3 = (pIn3->flags & ~MEM_TypeMask) | (flags3 & MEM_TypeMask); - } + type = FIELD_TYPE_STRING; + assert(mem_is_str(pIn3) && mem_is_same_type(pIn3, pIn1)); + if (mem_cmp_str(pIn3, pIn1, &res, pOp->p4.pColl) != 0) { + const char *str = mem_apply_type(pIn3, type) != 0 ? + mem_str(pIn3) : mem_str(pIn1); + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, str, + "string"); + goto abort_due_to_error; } - assert(pOp->p4type==P4_COLLSEQ || pOp->p4.pColl==0); - res = sqlMemCompare(pIn3, pIn1, pOp->p4.pColl); } - compare_op: + switch( pOp->opcode) { case OP_Eq: res2 = res==0; break; case OP_Ne: res2 = res; break; @@ -1734,14 +1701,6 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ default: res2 = res>=0; break; } - /* Undo any changes made by mem_apply_type() to the input registers. */ - assert((pIn1->flags & MEM_Dyn) == (flags1 & MEM_Dyn)); - pIn1->flags = flags1; - pIn1->field_type = ft_p1; - assert((pIn3->flags & MEM_Dyn) == (flags3 & MEM_Dyn)); - pIn3->flags = flags3; - pIn3->field_type = ft_p3; - if (pOp->p5 & SQL_STOREP2) { iCompare = res; res2 = res2!=0; /* For this path res2 must be exactly 0 or 1 */