[Tarantool-patches] [PATCH v5 47/52] sql: introduce mem_get_double()
imeevma at tarantool.org
imeevma at tarantool.org
Sat Apr 10 00:08:20 MSK 2021
This patch introduces mem_get_double(). This function is used to receive
double value from MEM. If value of MEM is not double, it is converted to
double if possible. MEM is not changed.
Part of #5818
---
src/box/sql/func.c | 17 +++++++------
src/box/sql/mem.c | 57 +++++++++++++++++--------------------------
src/box/sql/mem.h | 12 ++++++---
src/box/sql/printf.c | 4 ++-
src/box/sql/sqlInt.h | 3 ---
src/box/sql/vdbeapi.c | 6 -----
6 files changed, 44 insertions(+), 55 deletions(-)
diff --git a/src/box/sql/func.c b/src/box/sql/func.c
index f2254fb29..aeab06e2a 100644
--- a/src/box/sql/func.c
+++ b/src/box/sql/func.c
@@ -229,12 +229,13 @@ absFunc(sql_context * context, int argc, sql_value ** argv)
return;
}
default:{
- /* Because sql_value_double() returns 0.0 if the argument is not
- * something that can be converted into a number, we have:
- * IMP: R-01992-00519 Abs(X) returns 0.0 if X is a string or blob
+ /*
+ * Abs(X) returns 0.0 if X is a string or blob
* that cannot be converted to a numeric value.
*/
- double rVal = sql_value_double(argv[0]);
+ double rVal;
+ if (mem_get_double(argv[0], &rVal) != 0)
+ rVal = 0;
if (rVal < 0)
rVal = -rVal;
sql_result_double(context, rVal);
@@ -549,7 +550,7 @@ roundFunc(sql_context * context, int argc, sql_value ** argv)
context->is_aborted = true;
return;
}
- r = sql_value_double(argv[0]);
+ mem_get_double(argv[0], &r);
/* If Y==0 and X will fit in a 64-bit int,
* handle the rounding directly,
* otherwise use printf.
@@ -1056,7 +1057,7 @@ quoteFunc(sql_context * context, int argc, sql_value ** argv)
case MP_DOUBLE:{
double r1, r2;
char zBuf[50];
- r1 = sql_value_double(argv[0]);
+ mem_get_double(argv[0], &r1);
sql_snprintf(sizeof(zBuf), zBuf, "%!.15g", r1);
sqlAtoF(zBuf, &r2, 20);
if (r1 != r2) {
@@ -1675,7 +1676,9 @@ sum_step(struct sql_context *context, int argc, sql_value **argv)
p->overflow = 1;
}
} else {
- p->rSum += sql_value_double(argv[0]);
+ double d;
+ mem_get_double(argv[0], &d);
+ p->rSum += d;
p->approx = 1;
}
}
diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
index 136da9d5d..930c44bec 100644
--- a/src/box/sql/mem.c
+++ b/src/box/sql/mem.c
@@ -1290,6 +1290,29 @@ mem_get_uint(const struct Mem *mem, uint64_t *u)
return -1;
}
+int
+mem_get_double(const struct Mem *mem, double *d)
+{
+ if ((mem->flags & MEM_Real) != 0) {
+ *d = mem->u.r;
+ return 0;
+ }
+ if ((mem->flags & MEM_Int) != 0) {
+ *d = (double)mem->u.i;
+ return 0;
+ }
+ if ((mem->flags & MEM_UInt) != 0) {
+ *d = (double)mem->u.u;
+ return 0;
+ }
+ if ((mem->flags & MEM_Str) != 0) {
+ if (sqlAtoF(mem->z, d, mem->n) == 0)
+ return -1;
+ return 0;
+ }
+ return -1;
+}
+
int
mem_copy(struct Mem *to, const struct Mem *from)
{
@@ -2464,32 +2487,6 @@ mem_value_bool(const struct Mem *mem, bool *b)
return -1;
}
-/*
- * Return the best representation of pMem that we can get into a
- * double. If pMem is already a double or an integer, return its
- * value. If it is a string or blob, try to convert it to a double.
- * If it is a NULL, return 0.0.
- */
-int
-sqlVdbeRealValue(Mem * pMem, double *v)
-{
- assert(EIGHT_BYTE_ALIGNMENT(pMem));
- if (pMem->flags & MEM_Real) {
- *v = pMem->u.r;
- return 0;
- } else if (pMem->flags & MEM_Int) {
- *v = (double)pMem->u.i;
- return 0;
- } else if ((pMem->flags & MEM_UInt) != 0) {
- *v = (double)pMem->u.u;
- return 0;
- } else if (pMem->flags & MEM_Str) {
- if (sqlAtoF(pMem->z, v, pMem->n))
- return 0;
- }
- return -1;
-}
-
/**************************** sql_value_ ******************************
* The following routines extract information from a Mem or sql_value
* structure.
@@ -2516,14 +2513,6 @@ sql_value_bytes(sql_value * pVal)
return sqlValueBytes(pVal);
}
-double
-sql_value_double(sql_value * pVal)
-{
- double v = 0.0;
- sqlVdbeRealValue((Mem *) pVal, &v);
- return v;
-}
-
bool
sql_value_boolean(sql_value *val)
{
diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h
index 87aee0e9b..34b0b3f13 100644
--- a/src/box/sql/mem.h
+++ b/src/box/sql/mem.h
@@ -552,6 +552,14 @@ mem_get_int(const struct Mem *mem, int64_t *i, bool *is_neg);
int
mem_get_uint(const struct Mem *mem, uint64_t *u);
+/**
+ * Return value for MEM of DOUBLE type. For MEM of all other types convert
+ * value of the MEM to DOUBLE if possible and return converted value. Original
+ * MEM is not changed.
+ */
+int
+mem_get_double(const struct Mem *mem, double *d);
+
/**
* Simple type to str convertor. It is used to simplify
* error reporting.
@@ -606,16 +614,12 @@ releaseMemArray(Mem * p, int N);
int
mem_value_bool(const struct Mem *mem, bool *b);
-int sqlVdbeRealValue(struct Mem *, double *);
const void *
sql_value_blob(struct Mem *);
int
sql_value_bytes(struct Mem *);
-double
-sql_value_double(struct Mem *);
-
bool
sql_value_boolean(struct Mem *val);
diff --git a/src/box/sql/printf.c b/src/box/sql/printf.c
index 09da39e81..605478820 100644
--- a/src/box/sql/printf.c
+++ b/src/box/sql/printf.c
@@ -155,7 +155,9 @@ getDoubleArg(PrintfArguments * p)
{
if (p->nArg <= p->nUsed)
return 0.0;
- return sql_value_double(p->apArg[p->nUsed++]);
+ double d;
+ mem_get_double(p->apArg[p->nUsed++], &d);
+ return d;
}
static char *
diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
index 6ead9b261..3f6fa1722 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -442,9 +442,6 @@ sql_column_bytes(sql_stmt *, int iCol);
int
sql_column_bytes16(sql_stmt *, int iCol);
-double
-sql_column_double(sql_stmt *, int iCol);
-
bool
sql_column_boolean(struct sql_stmt *stmt, int column);
diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index 85bbbc420..b1a9aed6e 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -484,12 +484,6 @@ sql_column_bytes(sql_stmt * pStmt, int i)
return sql_value_bytes(columnMem(pStmt, i));
}
-double
-sql_column_double(sql_stmt * pStmt, int i)
-{
- return sql_value_double(columnMem(pStmt, i));
-}
-
bool
sql_column_boolean(struct sql_stmt *stmt, int i)
{
--
2.25.1
More information about the Tarantool-patches
mailing list