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 CA7766BD3A; Tue, 23 Mar 2021 12:46:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CA7766BD3A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616492807; bh=5+I1+V6YpGHLYhPUHrWB+A1iwau44RMOKiwa6etdY5I=; 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=ZyqKLpPLoAtaytwTALiz4u5bOtErbm+V6cwd5O9z10LCj8u6iZPUt+aETJUV5DD4p FiQb2XDP7lSeiVj2kh3oJ9WaU7TbPKZBiTwjD+DgoOG4y8pafAJ+n9712K4VHyK4hR FOEpnX7c9f04dhDa9bXVAVjYEC4/OnlqaxMsk+XU= 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 4D7B768F4E for ; Tue, 23 Mar 2021 12:35:49 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4D7B768F4E Received: by smtp38.i.mail.ru with esmtpa (envelope-from ) id 1lOdS0-0006ld-BU; Tue, 23 Mar 2021 12:35:48 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 23 Mar 2021 12:35:48 +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: 4F1203BC0FB41BD95D6E7CC48CB1F5F1C82687294EF6886B62CC997B0B8C95C4182A05F5380850403E63408D6B2099993E76EA8411A1A95B17625C698CAEA67A610D19E3D0D51C42 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE71BF69A9C8C5AF260EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063748424D8FCCA3295D8638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C686AF563A045C75ED8BEC40E4BD1808A9340FE2BAD5F5AABA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE7ABB305BD10C6E5099FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3A7AC412AE061D850117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CFD338572C1926BBA1BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B6F51BFAB6114DB69876E601842F6C81A1F004C906525384307823802FF610243DF43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B3BBE47FD9DD3FB59A8DF7F3B2552694A57739F23D657EF2B13377AFFFEAFD26923F8577A6DFFEA7CB8240EAF8EF12E6593EC92FD9297F6715571747095F342E857739F23D657EF2BD5E8D9A59859A8B67CA8FF0BA8A5FC85089D37D7C0E48F6C5571747095F342E857739F23D657EF2B6825BDBE14D8E702E4EE3A04994FF497E5BFE6E7EFDEDCD789D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24A6D60772A99906F8E1CD14B953EB46D0E56AE251DA43695355D89D7DBCDD132 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C686AF563A045C75ED8BEC40E4BD1808A9340FE2BAD5F5AAB9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3494FB0335DF05DC3AB7C0DB100A11EC4C84CB6D24E017BB8114452692BFC913A2C80401B67C673B801D7E09C32AA3244C8B1501D20D8FBA4E6C4A84F486FD2141408A6A02710B7304FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojWJZv20R+6UjjaVt2zop+nA== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306ED739D8239415446743E76EA8411A1A95BB67A942A63B4089A5105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 24/53] sql: introduce mem_set_integer() 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_set_integer(). Function mem_set_integer() clears MEM and sets it to given integer value. Part of #5818 --- src/box/sql/func.c | 6 +-- src/box/sql/mem.c | 88 ++++++++++++++++++------------------------- src/box/sql/mem.h | 21 ++++------- src/box/sql/vdbe.c | 10 ++--- src/box/sql/vdbeapi.c | 4 +- src/box/sql/vdbeaux.c | 6 +-- 6 files changed, 56 insertions(+), 79 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index b61de18d8..8f7550f30 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -278,7 +278,7 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size) mem_set_double(&val[i], field.dval); break; case MP_INT: - mem_set_i64(&val[i], field.ival); + mem_set_integer(&val[i], field.ival, true); break; case MP_UINT: mem_set_u64(&val[i], field.ival); @@ -349,7 +349,7 @@ port_c_get_vdbemem(struct port *base, uint32_t *size) mem_set_double(&val[i], mp_decode_double(&data)); break; case MP_INT: - mem_set_i64(&val[i], mp_decode_int(&data)); + mem_set_integer(&val[i], mp_decode_int(&data), true); break; case MP_UINT: mem_set_u64(&val[i], mp_decode_uint(&data)); @@ -1989,7 +1989,7 @@ sumFinalize(sql_context * context) } else if (p->approx) { sql_result_double(context, p->rSum); } else { - mem_set_int(context->pOut, p->iSum, p->is_neg); + mem_set_integer(context->pOut, p->iSum, p->is_neg); } } } diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index da2aa5c94..13a587aba 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -263,6 +263,15 @@ mem_set_null(struct Mem *mem) mem_clear(mem); } +void +mem_set_integer(struct Mem *mem, int64_t value, bool is_neg) +{ + mem_clear(mem); + mem->u.i = value; + mem->flags = is_neg ? MEM_Int : MEM_UInt; + mem->field_type = FIELD_TYPE_INTEGER; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -557,8 +566,7 @@ mem_arithmetic(const struct Mem *left, const struct Mem *right, default: unreachable(); } - result->u.i = ires; - result->flags = is_res_neg ? MEM_Int : MEM_UInt; + mem_set_integer(result, ires, is_res_neg); return 0; } @@ -571,6 +579,7 @@ mem_bitwise(struct Mem *left, struct Mem *right, struct Mem *result, int op) return 0; int64_t l; int64_t r; + int64_t res; bool unused; if (sqlVdbeIntValue(left, &l, &unused) != 0) { diag_set(ClientError, ER_SQL_TYPE_MISMATCH, @@ -583,13 +592,13 @@ mem_bitwise(struct Mem *left, struct Mem *right, struct Mem *result, int op) return -1; } if (op == OP_BitAnd) { - result->u.i = l & r; - result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt; + res = l & r; + mem_set_integer(result, res, res < 0); return 0; } if (op == OP_BitOr) { - result->u.i = l | r; - result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt; + res = l | r; + mem_set_integer(result, res, res < 0); return 0; } assert(op == OP_ShiftRight || op == OP_ShiftLeft); @@ -599,17 +608,17 @@ mem_bitwise(struct Mem *left, struct Mem *right, struct Mem *result, int op) r = r < -64 ? 64 : -r; } if (r >= 64) { - result->u.i = is_left_shift || l >= 0 ? 0 : -1; - result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt; + res = is_left_shift || l >= 0 ? 0 : -1; + mem_set_integer(result, res, res < 0); return 0; } if (is_left_shift) { - result->u.i = l << r; - result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt; + res = l << r; + mem_set_integer(result, res, res < 0); return 0; } - result->u.i = l >> r; - result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt; + res = l >> r; + mem_set_integer(result, res, res < 0); return 0; } @@ -628,7 +637,7 @@ mem_bit_not(struct Mem *mem, struct Mem *result) return -1; } i = ~i; - mem_set_int(result, i, i < 0); + mem_set_integer(result, i, i < 0); return 0; } @@ -1328,7 +1337,7 @@ mem_apply_numeric_type(struct Mem *record) int64_t integer_value; bool is_neg; if (sql_atoi64(record->z, &integer_value, &is_neg, record->n) == 0) { - mem_set_int(record, integer_value, is_neg); + mem_set_integer(record, integer_value, is_neg); return 0; } double float_value; @@ -1359,15 +1368,14 @@ vdbe_mem_numerify(struct Mem *mem) if ((mem->flags & (MEM_Int | MEM_UInt | MEM_Real | MEM_Null)) != 0) return 0; if ((mem->flags & MEM_Bool) != 0) { - mem->u.u = mem->u.b; - MemSetTypeFlag(mem, MEM_UInt); + mem_set_integer(mem, (int64_t)mem->u.b, false); return 0; } assert((mem->flags & (MEM_Blob | MEM_Str)) != 0); bool is_neg; int64_t i; if (sql_atoi64(mem->z, &i, &is_neg, mem->n) == 0) { - mem_set_int(mem, i, is_neg); + mem_set_integer(mem, i, is_neg); } else { double d; if (sqlAtoF(mem->z, &d, mem->n) == 0) @@ -1425,12 +1433,11 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type) return -1; if (type == FIELD_TYPE_UNSIGNED && is_neg) return -1; - mem_set_int(pMem, val, is_neg); + mem_set_integer(pMem, val, is_neg); return 0; } if ((pMem->flags & MEM_Bool) != 0) { - pMem->u.u = pMem->u.b; - MemSetTypeFlag(pMem, MEM_UInt); + mem_set_integer(pMem, (int64_t)pMem->u.b, false); return 0; } if ((pMem->flags & MEM_Real) != 0) { @@ -1438,7 +1445,7 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type) if (sqlVdbeRealValue(pMem, &d) != 0) return -1; if (d < (double)INT64_MAX && d >= (double)INT64_MIN) { - mem_set_int(pMem, d, d <= -1); + mem_set_integer(pMem, d, d <= -1); return 0; } if (d >= (double)INT64_MAX && d < (double)UINT64_MAX) { @@ -1494,7 +1501,7 @@ mem_apply_integer_type(Mem *pMem) assert(EIGHT_BYTE_ALIGNMENT(pMem)); if ((rc = doubleToInt64(pMem->u.r, (int64_t *) &ix)) == 0) - mem_set_int(pMem, ix, pMem->u.r <= -1); + mem_set_integer(pMem, ix, pMem->u.r <= -1); return rc; } @@ -1643,8 +1650,10 @@ mem_apply_type(struct Mem *record, enum field_type type) } else { if (double_compare_nint64(d, INT64_MIN, 1) < 0) return 0; - if ((double)(int64_t)d == d) - mem_set_int(record, (int64_t)d, true); + if ((double)(int64_t)d == d) { + mem_set_integer(record, (int64_t)d, + true); + } } return 0; } @@ -1653,7 +1662,7 @@ mem_apply_type(struct Mem *record, enum field_type type) int64_t i; if (sql_atoi64(record->z, &i, &is_neg, record->n) != 0) return -1; - mem_set_int(record, i, is_neg); + mem_set_integer(record, i, is_neg); } if ((record->flags & MEM_Int) == MEM_Int) { if (type == FIELD_TYPE_UNSIGNED) @@ -1777,9 +1786,9 @@ mem_convert_to_integer(struct Mem *mem) if (d >= (double)UINT64_MAX || d < (double)INT64_MIN) return -1; if (d < (double)INT64_MAX) - mem_set_int(mem, (int64_t) d, d < 0); + mem_set_integer(mem, (int64_t) d, d < 0); else - mem_set_int(mem, (uint64_t) d, false); + mem_set_integer(mem, (uint64_t) d, false); return 0; } @@ -1898,16 +1907,6 @@ mem_set_ptr(struct Mem *mem, void *ptr) mem->u.p = ptr; } -void -mem_set_i64(struct Mem *mem, int64_t value) -{ - mem_clear(mem); - mem->u.i = value; - int flag = value < 0 ? MEM_Int : MEM_UInt; - MemSetTypeFlag(mem, flag); - mem->field_type = FIELD_TYPE_INTEGER; -} - void mem_set_u64(struct Mem *mem, uint64_t value) { @@ -1917,21 +1916,6 @@ mem_set_u64(struct Mem *mem, uint64_t value) mem->field_type = FIELD_TYPE_UNSIGNED; } -void -mem_set_int(struct Mem *mem, int64_t value, bool is_neg) -{ - mem_clear(mem); - if (is_neg) { - assert(value < 0); - mem->u.i = value; - MemSetTypeFlag(mem, MEM_Int); - } else { - mem->u.u = value; - MemSetTypeFlag(mem, MEM_UInt); - } - mem->field_type = FIELD_TYPE_INTEGER; -} - void mem_set_double(struct Mem *mem, double value) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index dc0d4a284..0fd902274 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -166,6 +166,13 @@ mem_destroy(struct Mem *mem); void mem_set_null(struct Mem *mem); +/** + * Set integer value. According to is_neg flag value is considered + * to be signed or unsigned. + */ +void +mem_set_integer(struct Mem *mem, int64_t value, bool is_neg); + /** * Copy content of MEM from one MEM to another. In case source MEM contains * string or binary and allocation type is not STATIC, this value is copied to @@ -409,24 +416,10 @@ mem_set_bool(struct Mem *mem, bool value); void mem_set_ptr(struct Mem *mem, void *ptr); -/** - * Set integer value. Depending on its sign MEM_Int (in case - * of negative value) or MEM_UInt flag is set. - */ -void -mem_set_i64(struct Mem *mem, int64_t value); - /** Set unsigned value and MEM_UInt flag. */ void mem_set_u64(struct Mem *mem, uint64_t value); -/** - * Set integer value. According to is_neg flag value is considered - * to be signed or unsigned. - */ -void -mem_set_int(struct Mem *mem, int64_t value, bool is_neg); - /** Set double value and MEM_Real flag. */ void mem_set_double(struct Mem *mem, double value); diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index f0b56033a..92845d66d 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -731,7 +731,7 @@ case OP_Halt: { */ case OP_Integer: { /* out2 */ pOut = vdbe_prepare_null_out(p, pOp->p2); - mem_set_i64(pOut, pOp->p1); + mem_set_integer(pOut, pOp->p1, pOp->p1 < 0); break; } @@ -756,7 +756,7 @@ case OP_Bool: { /* out2 */ case OP_Int64: { /* out2 */ pOut = vdbe_prepare_null_out(p, pOp->p2); assert(pOp->p4.pI64!=0); - mem_set_int(pOut, *pOp->p4.pI64, pOp->p4type == P4_INT64); + mem_set_integer(pOut, *pOp->p4.pI64, pOp->p4type == P4_INT64); break; } @@ -2708,7 +2708,7 @@ skip_truncate: r.nField = (u16)nField; if (int_field > 0) - mem_set_int(&aMem[int_field], iKey, is_neg); + mem_set_integer(&aMem[int_field], iKey, is_neg); r.default_rc = ((1 & (oc - OP_SeekLT)) ? -1 : +1); assert(oc!=OP_SeekGT || r.default_rc==-1); @@ -2999,8 +2999,8 @@ case OP_FCopy: { /* out2 */ assert(mem_is_integer(pIn1)); pOut = vdbe_prepare_null_out(p, pOp->p2); - mem_set_int(pOut, pIn1->u.i, pIn1->flags == MEM_Int); - pOut->field_type = pIn1->field_type; + if (mem_copy(pOut, pIn1) != 0) + goto abort_due_to_error; } break; } diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 76af333e8..b0f1f202f 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -189,7 +189,7 @@ sql_result_uint(sql_context *ctx, uint64_t u_val) void sql_result_int(sql_context *ctx, int64_t val) { - mem_set_i64(ctx->pOut, val); + mem_set_integer(ctx->pOut, val, val < 0); } void @@ -840,7 +840,7 @@ sql_bind_int64(sql_stmt * pStmt, int i, sql_int64 iValue) return -1; int rc = sql_bind_type(p, i, "integer"); assert(iValue < 0); - mem_set_int(&p->aVar[i - 1], iValue, true); + mem_set_integer(&p->aVar[i - 1], iValue, true); return rc; } diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 9d07358e6..3d1f094b8 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -1324,13 +1324,13 @@ sqlVdbeList(Vdbe * p) } } - mem_set_i64(pMem, pOp->p1); + mem_set_integer(pMem, pOp->p1, pOp->p1 < 0); pMem++; - mem_set_i64(pMem, pOp->p2); + mem_set_integer(pMem, pOp->p2, pOp->p2 < 0); pMem++; - mem_set_i64(pMem, pOp->p3); + mem_set_integer(pMem, pOp->p3, pOp->p3 < 0); pMem++; if (sqlVdbeMemClearAndResize(pMem, 256)) { -- 2.25.1