From fd3d084711a8a0e2c6f9966f716ce3dd77a724c1 Mon Sep 17 00:00:00 2001
From: Nikita Pettik <korablev@tarantool.org>
Date: Wed, 20 Feb 2019 01:44:16 +0300
Subject: [PATCH] sql: refactor sqlVdbeMsgpackGet()
Tarantool allows to hold in INTEGER field values in range
[INT64_MAX, UINT64_MAX], which is obviously larger than common int64_t
range. In this regard, if value of integer field in range
[INT64_MAX, UINT64_MAX] is presented in tuple (e.g. after insertion from
Lua interface), then after decoding msgpack (during processing SQL
query) its value won't fit into int64_t (which in turn is basic type
used to hold integers inside VDBE memory). Now if this happens, instead
of raising an overflow error, value is stored as floating point number
(with precise loss, obviously). Such approach is considered to be messy
and we are going to raise "integer overflow" error instead. To make this
happen, lets firstly refactor sqlVdbeMsgpackGet() to make it return
error code to indicate that something went wrong and move length of
decoded part to output parameters. Codestyle fixes are included as well.
Needed for #3735
---
src/box/sql/vdbe.c | 5 +-
src/box/sql/vdbeInt.h | 13 ++++-
src/box/sql/vdbeaux.c | 132 ++++++++++++++++++++----------------------
src/box/sql/vdbemem.c | 4 +-
4 files changed, 81 insertions(+), 73 deletions(-)
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index 74e6e25dc2..8889bdce20 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -2790,8 +2790,9 @@ case OP_Column: {
if (VdbeMemDynamic(pDest)) {
sqlVdbeMemSetNull(pDest);
}
-
- sqlVdbeMsgpackGet(zData+aOffset[p2], pDest);
+ uint32_t unused;
+ vdbe_decode_msgpack_into_mem((const char *)(zData + aOffset[p2]),
+ pDest, &unused);
/* MsgPack map, array or extension (unsupported in sql).
* Wrap it in a blob verbatim.
*/
diff --git a/src/box/sql/vdbeInt.h b/src/box/sql/vdbeInt.h
index 9338674699..f0e82cce86 100644
--- a/src/box/sql/vdbeInt.h
+++ b/src/box/sql/vdbeInt.h
@@ -556,7 +556,18 @@ int sqlVdbeCompareMsgpack(const char **key1,
*/
int sqlVdbeRecordCompareMsgpack(const void *key1,
struct UnpackedRecord *key2);
-u32 sqlVdbeMsgpackGet(const unsigned char *buf, Mem * pMem);
+
+/**
+ * Decode msgpack and save value into VDBE memory cell.
+ *
+ * @param buf Buffer to deserialize msgpack from.
+ * @param mem Memory cell to write value into.
+ * @param len[out] Length of decoded part.
+ * @retval Return code: < 0 in case of error.
+ * @retval 0 on success.
+ */
+int
+vdbe_decode_msgpack_into_mem(const char *buf, struct Mem *mem, uint32_t *len);
struct mpstream;
struct region;
diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c
index 30fb5398ae..2b3f3f40fb 100644
--- a/src/box/sql/vdbeaux.c
+++ b/src/box/sql/vdbeaux.c
@@ -3698,79 +3698,74 @@ sqlVdbeRecordCompareMsgpack(const void *key1,
return key2->default_rc;
}
-u32
-sqlVdbeMsgpackGet(const unsigned char *buf, /* Buffer to deserialize from */
- Mem * pMem) /* Memory cell to write value into */
+int
+vdbe_decode_msgpack_into_mem(const char *buf, struct Mem *mem, uint32_t *len)
{
- const char *zParse = (const char *)buf;
- switch (mp_typeof(*zParse)) {
+ const char *start_buf = buf;
+ switch (mp_typeof(*buf)) {
case MP_ARRAY:
case MP_MAP:
case MP_EXT:
- default:{
- pMem->flags = 0;
- return 0;
- }
- case MP_NIL:{
- mp_decode_nil((const char **)&zParse); /* Still need to promote zParse. */
- pMem->flags = MEM_Null;
- break;
- }
- case MP_BOOL:{
- assert((unsigned char)*zParse == 0xc2
- || (unsigned char)*zParse == 0xc3);
- pMem->u.i = (unsigned char)*zParse - 0xc2;
- pMem->flags = MEM_Int;
- break;
- }
- case MP_UINT:{
- uint64_t v = mp_decode_uint(&zParse);
- if (v > INT64_MAX) {
- /*
- * If the value exceeds i64 range, convert to double (lossy).
- */
- pMem->u.r = v;
- pMem->flags = MEM_Real;
- } else {
- pMem->u.i = v;
- pMem->flags = MEM_Int;
- }
- break;
- }
- case MP_INT:{
- pMem->u.i = mp_decode_int(&zParse);
- pMem->flags = MEM_Int;
- break;
- }
- case MP_STR:{
- /* XXX u32->int */
- pMem->n = (int)mp_decode_strl((const char **)&zParse);
- pMem->flags = MEM_Str | MEM_Ephem;
- install_blob:
- pMem->z = (char *)zParse;
- zParse += pMem->n;
- break;
- }
- case MP_BIN:{
- /* XXX u32->int */
- pMem->n = (int)mp_decode_binl((const char **)&zParse);
- pMem->flags = MEM_Blob | MEM_Ephem;
- goto install_blob;
- }
- case MP_FLOAT:{
- pMem->u.r = mp_decode_float(&zParse);
- pMem->flags =
- sqlIsNaN(pMem->u.r) ? MEM_Null : MEM_Real;
- break;
- }
- case MP_DOUBLE:{
- pMem->u.r = mp_decode_double(&zParse);
- pMem->flags =
- sqlIsNaN(pMem->u.r) ? MEM_Null : MEM_Real;
- break;
+ default: {
+ mem->flags = 0;
+ break;
+ }
+ case MP_NIL: {
+ mp_decode_nil(&buf);
+ mem->flags = MEM_Null;
+ break;
+ }
+ case MP_BOOL: {
+ assert((unsigned char)*buf == 0xc2 ||
+ (unsigned char)*buf == 0xc3);
+ mem->u.i = (unsigned char)*buf - 0xc2;
+ mem->flags = MEM_Int;
+ break;
+ }
+ case MP_UINT: {
+ uint64_t v = mp_decode_uint(&buf);
+ if (v > INT64_MAX) {
+ mem->u.r = v;
+ mem->flags = MEM_Real;
+ } else {
+ mem->u.i = v;
+ mem->flags = MEM_Int;
}
+ break;
+ }
+ case MP_INT: {
+ mem->u.i = mp_decode_int(&buf);
+ mem->flags = MEM_Int;
+ break;
+ }
+ case MP_STR: {
+ /* XXX u32->int */
+ mem->n = (int) mp_decode_strl(&buf);
+ mem->flags = MEM_Str | MEM_Ephem;
+install_blob:
+ mem->z = (char *)buf;
+ buf += mem->n;
+ break;
+ }
+ case MP_BIN: {
+ /* XXX u32->int */
+ mem->n = (int) mp_decode_binl(&buf);
+ mem->flags = MEM_Blob | MEM_Ephem;
+ goto install_blob;
}
- return (u32) (zParse - (const char *)buf);
+ case MP_FLOAT: {
+ mem->u.r = mp_decode_float(&buf);
+ mem->flags = sqlIsNaN(mem->u.r) ? MEM_Null : MEM_Real;
+ break;
+ }
+ case MP_DOUBLE: {
+ mem->u.r = mp_decode_double(&buf);
+ mem->flags = sqlIsNaN(mem->u.r) ? MEM_Null : MEM_Real;
+ break;
+ }
+ }
+ *len = (uint32_t)(buf - start_buf);
+ return 0;
}
void
@@ -3788,7 +3783,8 @@ sqlVdbeRecordUnpackMsgpack(struct key_def *key_def, /* Information about the rec
while (n--) {
pMem->szMalloc = 0;
pMem->z = 0;
- u32 sz = sqlVdbeMsgpackGet((u8 *) zParse, pMem);
+ uint32_t sz = 0;
+ vdbe_decode_msgpack_into_mem(zParse, pMem, &sz);
if (sz == 0) {
/* MsgPack array, map or ext. Treat as blob. */
pMem->z = (char *)zParse;
diff --git a/src/box/sql/vdbemem.c b/src/box/sql/vdbemem.c
index a816936f09..19802f7469 100644
--- a/src/box/sql/vdbemem.c
+++ b/src/box/sql/vdbemem.c
@@ -1634,8 +1634,8 @@ sql_stat4_column(struct sql *db, const char *record, uint32_t col_num,
return -1;
}
}
- sqlVdbeMsgpackGet((const unsigned char *) a, mem);
- return 0;
+ uint32_t unused;
+ return vdbe_decode_msgpack_into_mem(a, mem, &unused);
}
/*
--
GitLab