[Tarantool-patches] [PATCH v4 25/53] sql: introduce mem_set_unsigned()
imeevma at tarantool.org
imeevma at tarantool.org
Tue Mar 23 12:35:49 MSK 2021
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
More information about the Tarantool-patches
mailing list