From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v4 25/53] sql: introduce mem_set_unsigned() Date: Tue, 23 Mar 2021 12:35:49 +0300 [thread overview] Message-ID: <5878a78644e78681690c8404677fbd069776059c.1616491731.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1616491730.git.imeevma@gmail.com> This patch introduces mem_set_unsigned(). Function mem_set_unsigned() clears MEM and sets it to given unsigned value. Part of #5818 --- src/box/sql/func.c | 4 ++-- src/box/sql/mem.c | 24 ++++++++++++------------ src/box/sql/mem.h | 7 +++---- src/box/sql/vdbe.c | 22 +++++++++++----------- src/box/sql/vdbeapi.c | 4 ++-- src/box/sql/vdbeaux.c | 2 +- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 8f7550f30..d524c3d1e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -281,7 +281,7 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size) mem_set_integer(&val[i], field.ival, true); break; case MP_UINT: - mem_set_u64(&val[i], field.ival); + mem_set_unsigned(&val[i], field.ival); break; case MP_STR: if (sqlVdbeMemSetStr(&val[i], field.sval.data, @@ -352,7 +352,7 @@ port_c_get_vdbemem(struct port *base, uint32_t *size) mem_set_integer(&val[i], mp_decode_int(&data), true); break; case MP_UINT: - mem_set_u64(&val[i], mp_decode_uint(&data)); + mem_set_unsigned(&val[i], mp_decode_uint(&data)); break; case MP_STR: str = mp_decode_str(&data, &len); diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 13a587aba..f7a1a9b8a 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -272,6 +272,15 @@ mem_set_integer(struct Mem *mem, int64_t value, bool is_neg) mem->field_type = FIELD_TYPE_INTEGER; } +void +mem_set_unsigned(struct Mem *mem, uint64_t value) +{ + mem_clear(mem); + mem->u.u = value; + mem->flags = MEM_UInt; + mem->field_type = FIELD_TYPE_UNSIGNED; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -1449,7 +1458,7 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type) return 0; } if (d >= (double)INT64_MAX && d < (double)UINT64_MAX) { - mem_set_u64(pMem, d); + mem_set_unsigned(pMem, d); return 0; } return -1; @@ -1646,7 +1655,7 @@ mem_apply_type(struct Mem *record, enum field_type type) 1) > 0) return 0; if ((double)(uint64_t)d == d) - mem_set_u64(record, (uint64_t)d); + mem_set_unsigned(record, (uint64_t)d); } else { if (double_compare_nint64(d, INT64_MIN, 1) < 0) return 0; @@ -1765,7 +1774,7 @@ mem_convert_to_unsigned(struct Mem *mem) double d = mem->u.r; if (d < 0.0 || d >= (double)UINT64_MAX) return -1; - mem_set_u64(mem, (uint64_t) d); + mem_set_unsigned(mem, (uint64_t) d); return 0; } @@ -1907,15 +1916,6 @@ mem_set_ptr(struct Mem *mem, void *ptr) mem->u.p = ptr; } -void -mem_set_u64(struct Mem *mem, uint64_t value) -{ - mem_clear(mem); - mem->u.u = value; - MemSetTypeFlag(mem, MEM_UInt); - mem->field_type = FIELD_TYPE_UNSIGNED; -} - void mem_set_double(struct Mem *mem, double value) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 0fd902274..8090fb9a0 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -173,6 +173,9 @@ mem_set_null(struct Mem *mem); void mem_set_integer(struct Mem *mem, int64_t value, bool is_neg); +void +mem_set_unsigned(struct Mem *mem, uint64_t value); + /** * 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 @@ -416,10 +419,6 @@ mem_set_bool(struct Mem *mem, bool value); void mem_set_ptr(struct Mem *mem, void *ptr); -/** Set unsigned value and MEM_UInt flag. */ -void -mem_set_u64(struct Mem *mem, uint64_t value); - /** 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 92845d66d..dd196d299 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -577,7 +577,7 @@ case OP_Gosub: { /* jump */ pIn1 = &aMem[pOp->p1]; assert(VdbeMemDynamic(pIn1)==0); memAboutToChange(p, pIn1); - mem_set_u64(pIn1, pOp - aOp); + mem_set_unsigned(pIn1, pOp - aOp); REGISTER_TRACE(p, pOp->p1, pIn1); /* Most jump operations do a goto to this spot in order to update @@ -618,7 +618,7 @@ case OP_InitCoroutine: { /* jump */ assert(pOp->p3>0 && pOp->p3<p->nOp); pOut = &aMem[pOp->p1]; assert(!VdbeMemDynamic(pOut)); - mem_set_u64(pOut, pOp->p3 - 1); + mem_set_unsigned(pOut, pOp->p3 - 1); if (pOp->p2) goto jump_to_p2; break; } @@ -661,7 +661,7 @@ case OP_Yield: { /* in1, jump */ pIn1 = &aMem[pOp->p1]; assert(VdbeMemDynamic(pIn1)==0); int pcDest = (int)pIn1->u.u; - mem_set_u64(pIn1, pOp - aOp); + mem_set_unsigned(pIn1, pOp - aOp); REGISTER_TRACE(p, pOp->p1, pIn1); pOp = &aOp[pcDest]; break; @@ -2142,7 +2142,7 @@ case OP_Count: { /* out2 */ nEntry = tarantoolsqlEphemeralCount(pCrsr); } pOut = vdbe_prepare_null_out(p, pOp->p2); - mem_set_u64(pOut, nEntry); + mem_set_unsigned(pOut, nEntry); break; } @@ -2920,7 +2920,7 @@ case OP_Sequence: { /* out2 */ assert(p->apCsr[pOp->p1]!=0); pOut = vdbe_prepare_null_out(p, pOp->p2); int64_t seq_val = p->apCsr[pOp->p1]->seqCount++; - mem_set_u64(pOut, seq_val); + mem_set_unsigned(pOut, seq_val); break; } @@ -2936,7 +2936,7 @@ case OP_NextSequenceId: { uint64_t id = 0; tarantoolSqlNextSeqId(&id); id++; - mem_set_u64(pOut, id); + mem_set_unsigned(pOut, id); break; } @@ -2966,7 +2966,7 @@ case OP_NextIdEphemeral: { goto abort_due_to_error; } pOut = vdbe_prepare_null_out(p, pOp->p2); - mem_set_u64(pOut, rowid); + mem_set_unsigned(pOut, rowid); break; } @@ -4234,7 +4234,7 @@ case OP_OffsetLimit: { /* in1, out2, in3 */ "values should not result in integer overflow"); goto abort_due_to_error; } - mem_set_u64(pOut, x); + mem_set_unsigned(pOut, x); break; } @@ -4490,10 +4490,10 @@ case OP_Init: { /* jump */ case OP_IncMaxid: { assert(pOp->p1 > 0); pOut = vdbe_prepare_null_out(p, pOp->p1); - - if (tarantoolsqlIncrementMaxid(&pOut->u.u) != 0) + uint64_t u; + if (tarantoolsqlIncrementMaxid(&u) != 0) goto abort_due_to_error; - pOut->flags = MEM_UInt; + mem_set_unsigned(pOut, u); break; } diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index b0f1f202f..0f41db21d 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -183,7 +183,7 @@ sql_result_double(sql_context * pCtx, double rVal) void sql_result_uint(sql_context *ctx, uint64_t u_val) { - mem_set_u64(ctx->pOut, u_val); + mem_set_unsigned(ctx->pOut, u_val); } void @@ -851,7 +851,7 @@ sql_bind_uint64(struct sql_stmt *stmt, int i, uint64_t value) if (vdbeUnbind(p, i) != 0) return -1; int rc = sql_bind_type(p, i, "integer"); - mem_set_u64(&p->aVar[i - 1], value); + mem_set_unsigned(&p->aVar[i - 1], value); return rc; } diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index 3d1f094b8..c4cf1109f 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -1291,7 +1291,7 @@ sqlVdbeList(Vdbe * p) } if (p->explain == 1) { assert(i >= 0); - mem_set_u64(pMem, i); + mem_set_unsigned(pMem, i); pMem++; -- 2.25.1
next prev parent reply other threads:[~2021-03-23 9:47 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-23 9:34 [Tarantool-patches] [PATCH v4 00/53] Move mem-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 01/53] sql: enchance vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches 2021-03-29 22:57 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 02/53] sql: disable unused code in sql/analyze.c Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 03/53] sql: disable unused code in sql/legacy.c Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 04/53] sql: remove NULL-termination in OP_ResultRow Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 05/53] sql: move MEM-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 06/53] sql: remove unused MEM-related functions Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 07/53] sql: disable unused code in sql/vdbemem.c Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 08/53] sql: introduce mem_str() Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 09/53] sql: introduce mem_create() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 10/53] sql: introduce mem_destroy() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 11/53] sql: introduce mem_is_*() functions() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 12/53] sql: introduce mem_copy() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 13/53] sql: introduce mem_copy_as_ephemeral() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 14/53] sql: rework mem_move() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 15/53] sql: rework vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches 2021-03-29 23:02 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 16/53] sql: remove sql_column_to_messagepack() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 17/53] sql: introduce mem_concat() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 18/53] sql: introduce mem_arithmetic() Mergen Imeev via Tarantool-patches 2021-03-29 23:02 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 19/53] sql: introduce mem_compare() Mergen Imeev via Tarantool-patches 2021-03-29 23:03 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 20/53] sql: introduce mem_bitwise() Mergen Imeev via Tarantool-patches 2021-03-29 23:03 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 21/53] sql: introduce mem_bit_not() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 22/53] sql: Initialize MEM in sqlVdbeAllocUnpackedRecord() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 23/53] sql: introduce mem_set_null() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 24/53] sql: introduce mem_set_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` Mergen Imeev via Tarantool-patches [this message] 2021-03-29 23:04 ` [Tarantool-patches] [PATCH v4 25/53] sql: introduce mem_set_unsigned() Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 26/53] sql: introduce mem_set_boolean() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 27/53] sql: refactor mem_set_double() Mergen Imeev via Tarantool-patches 2021-03-29 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 28/53] sql: refactor mem_set_*_string() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 29/53] sql: introduce mem_copy_string() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 30/53] sql: introduce mem_set_*_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 31/53] sql: introduce mem_copy_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 32/53] sql: introduce mem_set_zerobinary() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 33/53] sql: introduce mem_append_to_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-09 19:52 ` Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 34/53] sql: introduce mem_set_*_map() and mem_set_*_array() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 35/53] sql: introduce mem_set_undefined() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 36/53] sql: introduce mem_set_pointer() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 37/53] sql: introduce mem_set_frame() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 38/53] sql: introduce mem_*_aggregate() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 39/53] sql: introduce mem_set_cleared() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 40/53] sql: move MEM flags to mem.c Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 41/53] sql: introduce mem_convert_to_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 42/53] sql: introduce mem_convert_to_double() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 43/53] sql: introduce mem_convert_to_number() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 44/53] sql: introduce mem_convert_to_string() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 45/53] sql: introduce mem_explicit_cast() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 46/53] sql: introduce mem_implicit_cast() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 47/53] sql: introduce mem_get_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 48/53] sql: introduce mem_get_unsigned() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 49/53] sql: introduce mem_get_double() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 50/53] sql: introduce mem_get_boolean() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 51/53] sql: introduce mem_get_string0() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 52/53] sql: introduce mem_get_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:09 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 53/53] sql: introduce mem_get_length() Mergen Imeev via Tarantool-patches 2021-03-29 23:09 ` Vladislav Shpilevoy via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=5878a78644e78681690c8404677fbd069776059c.1616491731.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=tsafin@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v4 25/53] sql: introduce mem_set_unsigned()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox