[Tarantool-patches] [PATCH v4 24/53] sql: introduce mem_set_integer()

[Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

This patch introduces mem_set_integer(). Function mem_set_integer()
clears MEM and sets it to given integer value.

Part of #5818
---
 src/box/sql/func.c    |  6 +--
 src/box/sql/mem.c     | 88 ++++++++++++++++++-------------------------
 src/box/sql/mem.h     | 21 ++++-------
 src/box/sql/vdbe.c    | 10 ++---
 src/box/sql/vdbeapi.c |  4 +-
 src/box/sql/vdbeaux.c |  6 +--
 6 files changed, 56 insertions(+), 79 deletions(-)

diff --git a/src/box/sql/func.c b/src/box/sql/func.c
index b61de18d8..8f7550f30 100644
--- a/src/box/sql/func.c
+++ b/src/box/sql/func.c
@@ -278,7 +278,7 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size)
 			mem_set_double(&val[i], field.dval);
 			break;
 		case MP_INT:
-			mem_set_i64(&val[i], field.ival);
+			mem_set_integer(&val[i], field.ival, true);
 			break;
 		case MP_UINT:
 			mem_set_u64(&val[i], field.ival);
@@ -349,7 +349,7 @@ port_c_get_vdbemem(struct port *base, uint32_t *size)
 			mem_set_double(&val[i], mp_decode_double(&data));
 			break;
 		case MP_INT:
-			mem_set_i64(&val[i], mp_decode_int(&data));
+			mem_set_integer(&val[i], mp_decode_int(&data), true);
 			break;
 		case MP_UINT:
 			mem_set_u64(&val[i], mp_decode_uint(&data));
@@ -1989,7 +1989,7 @@ sumFinalize(sql_context * context)
 		} else if (p->approx) {
 			sql_result_double(context, p->rSum);
 		} else {
-			mem_set_int(context->pOut, p->iSum, p->is_neg);
+			mem_set_integer(context->pOut, p->iSum, p->is_neg);
 		}
 	}
 }
diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
index da2aa5c94..13a587aba 100644
--- a/src/box/sql/mem.c
+++ b/src/box/sql/mem.c
@@ -263,6 +263,15 @@ mem_set_null(struct Mem *mem)
 	mem_clear(mem);
 }
 
+void
+mem_set_integer(struct Mem *mem, int64_t value, bool is_neg)
+{
+	mem_clear(mem);
+	mem->u.i = value;
+	mem->flags = is_neg ? MEM_Int : MEM_UInt;
+	mem->field_type = FIELD_TYPE_INTEGER;
+}
+
 int
 mem_copy(struct Mem *to, const struct Mem *from)
 {
@@ -557,8 +566,7 @@ mem_arithmetic(const struct Mem *left, const struct Mem *right,
 	default:
 		unreachable();
 	}
-	result->u.i = ires;
-	result->flags = is_res_neg ? MEM_Int : MEM_UInt;
+	mem_set_integer(result, ires, is_res_neg);
 	return 0;
 }
 
@@ -571,6 +579,7 @@ mem_bitwise(struct Mem *left, struct Mem *right, struct Mem *result, int op)
 		return 0;
 	int64_t l;
 	int64_t r;
