[Tarantool-patches] [PATCH v5 23/52] sql: introduce mem_set_null()
imeevma at tarantool.org
imeevma at tarantool.org
Fri Apr 9 21:11:44 MSK 2021
This patch introduces mem_set_null(). This function clears MEM and sets
it to NULL.
Part of #5818
---
src/box/sql/mem.c | 64 +++++++++++++++++++------------------------
src/box/sql/mem.h | 7 +++--
src/box/sql/vdbe.c | 14 ++++------
src/box/sql/vdbeapi.c | 4 +--
4 files changed, 40 insertions(+), 49 deletions(-)
diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
index aeb801c7c..937fa3272 100644
--- a/src/box/sql/mem.c
+++ b/src/box/sql/mem.c
@@ -267,6 +267,12 @@ mem_destroy(struct Mem *mem)
mem->zMalloc = NULL;
}
+void
+mem_set_null(struct Mem *mem)
+{
+ mem_clear(mem);
+}
+
int
mem_copy(struct Mem *to, const struct Mem *from)
{
@@ -2058,24 +2064,6 @@ sqlVdbeMemSetStr(Mem * pMem, /* Memory cell to set to string value */
return 0;
}
-/*
- * Delete any previous value and set the value stored in *pMem to NULL.
- *
- * This routine calls the Mem.xDel destructor to dispose of values that
- * require the destructor. But it preserves the Mem.zMalloc memory allocation.
- * To free all resources, use mem_destroy(), which both calls this
- * routine to invoke the destructor and deallocates Mem.zMalloc.
- *
- * Use this routine to reset the Mem prior to insert a new value.
- *
- * Use mem_destroy() to complete erase the Mem prior to abandoning it.
- */
-void
-sqlVdbeMemSetNull(Mem * pMem)
-{
- mem_clear(pMem);
-}
-
/*
* Delete any previous value and set the value to be a BLOB of length
* n containing all zeros.
@@ -2106,12 +2094,6 @@ sqlValueSetStr(sql_value * v, /* Value to be set */
sqlVdbeMemSetStr((Mem *) v, z, n, 1, xDel);
}
-void
-sqlValueSetNull(sql_value * p)
-{
- sqlVdbeMemSetNull((Mem *) p);
-}
-
/*
* Free an sql_value object
*/
@@ -3001,21 +2983,27 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size)
NULL, -1 - i, &field) < 0) {
goto error;
}
+ mem_clear(&val[i]);
switch (field.type) {
case MP_BOOL:
- mem_set_bool(&val[i], field.bval);
+ val[i].flags = MEM_Bool;
+ val[i].u.b = field.bval;
break;
case MP_FLOAT:
- mem_set_double(&val[i], field.fval);
+ val[i].flags = MEM_Real;
+ val[i].u.r = field.fval;
break;
case MP_DOUBLE:
- mem_set_double(&val[i], field.dval);
+ val[i].flags = MEM_Real;
+ val[i].u.r = field.dval;
break;
case MP_INT:
- mem_set_i64(&val[i], field.ival);
+ val[i].flags = MEM_Int;
+ val[i].u.i = field.ival;
break;
case MP_UINT:
- mem_set_u64(&val[i], field.ival);
+ val[i].flags = MEM_UInt;
+ val[i].u.i = field.ival;
break;
case MP_STR:
if (sqlVdbeMemSetStr(&val[i], field.sval.data,
@@ -3024,7 +3012,6 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size)
goto error;
break;
case MP_NIL:
- sqlVdbeMemSetNull(&val[i]);
break;
default:
diag_set(ClientError, ER_SQL_EXECUTE,
@@ -3071,22 +3058,28 @@ port_c_get_vdbemem(struct port *base, uint32_t *size)
data = pe->mp;
}
uint32_t len;
+ mem_clear(&val[i]);
const char *str;
switch (mp_typeof(*data)) {
case MP_BOOL:
- mem_set_bool(&val[i], mp_decode_bool(&data));
+ val[i].flags = MEM_Bool;
+ val[i].u.b = mp_decode_bool(&data);
break;
case MP_FLOAT:
- mem_set_double(&val[i], mp_decode_float(&data));
+ val[i].flags = MEM_Real;
+ val[i].u.r = mp_decode_float(&data);
break;
case MP_DOUBLE:
- mem_set_double(&val[i], mp_decode_double(&data));
+ val[i].flags = MEM_Real;
+ val[i].u.r = mp_decode_double(&data);
break;
case MP_INT:
- mem_set_i64(&val[i], mp_decode_int(&data));
+ val[i].flags = MEM_Int;
+ val[i].u.i = mp_decode_int(&data);
break;
case MP_UINT:
- mem_set_u64(&val[i], mp_decode_uint(&data));
+ val[i].flags = MEM_UInt;
+ val[i].u.u = mp_decode_uint(&data);
break;
case MP_STR:
str = mp_decode_str(&data, &len);
@@ -3095,7 +3088,6 @@ port_c_get_vdbemem(struct port *base, uint32_t *size)
goto error;
break;
case MP_NIL:
- sqlVdbeMemSetNull(&val[i]);
break;
default:
diag_set(ClientError, ER_SQL_EXECUTE,
diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h
index e3b55644e..581ef007a 100644
--- a/src/box/sql/mem.h
+++ b/src/box/sql/mem.h
@@ -162,6 +162,10 @@ mem_create(struct Mem *mem);
void
mem_destroy(struct Mem *mem);
+/** Clear MEM and set it to NULL. */
+void
+mem_set_null(struct Mem *mem);
+
/**
* 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
@@ -468,12 +472,9 @@ mem_set_double(struct Mem *mem, double value);
int
sqlVdbeMemSetStr(struct Mem *, const char *, int, u8, void (*)(void *));
void
-sqlVdbeMemSetNull(struct Mem *);
-void
sqlVdbeMemSetZeroBlob(struct Mem *, int);
void sqlValueSetStr(struct Mem *, int, const void *,
void (*)(void *));
-void sqlValueSetNull(struct Mem *);
void sqlValueFree(struct Mem *);
struct Mem *sqlValueNew(struct sql *);
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index 2ad681fa4..c7d21ddd5 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -276,7 +276,7 @@ vdbe_prepare_null_out(struct Vdbe *v, int n)
assert(n <= (v->nMem + 1 - v->nCursor));
struct Mem *out = &v->aMem[n];
memAboutToChange(v, out);
- sqlVdbeMemSetNull(out);
+ mem_set_null(out);
out->field_type = field_type_MAX;
return out;
}
@@ -862,19 +862,17 @@ case OP_String: { /* out2 */
*/
case OP_Null: { /* out2 */
int cnt;
- u16 nullFlag;
pOut = vdbe_prepare_null_out(p, pOp->p2);
cnt = pOp->p3-pOp->p2;
assert(pOp->p3<=(p->nMem+1 - p->nCursor));
- pOut->flags = nullFlag = pOp->p1 ? (MEM_Null|MEM_Cleared) : MEM_Null;
- pOut->n = 0;
+ if (pOp->p1 != 0)
+ pOut->flags = MEM_Null | MEM_Cleared;
while( cnt>0) {
pOut++;
memAboutToChange(p, pOut);
- sqlVdbeMemSetNull(pOut);
- pOut->flags = nullFlag;
- pOut->field_type = field_type_MAX;
- pOut->n = 0;
+ mem_set_null(pOut);
+ if (pOp->p1 != 0)
+ pOut->flags = MEM_Null | MEM_Cleared;
cnt--;
}
break;
diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index 3e9f1ff6f..4398b41b1 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -201,7 +201,7 @@ sql_result_bool(struct sql_context *ctx, bool value)
void
sql_result_null(sql_context * pCtx)
{
- sqlVdbeMemSetNull(pCtx->pOut);
+ mem_set_null(pCtx->pOut);
}
void
@@ -382,7 +382,7 @@ createAggContext(sql_context * p, int nByte)
Mem *pMem = p->pMem;
assert(!mem_is_agg(pMem));
if (nByte <= 0) {
- sqlVdbeMemSetNull(pMem);
+ mem_set_null(pMem);
pMem->z = 0;
} else {
sqlVdbeMemClearAndResize(pMem, nByte);
--
2.25.1
More information about the Tarantool-patches
mailing list