[Tarantool-patches] [PATCH v4 29/53] sql: introduce mem_copy_string()

[imeevma at tarantool.org]

This patch introduces mem_copy_string() function. Function
mem_copy_string() clears MEM, allocates enough memory and copies given
string to allocated memory.

Part of #5818
---
 src/box/sql/func.c    |  8 +++-----
 src/box/sql/mem.c     | 30 ++++++++++++++++++++++++++++--
 src/box/sql/mem.h     |  6 ++++++
 src/box/sql/vdbeapi.c | 17 ++++++++++++++---
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/box/sql/func.c b/src/box/sql/func.c
index 6f5fe8cb6..1b3929259 100644
--- a/src/box/sql/func.c
+++ b/src/box/sql/func.c
@@ -284,9 +284,8 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size)
 			mem_set_unsigned(&val[i], field.ival);
 			break;
 		case MP_STR:
-			if (sqlVdbeMemSetStr(&val[i], field.sval.data,
-					     field.sval.len, 1,
-					     SQL_TRANSIENT) != 0)
+			if (mem_copy_string(&val[i], field.sval.data,
+					    field.sval.len) != 0)
 				goto error;
 			break;
 		case MP_NIL:
@@ -356,8 +355,7 @@ port_c_get_vdbemem(struct port *base, uint32_t *size)
 			break;
 		case MP_STR:
 			str = mp_decode_str(&data, &len);
-			if (sqlVdbeMemSetStr(&val[i], str, len,
-					     1, SQL_TRANSIENT) != 0)
+			if (mem_copy_string(&val[i], str, len) != 0)
 				goto error;
 			break;
 		case MP_NIL:
diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
index 91ef7f3c8..59a378e1b 100644
--- a/src/box/sql/mem.c
+++ b/src/box/sql/mem.c
@@ -384,6 +384,32 @@ mem_set_allocated_string0(struct Mem *mem, char *value)
 	mem->flags |= MEM_Term;
 }
 
+int
+mem_copy_string(struct Mem *mem, const char *value, uint32_t len)
+{
+	bool is_own_value = (mem->flags & (MEM_Str | MEM_Blob)) != 0 &&
+			    mem->z == value;
+	if (sqlVdbeMemGrow(mem, len, is_own_value) != 0)
+		return -1;
+	if (!is_own_value)
+		memcpy(mem->z, value, len);
+	mem->n = len;
+	mem->flags = MEM_Str;
+	mem->field_type = FIELD_TYPE_STRING;
+	return 0;
+}
+
+int
+mem_copy_string0(struct Mem *mem, const char *value)
+{
+	uint32_t len = strlen(value);
+	if (mem_copy_string(mem, value, len + 1) != 0)
+		return -1;
+	mem->n = len;
+	mem->flags |= MEM_Term;
+	return 0;
+}
+
 int
 mem_copy(struct Mem *to, const struct Mem *from)
 {
@@ -1587,8 +1613,8 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type)
 		assert(MEM_Str == (MEM_Blob >> 3));
 		if ((pMem->flags & MEM_Bool) != 0) {
 			const char *str_bool = SQL_TOKEN_BOOLEAN(pMem->u.b);
-			sqlVdbeMemSetStr(pMem, str_bool, strlen(str_bool), 1,
-					 SQL_TRANSIENT);
+			if (mem_copy_string0(pMem, str_bool) != 0)
+				return -1;
 			return 0;
 		}
 		pMem->flags |= (pMem->flags & MEM_Blob) >> 3;
diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h
index 70b5350f6..12853606d 100644
--- a/src/box/sql/mem.h
+++ b/src/box/sql/mem.h
@@ -211,6 +211,12 @@ mem_set_allocated_string0(struct Mem *mem, char *value);
  * string or binary and allocation type is not STATIC, this value is copied to
  * newly allocated by destination MEM memory.
  */
+int
+mem_copy_string(struct Mem *mem, const char *value, uint32_t len);
+
+int
+mem_copy_string0(struct Mem *mem, const char *value);
+
 int
 mem_copy(struct Mem *to, const struct Mem *from);
 
diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index 5fc7b4e44..5b5e5b0c8 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -146,7 +146,12 @@ setResultStrOrError(sql_context * pCtx,	/* Function context */
 			mem_set_dynamic_string(pCtx->pOut, (char *)z, n);
 		return;
 	}
-	if (sqlVdbeMemSetStr(pCtx->pOut, z, n, 1, xDel) != 0)
+	if (n < 0) {
+		if (mem_copy_string0(pCtx->pOut, z) != 0)
+			pCtx->is_aborted = true;
+		return;
+	}
+	if (mem_copy_string(pCtx->pOut, z, n) != 0)
 		pCtx->is_aborted = true;
 }
 
@@ -798,8 +803,14 @@ bindText(sql_stmt * pStmt,	/* The statement to bind against */
 			mem_set_dynamic_string0(pVar, (char *)zData);
 		else
 			mem_set_dynamic_string(pVar, (char *)zData, nData);
-	} else if (sqlVdbeMemSetStr(pVar, zData, nData, 1, xDel) != 0) {
-		return -1;
+	} else {
+		if (nData < 0) {
+			if (mem_copy_string0(pVar, zData) != 0)
+				return -1;
+		} else {
+			if (mem_copy_string(pVar, zData, nData) != 0)
+				return -1;
+		}
 	}
 	return sql_bind_type(p, i, "text");
 }
-- 
2.25.1