+	int64_t res;
 	bool unused;
 	if (sqlVdbeIntValue(left, &l, &unused) != 0) {
 		diag_set(ClientError, ER_SQL_TYPE_MISMATCH,
@@ -583,13 +592,13 @@ mem_bitwise(struct Mem *left, struct Mem *right, struct Mem *result, int op)
 		return -1;
 	}
 	if (op == OP_BitAnd) {
-		result->u.i = l & r;
-		result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt;
+		res = l & r;
+		mem_set_integer(result, res, res < 0);
 		return 0;
 	}
 	if (op == OP_BitOr) {
-		result->u.i = l | r;
-		result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt;
+		res = l | r;
+		mem_set_integer(result, res, res < 0);
 		return 0;
 	}
 	assert(op == OP_ShiftRight || op == OP_ShiftLeft);
@@ -599,17 +608,17 @@ mem_bitwise(struct Mem *left, struct Mem *right, struct Mem *result, int op)
 		r = r < -64 ? 64 : -r;
 	}
 	if (r >= 64) {
-		result->u.i = is_left_shift || l >= 0 ? 0 : -1;
-		result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt;
+		res = is_left_shift || l >= 0 ? 0 : -1;
+		mem_set_integer(result, res, res < 0);
 		return 0;
 	}
 	if (is_left_shift) {
-		result->u.i = l << r;
-		result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt;
+		res = l << r;
+		mem_set_integer(result, res, res < 0);
 		return 0;
 	}
-	result->u.i = l >> r;
-	result->flags = result->u.i < 0 ? MEM_Int : MEM_UInt;
+	res = l >> r;
+	mem_set_integer(result, res, res < 0);
 	return 0;
 }
 
@@ -628,7 +637,7 @@ mem_bit_not(struct Mem *mem, struct Mem *result)
 		return -1;
 	}
 	i = ~i;
-	mem_set_int(result, i, i < 0);
+	mem_set_integer(result, i, i < 0);
 	return 0;
 }
 
@@ -1328,7 +1337,7 @@ mem_apply_numeric_type(struct Mem *record)
 	int64_t integer_value;
 	bool is_neg;
 	if (sql_atoi64(record->z, &integer_value, &is_neg, record->n) == 0) {
-		mem_set_int(record, integer_value, is_neg);
+		mem_set_integer(record, integer_value, is_neg);
 		return 0;
 	}
 	double float_value;
@@ -1359,15 +1368,14 @@ vdbe_mem_numerify(struct Mem *mem)
 	if ((mem->flags & (MEM_Int | MEM_UInt | MEM_Real | MEM_Null)) != 0)
 		return 0;
 	if ((mem->flags & MEM_Bool) != 0) {
-		mem->u.u = mem->u.b;
-		MemSetTypeFlag(mem, MEM_UInt);
+		mem_set_integer(mem, (int64_t)mem->u.b, false);
 		return 0;
 	}
 	assert((mem->flags & (MEM_Blob | MEM_Str)) != 0);
 	bool is_neg;
 	int64_t i;
 	if (sql_atoi64(mem->z, &i, &is_neg, mem->n) == 0) {
-		mem_set_int(mem, i, is_neg);
+		mem_set_integer(mem, i, is_neg);
 	} else {
 		double d;
 		if (sqlAtoF(mem->z, &d, mem->n) == 0)
@@ -1425,12 +1433,11 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type)
 				return -1;
 			if (type == FIELD_TYPE_UNSIGNED && is_neg)
 				return -1;
-			mem_set_int(pMem, val, is_neg);
+			mem_set_integer(pMem, val, is_neg);
 			return 0;
 		}
 		if ((pMem->flags & MEM_Bool) != 0) {
-			pMem->u.u = pMem->u.b;
-			MemSetTypeFlag(pMem, MEM_UInt);
+			mem_set_integer(pMem, (int64_t)pMem->u.b, false);
 			return 0;
 		}
 		if ((pMem->flags & MEM_Real) != 0) {
@@ -1438,7 +1445,7 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type)
 			if (sqlVdbeRealValue(pMem, &d) != 0)
 				return -1;
 			if (d < (double)INT64_MAX && d >= (double)INT64_MIN) {
-				mem_set_int(pMem, d, d <= -1);
+				mem_set_integer(pMem, d, d <= -1);
 				return 0;
 			}
 			if (d >= (double)INT64_MAX && d < (double)UINT64_MAX) {
@@ -1494,7 +1501,7 @@ mem_apply_integer_type(Mem *pMem)
 	assert(EIGHT_BYTE_ALIGNMENT(pMem));
 
 	if ((rc = doubleToInt64(pMem->u.r, (int64_t *) &ix)) == 0)
-		mem_set_int(pMem, ix, pMem->u.r <= -1);
+		mem_set_integer(pMem, ix, pMem->u.r <= -1);
 	return rc;
 }
 
