[Tarantool-patches] [PATCH v4 41/53] sql: introduce mem_convert_to_integer()

[imeevma at tarantool.org]

This patch introduces mem_convert_to_integer() which is used to convert
a MEM to a MEM that contains integer value.

Part of #5818
---
 src/box/sql/mem.c  | 114 +++++++++++++++++++++++++++++----------------
 src/box/sql/mem.h  |   7 ++-
 src/box/sql/vdbe.c |  19 ++++----
 3 files changed, 88 insertions(+), 52 deletions(-)

diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
index 1209df1ce..b9bcd3d3a 100644
--- a/src/box/sql/mem.c
+++ b/src/box/sql/mem.c
@@ -695,6 +695,80 @@ mem_set_cleared(struct Mem *mem)
 	mem->flags = MEM_Null | MEM_Cleared;
 }
 
+static inline int
+mem_convert_varstring_to_integer(struct Mem *mem)
+{
+	bool is_neg;
+	int64_t i;
+	if (sql_atoi64(mem->z, &i, &is_neg, mem->n) != 0)
+		return -1;
+	mem_set_integer(mem, i, is_neg);
+	return 0;
+}
+
+static inline int
+mem_convert_double_to_integer(struct Mem *mem)
+{
+	double d = mem->u.r;
+	if (d < 0 && d >= (double)INT64_MIN) {
+		mem_set_integer(mem, (int64_t)d, true);
+		return 0;
+	}
+	if (d >= 0 && d < (double)UINT64_MAX) {
+		mem_set_integer(mem, (int64_t)(uint64_t)d, false);
+		return 0;
+	}
+	return -1;
+}
+
+static inline int
+mem_convert_double_to_integer_lossless(struct Mem *mem)
+{
+	double d = mem->u.r;
+	if (d < 0 && d >= (double)INT64_MIN && (double)(int64_t)d == d) {
+		mem_set_integer(mem, (int64_t)d, true);
+		return 0;
+	}
+	if (d >= 0 && d < (double)UINT64_MAX && (double)(uint64_t)d == d) {
+		mem_set_integer(mem, (int64_t)(uint64_t)d, false);
+		return 0;
+	}
+	return -1;
+}
+
+static inline int
+mem_convert_boolean_to_integer(struct Mem *mem)
+{
+	mem_set_integer(mem, (int64_t)mem->u.b, false);
+	return 0;
+}
+
+int
+mem_convert_to_integer(struct Mem *mem)
+{
+	if ((mem->flags & (MEM_Int | MEM_UInt)) != 0)
+		return 0;
+	if ((mem->flags & (MEM_Str | MEM_Blob)) != 0)
+		return mem_convert_varstring_to_integer(mem);
+	if ((mem->flags & MEM_Real) != 0)
+		return mem_convert_double_to_integer(mem);
+	if ((mem->flags & MEM_Bool) != 0)
+		return mem_convert_boolean_to_integer(mem);
+	return -1;
+}
+
+int
+mem_convert_to_integer_lossless(struct Mem *mem)
+{
+	if ((mem->flags & (MEM_Int | MEM_UInt)) != 0)
+		return 0;
+	if ((mem->flags & MEM_Str) != 0)
+		return mem_convert_varstring_to_integer(mem);
+	if ((mem->flags & MEM_Real) != 0)
+		return mem_convert_double_to_integer_lossless(mem);
+	return -1;
+}
+
 int
 mem_copy(struct Mem *to, const struct Mem *from)
 {
@@ -1911,23 +1985,6 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type)
 	}
 }
 
-/*
- * The MEM structure is already a MEM_Real.  Try to also make it a
- * MEM_Int if we can.
- */
-int
-mem_apply_integer_type(Mem *pMem)
-{
-	int rc;
-	i64 ix;
-	assert(pMem->flags & MEM_Real);
-	assert(EIGHT_BYTE_ALIGNMENT(pMem));
-
-	if ((rc = doubleToInt64(pMem->u.r, (int64_t *) &ix)) == 0)
-		mem_set_integer(pMem, ix, pMem->u.r <= -1);
-	return rc;
-}
-
 /*
  * Add MEM_Str to the set of representations for the given Mem.  Numbers
  * are converted using sql_snprintf().  Converting a BLOB to a string
@@ -2192,29 +2249,6 @@ mem_convert_to_unsigned(struct Mem *mem)
 	return 0;
 }
 
-/**
- * Convert the numeric value contained in MEM to integer.
- *
- * @param mem The MEM that contains the numeric value.
- * @retval 0 if the conversion was successful, -1 otherwise.
- */
-static int
-mem_convert_to_integer(struct Mem *mem)
-{
-	if ((mem->flags & (MEM_UInt | MEM_Int)) != 0)
-		return 0;
-	if ((mem->flags & MEM_Real) == 0)
-		return -1;
-	double d = mem->u.r;
-	if (d >= (double)UINT64_MAX || d < (double)INT64_MIN)
-		return -1;
-	if (d < (double)INT64_MAX)
-		mem_set_integer(mem, (int64_t) d, d < 0);
-	else
-		mem_set_integer(mem, (uint64_t) d, false);
-	return 0;
-}
-
 int
 mem_convert_to_numeric(struct Mem *mem, enum field_type type)
 {
diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h
index 8b6f6749d..58cbdfe9f 100644
--- a/src/box/sql/mem.h
+++ b/src/box/sql/mem.h
@@ -318,6 +318,12 @@ int
 mem_compare(const struct Mem *left, const struct Mem *right, int *result,
 	    enum field_type type, struct coll *coll);
 
+int
+mem_convert_to_integer(struct Mem *mem);
+
+int
+mem_convert_to_integer_lossless(struct Mem *mem);
+
 /**
  * Simple type to str convertor. It is used to simplify
  * error reporting.
@@ -395,7 +401,6 @@ int
 vdbe_mem_numerify(struct Mem *mem);
 
 int sqlVdbeMemCast(struct Mem *, enum field_type type);
-int mem_apply_integer_type(struct Mem *);
 int sqlVdbeMemStringify(struct Mem *);
 int sqlVdbeMemNulTerminate(struct Mem *);
 int sqlVdbeMemExpandBlob(struct Mem *);
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index edf845d97..1aeed543f 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -1341,17 +1341,14 @@ case OP_AddImm: {            /* in1 */
  */
 case OP_MustBeInt: {            /* jump, in1 */
 	pIn1 = &aMem[pOp->p1];
-	if (!mem_is_integer(pIn1)) {
-		mem_apply_type(pIn1, FIELD_TYPE_INTEGER);
-		if (!mem_is_integer(pIn1)) {
-			if (pOp->p2==0) {
-				diag_set(ClientError, ER_SQL_TYPE_MISMATCH,
-					 mem_str(pIn1), "integer");
-				goto abort_due_to_error;
-			} else {
-				goto jump_to_p2;
-			}
-		}
+	if (mem_is_integer(pIn1))
+		break;
+	if (mem_convert_to_integer_lossless(pIn1) != 0) {
+		if (pOp->p2 !=0 )
+			goto jump_to_p2;
+		diag_set(ClientError, ER_SQL_TYPE_MISMATCH,
+			 mem_str(pIn1), "integer");
+		goto abort_due_to_error;
 	}
 	break;
 }
-- 
2.25.1