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 BC1FA68F42; Tue, 23 Mar 2021 12:44:18 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BC1FA68F42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616492658; bh=EgwOa0tld4iIX12PzJ3T/m3SXbPW9oYIQ08m9pn4Te8=; 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=wjEYJWpb00wwbt7TknHzp+dYxc/QtAz9SwDRuUuXtZYmfgjprRPH2yeVL0pZTtdgR CZUtPKhGopqFDzeDYa5u8CcprrLildSXH7Z5QZFqkHoFyEs/Pt99svSPh+dySMEUUa xRSrNsxOXYC4KeiZ871fUudiTwXHc9qs6D2y38nE= Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (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 5570868F48 for ; Tue, 23 Mar 2021 12:35:35 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5570868F48 Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1lOdRm-0004dI-D7; Tue, 23 Mar 2021 12:35:34 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 23 Mar 2021 12:35:34 +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: 4F1203BC0FB41BD95D6E7CC48CB1F5F1C82687294EF6886B62CC997B0B8C95C4182A05F5380850400E79689EE90AE76A3C1B1BCDD526C350B53A75CFB3E0047991273A893F78B9B9 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73F300A97FDD4E158EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063795DC1BB912715AE68638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C686AF563A045C75E6C27A4EA6ED178190A3FC239B009012BA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE767883B903EA3BAEA9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C362968DCAA3E4B45B117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CF4B26726BD97DF1CFBA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B613302629575AB2B876E601842F6C81A1F004C906525384307823802FF610243DF43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B3BBE47FD9DD3FB59A8DF7F3B2552694A57739F23D657EF2B13377AFFFEAFD26923F8577A6DFFEA7CE0F3BA37685B2B9093EC92FD9297F6715571747095F342E857739F23D657EF2BD5E8D9A59859A8B6B67FC62909E22F84089D37D7C0E48F6C5571747095F342E857739F23D657EF2B6825BDBE14D8E702E4EE3A04994FF497E5BFE6E7EFDEDCD789D4C264860C145E X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C686AF563A045C75E6C27A4EA6ED178190A3FC239B009012B9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C264B329661203DAD87C3BB6EF2689DCC905DF4E8590B35504CCE06BC4218F5AE9DB9F2DB21A24861D7E09C32AA3244CE34B8F92F0A488D5E10AC8008F02EDE9F94338140B71B8EEFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojWJZv20R+6UiQsnTdD+wdOg== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306ED66AFE1B8470755B13C1B1BCDD526C35049EBE2174CCC94795105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 19/53] 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: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch introduces mem_compare(). Function mem_compare() compares the first and the second MEMs and returns result of comparison. Part of #5818 --- src/box/sql/mem.c | 241 +++++++++++++++++++++++++++++++++++++++++++++ src/box/sql/mem.h | 4 + src/box/sql/vdbe.c | 92 +---------------- 3 files changed, 247 insertions(+), 90 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 6120939d8..8119644ed 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -556,6 +556,247 @@ mem_arithmetic(const struct Mem *left, const struct Mem *right, return 0; } +static int +compare_blobs(const struct Mem *left, const struct Mem *right, int *result) +{ + int nl = left->n; + int nr = right->n; + int minlen = MIN(nl, nr); + + /* + * 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((left->flags & MEM_Zero) == 0 || nl == 0); + assert((right->flags & MEM_Zero) == 0 || nr == 0); + + if (left->flags & right->flags & MEM_Zero) { + *result = left->u.nZero - right->u.nZero; + return 0; + } + if (left->flags & MEM_Zero) { + for (int i = 0; i < minlen; ++i) { + if (right->z[i] != 0) { + *result = -1; + return 0; + } + } + *result = left->u.nZero - nr; + return 0; + } + if (right->flags & MEM_Zero) { + for (int i = 0; i < minlen; ++i) { + if (left->z[i] != 0){ + *result = 1; + return 0; + } + } + *result = right->u.nZero - nl; + return 0; + } + *result = memcmp(left->z, right->z, minlen); + if (*result != 0) + return 0; + *result = nl - nr; + return 0; +} + +static int +compare_numbers(const struct Mem *left, const struct Mem *right, int *result) +{ + int64_t il; + double dl; + int left_type = left->flags & (MEM_Int | MEM_UInt | MEM_Real); + if (left_type == MEM_Real) { + dl = left->u.r; + } else if (left_type != 0) { + il = left->u.i; + } else if ((left->flags & MEM_Str) != 0) { + bool is_l_neg; + if (sql_atoi64(left->z, &il, &is_l_neg, left->n) == 0) + left_type = is_l_neg ? MEM_Int : MEM_UInt; + else if (sqlAtoF(left->z, &dl, left->n) != 0) + left_type = MEM_Real; + } + if (left_type == 0) { + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, + mem_str(left), "numeric"); + return -1; + } + + int64_t ir; + double dr; + int right_type = right->flags & (MEM_Int | MEM_UInt | MEM_Real); + if (right_type == MEM_Real) { + dr = right->u.r; + } else if (right_type != 0) { + ir = right->u.i; + } else if ((right->flags & MEM_Str) != 0) { + bool is_r_neg; + if (sql_atoi64(right->z, &ir, &is_r_neg, right->n) == 0) + right_type = is_r_neg ? MEM_Int : MEM_UInt; + else if (sqlAtoF(right->z, &dr, right->n) != 0) + right_type = MEM_Real; + } + /* TODO: There should be check for rvalue type. */ + if (right_type == 0) { + *result = -1; + return 0; + } + if (left_type == right_type) { + if (left_type == MEM_Real) { + if (dl > dr) + *result = 1; + else if (dl < dr) + *result = -1; + else + *result = 0; + return 0; + } + if (left_type == MEM_Int) { + if (il > ir) + *result = 1; + else if (il < ir) + *result = -1; + else + *result = 0; + return 0; + } + uint64_t ul = (uint64_t)il; + uint64_t ur = (uint64_t)ir; + if (ul > ur) + *result = 1; + else if (ul < ur) + *result = -1; + else + *result = 0; + return 0; + } + if (left_type == MEM_Real) { + if (right_type == MEM_Int) { + *result = double_compare_nint64(dl, ir, 1); + return 0; + } + *result = double_compare_uint64(dl, (uint64_t)ir, 1); + return 0; + } + if (right_type == MEM_Real) { + if (left_type == MEM_Int) { + *result = double_compare_nint64(dr, il, -1); + return 0; + } + *result = double_compare_uint64(dr, (uint64_t)il, -1); + return 0; + } + if (left_type == MEM_Int) { + *result = -1; + return 0; + } + assert(right_type == MEM_Int && left_type == MEM_UInt); + *result = 1; + return 0; +} + +static int +compare_strings(const struct Mem *left, const struct Mem *right, int *result, + struct coll *coll) +{ + char *sl; + uint32_t nl; + char bufl[BUF_SIZE]; + if ((left->flags & MEM_Str) != 0) { + sl = left->z; + nl = left->n; + } else { + assert((left->flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0); + sl = &bufl[0]; + if ((left->flags & MEM_Int) != 0) + sql_snprintf(BUF_SIZE, sl, "%lld", left->u.i); + else if ((left->flags & MEM_UInt) != 0) + sql_snprintf(BUF_SIZE, sl, "%llu", left->u.u); + else + sql_snprintf(BUF_SIZE, sl, "%!.15g", left->u.r); + nl = strlen(sl); + } + + char *sr; + uint32_t nr; + char bufr[BUF_SIZE]; + if ((right->flags & MEM_Str) != 0) { + sr = right->z; + nr = right->n; + } else { + assert((right->flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0); + sr = &bufr[0]; + if ((right->flags & MEM_Int) != 0) + sql_snprintf(BUF_SIZE, sr, "%lld", right->u.i); + else if ((right->flags & MEM_UInt) != 0) + sql_snprintf(BUF_SIZE, sr, "%llu", right->u.u); + else + sql_snprintf(BUF_SIZE, sr, "%!.15g", right->u.r); + nr = strlen(sr); + } + if (coll) { + *result = coll->cmp(sl, nl, sr, nr, coll); + return 0; + } + uint32_t minlen = MIN(nl, nr); + *result = memcmp(sl, sr, minlen); + if (*result != 0) + return 0; + *result = nl - nr; + return 0; +} + +int +mem_compare(const struct Mem *left, const struct Mem *right, int *result, + enum field_type type, struct coll *coll) +{ + assert(((left->flags | right->flags) & MEM_Null) == 0); + if ((right->flags & MEM_Bool) != 0) { + if ((left->flags & MEM_Bool) != 0) { + if (left->u.b == right->u.b) + *result = 0; + else if (left->u.b) + *result = 1; + else + *result = -1; + return 0; + } + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, + mem_type_to_str(left), "boolean"); + return -1; + } + if ((left->flags & MEM_Bool) != 0) { + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, + mem_type_to_str(right), "boolean"); + return -1; + } + if ((right->flags & MEM_Blob) != 0) { + if ((left->flags & MEM_Blob) != 0) + return compare_blobs(left, right, result); + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, + mem_type_to_str(left), "varbinary"); + return -1; + } + if ((left->flags & MEM_Blob) != 0) { + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, + mem_type_to_str(right), "varbinary"); + return -1; + } + if (sql_type_is_numeric(type)) + return compare_numbers(left, right, result); + if (type == FIELD_TYPE_STRING) + return compare_strings(left, right, result, coll); + if (((left->flags | right->flags) & + (MEM_Int | MEM_UInt | MEM_Real)) != 0) + return compare_numbers(left, right, result); + assert((left->flags & MEM_Str) != 0 && (right->flags & MEM_Str) != 0); + return compare_strings(left, right, result, coll); +} + static inline bool mem_has_msgpack_subtype(struct Mem *mem) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 7cea07dc9..096ce6533 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -196,6 +196,10 @@ int mem_arithmetic(const struct Mem *left, const struct Mem *right, struct Mem *result, int op); +int +mem_compare(const struct Mem *left, const struct Mem *right, int *result, + enum field_type type, struct coll *coll); + /* One or more of the following flags are set to indicate the validOK * representations of the value stored in the Mem struct. * diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 55cb42932..726066c17 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1543,15 +1543,9 @@ 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; if (mem_is_null(pIn1) || mem_is_null(pIn3)) { /* One or both operands are NULL */ if (pOp->p5 & SQL_NULLEQ) { @@ -1585,85 +1579,11 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ } break; } - } else if (mem_is_boolean(pIn1) || mem_is_boolean(pIn3) || - mem_is_binary(pIn1) || mem_is_binary(pIn3)) { - if (!mem_is_same_type(pIn1, pIn3)) { - char *inconsistent_type = mem_is_boolean(pIn1) || - mem_is_binary(pIn1) ? - mem_type_to_str(pIn3) : - mem_type_to_str(pIn1); - char *expected_type = mem_is_boolean(pIn1) || - mem_is_binary(pIn1) ? - mem_type_to_str(pIn1) : - mem_type_to_str(pIn3); - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, - inconsistent_type, expected_type); - 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_string(pIn1)) { - mem_apply_numeric_type(pIn1); - flags3 = pIn3->flags; - } - if (mem_is_string(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_integer(pIn1) && mem_is_integer(pIn3)) { - if (!mem_is_unsigned(pIn1) && - !mem_is_unsigned(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_unsigned(pIn1) && - mem_is_unsigned(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_unsigned(pIn1) && - !mem_is_unsigned(pIn3)) { - res = -1; - goto compare_op; - } - res = 1; - goto compare_op; - } - } else if (type == FIELD_TYPE_STRING) { - if (!mem_is_string(pIn1) && mem_is_number(pIn1)) { - sqlVdbeMemStringify(pIn1); - flags1 = (pIn1->flags & ~MEM_TypeMask) | (flags1 & MEM_TypeMask); - assert(pIn1!=pIn3); - } - if (!mem_is_string(pIn3) && mem_is_number(pIn3)) { - sqlVdbeMemStringify(pIn3); - flags3 = (pIn3->flags & ~MEM_TypeMask) | (flags3 & MEM_TypeMask); - } - } - assert(pOp->p4type==P4_COLLSEQ || pOp->p4.pColl==0); - res = sqlMemCompare(pIn3, pIn1, pOp->p4.pColl); + if (mem_compare(pIn3, pIn1, &res, type, pOp->p4.pColl)) + goto abort_due_to_error; } - compare_op: switch( pOp->opcode) { case OP_Eq: res2 = res==0; break; case OP_Ne: res2 = res; break; @@ -1673,14 +1593,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 */ -- 2.25.1