@@ -1643,8 +1650,10 @@ mem_apply_type(struct Mem *record, enum field_type type)
 			} else {
 				if (double_compare_nint64(d, INT64_MIN, 1) < 0)
 					return 0;
-				if ((double)(int64_t)d == d)
-					mem_set_int(record, (int64_t)d, true);
+				if ((double)(int64_t)d == d) {
+					mem_set_integer(record, (int64_t)d,
+							true);
+				}
 			}
 			return 0;
 		}
@@ -1653,7 +1662,7 @@ mem_apply_type(struct Mem *record, enum field_type type)
 			int64_t i;
 			if (sql_atoi64(record->z, &i, &is_neg, record->n) != 0)
 				return -1;
-			mem_set_int(record, i, is_neg);
+			mem_set_integer(record, i, is_neg);
 		}
 		if ((record->flags & MEM_Int) == MEM_Int) {
 			if (type == FIELD_TYPE_UNSIGNED)
@@ -1777,9 +1786,9 @@ mem_convert_to_integer(struct Mem *mem)
 	if (d >= (double)UINT64_MAX || d < (double)INT64_MIN)
 		return -1;
 	if (d < (double)INT64_MAX)
-		mem_set_int(mem, (int64_t) d, d < 0);
+		mem_set_integer(mem, (int64_t) d, d < 0);
 	else
-		mem_set_int(mem, (uint64_t) d, false);
+		mem_set_integer(mem, (uint64_t) d, false);
 	return 0;
 }
 
@@ -1898,16 +1907,6 @@ mem_set_ptr(struct Mem *mem, void *ptr)
 	mem->u.p = ptr;
 }
 
-void
-mem_set_i64(struct Mem *mem, int64_t value)
-{
-	mem_clear(mem);
-	mem->u.i = value;
-	int flag = value < 0 ? MEM_Int : MEM_UInt;
-	MemSetTypeFlag(mem, flag);
-	mem->field_type = FIELD_TYPE_INTEGER;
-}
-
 void
 mem_set_u64(struct Mem *mem, uint64_t value)
 {
@@ -1917,21 +1916,6 @@ mem_set_u64(struct Mem *mem, uint64_t value)
 	mem->field_type = FIELD_TYPE_UNSIGNED;
 }
 
-void
-mem_set_int(struct Mem *mem, int64_t value, bool is_neg)
-{
-	mem_clear(mem);
-	if (is_neg) {
-		assert(value < 0);
-		mem->u.i = value;
-		MemSetTypeFlag(mem, MEM_Int);
-	} else {
-		mem->u.u = value;
-		MemSetTypeFlag(mem, MEM_UInt);
-	}
-	mem->field_type = FIELD_TYPE_INTEGER;
-}
-
 void
 mem_set_double(struct Mem *mem, double value)
 {
diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h
index dc0d4a284..0fd902274 100644
--- a/src/box/sql/mem.h
+++ b/src/box/sql/mem.h
@@ -166,6 +166,13 @@ mem_destroy(struct Mem *mem);
 void
 mem_set_null(struct Mem *mem);
 
+/**
+ * Set integer value. According to is_neg flag value is considered
+ * to be signed or unsigned.
+ */
+void
+mem_set_integer(struct Mem *mem, int64_t value, bool is_neg);
+
 /**
  * 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
@@ -409,24 +416,10 @@ mem_set_bool(struct Mem *mem, bool value);
 void
 mem_set_ptr(struct Mem *mem, void *ptr);
 
-/**
- * Set integer value. Depending on its sign MEM_Int (in case
- * of negative value) or MEM_UInt flag is set.
- */
-void
-mem_set_i64(struct Mem *mem, int64_t value);
-
 /** Set unsigned value and MEM_UInt flag. */
 void
 mem_set_u64(struct Mem *mem, uint64_t value);
 
-/**
- * Set integer value. According to is_neg flag value is considered
- * to be signed or unsigned.
- */
-void
-mem_set_int(struct Mem *mem, int64_t value, bool is_neg);
-
 /** 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 f0b56033a..92845d66d 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -731,7 +731,7 @@ case OP_Halt: {
  */
 case OP_Integer: {         /* out2 */
 	pOut = vdbe_prepare_null_out(p, pOp->p2);
-	mem_set_i64(pOut, pOp->p1);
+	mem_set_integer(pOut, pOp->p1, pOp->p1 < 0);
 	break;
 }
 
@@ -756,7 +756,7 @@ case OP_Bool: {         /* out2 */
 case OP_Int64: {           /* out2 */
 	pOut = vdbe_prepare_null_out(p, pOp->p2);
 	assert(pOp->p4.pI64!=0);
-	mem_set_int(pOut, *pOp->p4.pI64, pOp->p4type == P4_INT64);
+	mem_set_integer(pOut, *pOp->p4.pI64, pOp->p4type == P4_INT64);
 	break;
 }
 
@@ -2708,7 +2708,7 @@ skip_truncate:
 	r.nField = (u16)nField;
 
 	if (int_field > 0)
-		mem_set_int(&aMem[int_field], iKey, is_neg);
+		mem_set_integer(&aMem[int_field], iKey, is_neg);
 
 	r.default_rc = ((1 & (oc - OP_SeekLT)) ? -1 : +1);
 	assert(oc!=OP_SeekGT || r.default_rc==-1);
@@ -2999,8 +2999,8 @@ case OP_FCopy: {     /* out2 */
 		assert(mem_is_integer(pIn1));
 
 		pOut = vdbe_prepare_null_out(p, pOp->p2);
-		mem_set_int(pOut, pIn1->u.i, pIn1->flags == MEM_Int);
-		pOut->field_type = pIn1->field_type;
+		if (mem_copy(pOut, pIn1) != 0)
+			goto abort_due_to_error;
 	}
 	break;
 }
diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index 76af333e8..b0f1f202f 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -189,7 +189,7 @@ sql_result_uint(sql_context *ctx, uint64_t u_val)
 void
 sql_result_int(sql_context *ctx, int64_t val)
 {
-	mem_set_i64(ctx->pOut, val);
+	mem_set_integer(ctx->pOut, val, val < 0);
 }
 
 void
@@ -840,7 +840,7 @@ sql_bind_int64(sql_stmt * pStmt, int i, sql_int64 iValue)
 		return -1;
 	int rc = sql_bind_type(p, i, "integer");
 	assert(iValue < 0);
-	mem_set_int(&p->aVar[i - 1], iValue, true);
+	mem_set_integer(&p->aVar[i - 1], iValue, true);
 	return rc;
 }
 
diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c
index 9d07358e6..3d1f094b8 100644
--- a/src/box/sql/vdbeaux.c
+++ b/src/box/sql/vdbeaux.c
@@ -1324,13 +1324,13 @@ sqlVdbeList(Vdbe * p)
 			}
 		}
 
-		mem_set_i64(pMem, pOp->p1);
+		mem_set_integer(pMem, pOp->p1, pOp->p1 < 0);
 		pMem++;
 
-		mem_set_i64(pMem, pOp->p2);
+		mem_set_integer(pMem, pOp->p2, pOp->p2 < 0);
 		pMem++;
 
-		mem_set_i64(pMem, pOp->p3);
+		mem_set_integer(pMem, pOp->p3, pOp->p3 < 0);
 		pMem++;
 
 		if (sqlVdbeMemClearAndResize(pMem, 256)) {
-- 
2.25.1