[Tarantool-patches] [PATCH v4 18/53] sql: introduce mem_arithmetic()
imeevma at tarantool.org
imeevma at tarantool.org
Tue Mar 23 12:35:32 MSK 2021
This patch introduces mem_arithmetic(). Function mem_arithmetic()
executes arithmetic operations on the first and the second MEMs and
writes the result to the third MEM.
Part of #5818
---
src/box/sql/mem.c | 224 +++++++++++++++++++++++++++++++++++++--------
src/box/sql/mem.h | 6 +-
src/box/sql/vdbe.c | 111 +---------------------
3 files changed, 193 insertions(+), 148 deletions(-)
diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
index f160439c9..6120939d8 100644
--- a/src/box/sql/mem.c
+++ b/src/box/sql/mem.c
@@ -370,6 +370,192 @@ mem_concat(struct Mem *left, struct Mem *right, struct Mem *result)
return 0;
}
+int
+mem_arithmetic(const struct Mem *left, const struct Mem *right,
+ struct Mem *result, int op)
+{
+ sqlVdbeMemSetNull(result);
+ result->field_type = FIELD_TYPE_NUMBER;
+ if (((left->flags | right->flags) & MEM_Null) != 0)
+ return 0;
+
+ int64_t il;
+ bool is_l_neg;
+ double dl;
+ uint16_t type_left = 0;
+ if ((left->flags & MEM_Real) != 0) {
+ dl = left->u.r;
+ type_left = MEM_Real;
+ } else if ((left->flags & MEM_Int) != 0) {
+ il = left->u.i;
+ type_left = MEM_Int;
+ is_l_neg = true;
+ } else if ((left->flags & MEM_UInt) != 0) {
+ il = left->u.i;
+ type_left = MEM_UInt;
+ is_l_neg = false;
+ } else if ((left->flags & (MEM_Str | MEM_Blob)) != 0) {
+ if (sql_atoi64(left->z, &il, &is_l_neg, left->n) == 0)
+ type_left = is_l_neg ? MEM_Int : MEM_UInt;
+ else if (sqlAtoF(left->z, &dl, left->n) != 0)
+ type_left = MEM_Real;
+ }
+
+ int64_t ir;
+ bool is_r_neg;
+ double dr;
+ uint16_t type_right = 0;
+ if ((right->flags & MEM_Real) != 0) {
+ dr = right->u.r;
+ type_right = MEM_Real;
+ } else if ((right->flags & MEM_Int) != 0) {
+ ir = right->u.i;
+ type_right = MEM_Int;
+ is_r_neg = true;
+ } else if ((right->flags & MEM_UInt) != 0) {
+ ir = right->u.i;
+ type_right = MEM_UInt;
+ is_r_neg = false;
+ } else if ((right->flags & (MEM_Str | MEM_Blob)) != 0) {
+ if (sql_atoi64(right->z, &ir, &is_r_neg, right->n) == 0)
+ type_right = is_r_neg ? MEM_Int : MEM_UInt;
+ else if (sqlAtoF(right->z, &dr, right->n) != 0)
+ type_right = MEM_Real;
+ }
+
+ if ((type_right & (MEM_Int | MEM_UInt | MEM_Real)) == 0) {
+ diag_set(ClientError, ER_SQL_TYPE_MISMATCH,
+ mem_str(right), "numeric");
+ return -1;
+ }
+ if ((type_left & (MEM_Int | MEM_UInt | MEM_Real)) == 0) {
+ diag_set(ClientError, ER_SQL_TYPE_MISMATCH,
+ mem_str(left), "numeric");
+ return -1;
+ }
+ if (((type_left | type_right) & MEM_Real) != 0) {
+ if (type_left == MEM_Int)
+ dl = (double)il;
+ else if (type_left == MEM_UInt)
+ dl = (double)(uint64_t)il;
+
+ if (type_right == MEM_Int)
+ dr = (double)ir;
+ else if (type_right == MEM_UInt)
+ dr = (double)(uint64_t)ir;
+
+ double dres;
+ switch(op) {
+ case OP_Add:
+ dres = dl + dr;
+ break;
+ case OP_Subtract:
+ dres = dl - dr;
+ break;
+ case OP_Multiply:
+ dres = dl * dr;
+ break;
+ case OP_Divide:
+ if (dr == 0.) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "division by zero");
+ return -1;
+ }
+ dres = dl / dr;
+ break;
+ case OP_Remainder: {
+ int64_t il = (int64_t)dl;
+ int64_t ir = (int64_t)dr;
+ if (ir == 0) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "division by zero");
+ return -1;
+ }
+ if (ir == -1)
+ ir = 1;
+ dres = (double)(il % ir);
+ break;
+ }
+ default:
+ unreachable();
+ }
+ if (sqlIsNaN(dres))
+ return 0;
+ result->u.r = dres;
+ result->flags = MEM_Real;
+ return 0;
+ }
+ int64_t ires;
+ /*
+ * TODO: This is wrong. Both these flags should already be set. This
+ * assignment done to not change behaviour of the function, which
+ * is currently bugged.
+ */
+ is_l_neg = (left->flags & MEM_Int) != 0;
+ is_r_neg = (right->flags & MEM_Int) != 0;
+ bool is_res_neg;
+ switch(op) {
+ case OP_Add:
+ if (sql_add_int(il, is_l_neg, ir, is_r_neg, &ires,
+ &is_res_neg) != 0) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "integer is overflowed");
+ return -1;
+ }
+ break;
+ case OP_Subtract:
+ if (sql_sub_int(il, is_l_neg, ir, is_r_neg, &ires,
+ &is_res_neg) != 0) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "integer is overflowed");
+ return -1;
+ }
+ break;
+ case OP_Multiply:
+ if (sql_mul_int(il, is_l_neg, ir, is_r_neg, &ires,
+ &is_res_neg) != 0) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "integer is overflowed");
+ return -1;
+ }
+ break;
+ case OP_Divide:
+ if (ir == 0) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "division by zero");
+ return -1;
+ }
+ if (sql_div_int(il, is_l_neg, ir, is_r_neg, &ires,
+ &is_res_neg) != 0) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "integer is overflowed");
+ return -1;
+ }
+ break;
+ case OP_Remainder: {
+ if (ir == 0) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "division by zero");
+ return -1;
+ }
+ if (ir == -1)
+ ir = 1;
+ if (sql_rem_int(il, is_l_neg, ir, is_r_neg, &ires,
+ &is_res_neg) != 0) {
+ diag_set(ClientError, ER_SQL_EXECUTE,
+ "integer is overflowed");
+ return -1;
+ }
+ break;
+ }
+ default:
+ unreachable();
+ }
+ result->u.i = ires;
+ result->flags = is_res_neg ? MEM_Int : MEM_UInt;
+ return 0;
+}
+
static inline bool
mem_has_msgpack_subtype(struct Mem *mem)
{
@@ -574,44 +760,6 @@ sql_value_type(sql_value *pVal)
return mem_mp_type(mem);
}
-
-/*
- * pMem currently only holds a string type (or maybe a BLOB that we can
- * interpret as a string if we want to). Compute its corresponding
- * numeric type, if has one. Set the pMem->u.r and pMem->u.i fields
- * accordingly.
- */
-static u16 SQL_NOINLINE
-computeNumericType(Mem *pMem)
-{
- assert((pMem->flags & (MEM_Int | MEM_UInt | MEM_Real)) == 0);
- assert((pMem->flags & (MEM_Str|MEM_Blob))!=0);
- if (sqlAtoF(pMem->z, &pMem->u.r, pMem->n)==0)
- return 0;
- bool is_neg;
- if (sql_atoi64(pMem->z, (int64_t *) &pMem->u.i, &is_neg, pMem->n) == 0)
- return is_neg ? MEM_Int : MEM_UInt;
- return MEM_Real;
-}
-
-/*
- * Return the numeric type for pMem, either MEM_Int or MEM_Real or both or
- * none.
- *
- * Unlike mem_apply_numeric_type(), this routine does not modify pMem->flags.
- * But it does set pMem->u.r and pMem->u.i appropriately.
- */
-u16
-numericType(Mem *pMem)
-{
- if ((pMem->flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0)
- return pMem->flags & (MEM_Int | MEM_UInt | MEM_Real);
- if (pMem->flags & (MEM_Str|MEM_Blob)) {
- return computeNumericType(pMem);
- }
- return 0;
-}
-
/*
* The sqlValueBytes() routine returns the number of bytes in the
* sql_value object assuming that it uses the encoding "enc".
diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h
index 9b0eb8444..7cea07dc9 100644
--- a/src/box/sql/mem.h
+++ b/src/box/sql/mem.h
@@ -192,6 +192,10 @@ mem_move(struct Mem *to, struct Mem *from);
int
mem_concat(struct Mem *left, struct Mem *right, struct Mem *result);
+int
+mem_arithmetic(const struct Mem *left, const struct Mem *right,
+ struct Mem *result, int op);
+
/* One or more of the following flags are set to indicate the validOK
* representations of the value stored in the Mem struct.
*
@@ -261,8 +265,6 @@ mem_mp_type(struct Mem *mem);
enum mp_type
sql_value_type(struct Mem *);
-u16
-numericType(Mem *pMem);
int sqlValueBytes(struct Mem *);
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index c04bd40f3..55cb42932 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -1080,117 +1080,12 @@ case OP_Subtract: /* same as TK_MINUS, in1, in2, out3 */
case OP_Multiply: /* same as TK_STAR, in1, in2, out3 */
case OP_Divide: /* same as TK_SLASH, in1, in2, out3 */
case OP_Remainder: { /* same as TK_REM, in1, in2, out3 */
- u16 type1; /* Numeric type of left operand */
- u16 type2; /* Numeric type of right operand */
- i64 iA; /* Integer value of left operand */
- i64 iB; /* Integer value of right operand */
- double rA; /* Real value of left operand */
- double rB; /* Real value of right operand */
-
pIn1 = &aMem[pOp->p1];
- type1 = numericType(pIn1);
pIn2 = &aMem[pOp->p2];
- type2 = numericType(pIn2);
- pOut = vdbe_prepare_null_out(p, pOp->p3);
- if (mem_is_null(pIn1) || mem_is_null(pIn2))
- goto arithmetic_result_is_null;
- if ((type1 & (MEM_Int | MEM_UInt)) != 0 &&
- (type2 & (MEM_Int | MEM_UInt)) != 0) {
- iA = pIn1->u.i;
- iB = pIn2->u.i;
- bool is_lhs_neg = mem_is_integer(pIn1) &&
- !mem_is_unsigned(pIn1);
- bool is_rhs_neg = mem_is_integer(pIn2) &&
- !mem_is_unsigned(pIn2);
- bool is_res_neg;
- switch( pOp->opcode) {
- case OP_Add: {
- if (sql_add_int(iA, is_lhs_neg, iB, is_rhs_neg,
- (int64_t *) &iB, &is_res_neg) != 0)
- goto integer_overflow;
- break;
- }
- case OP_Subtract: {
- if (sql_sub_int(iB, is_rhs_neg, iA, is_lhs_neg,
- (int64_t *) &iB, &is_res_neg) != 0)
- goto integer_overflow;
- break;
- }
- case OP_Multiply: {
- if (sql_mul_int(iA, is_lhs_neg, iB, is_rhs_neg,
- (int64_t *) &iB, &is_res_neg) != 0)
- goto integer_overflow;
- break;
- }
- case OP_Divide: {
- if (iA == 0)
- goto division_by_zero;
- if (sql_div_int(iB, is_rhs_neg, iA, is_lhs_neg,
- (int64_t *) &iB, &is_res_neg) != 0)
- goto integer_overflow;
- break;
- }
- default: {
- if (iA == 0)
- goto division_by_zero;
- if (iA==-1) iA = 1;
- if (sql_rem_int(iB, is_rhs_neg, iA, is_lhs_neg,
- (int64_t *) &iB, &is_res_neg) != 0)
- goto integer_overflow;
- break;
- }
- }
- mem_set_int(pOut, iB, is_res_neg);
- } else {
- if (sqlVdbeRealValue(pIn1, &rA) != 0) {
- diag_set(ClientError, ER_SQL_TYPE_MISMATCH,
- mem_str(pIn1), "numeric");
- goto abort_due_to_error;
- }
- if (sqlVdbeRealValue(pIn2, &rB) != 0) {
- diag_set(ClientError, ER_SQL_TYPE_MISMATCH,
- mem_str(pIn2), "numeric");
- goto abort_due_to_error;
- }
- assert(((type1 | type2) & MEM_Real) != 0);
- switch( pOp->opcode) {
- case OP_Add: rB += rA; break;
- case OP_Subtract: rB -= rA; break;
- case OP_Multiply: rB *= rA; break;
- case OP_Divide: {
- if (rA == (double)0)
- goto division_by_zero;
- rB /= rA;
- break;
- }
- default: {
- iA = (i64)rA;
- iB = (i64)rB;
- if (iA == 0)
- goto division_by_zero;
- if (iA==-1) iA = 1;
- rB = (double)(iB % iA);
- break;
- }
- }
- if (sqlIsNaN(rB)) {
- goto arithmetic_result_is_null;
- }
- mem_set_double(pOut, rB);
- }
- break;
-
-arithmetic_result_is_null:
- /* Force NULL be of type NUMBER. */
- pOut->field_type = FIELD_TYPE_NUMBER;
+ pOut = &aMem[pOp->p3];
+ if (mem_arithmetic(pIn2, pIn1, pOut, pOp->opcode) != 0)
+ goto abort_due_to_error;
break;
-
-division_by_zero:
- diag_set(ClientError, ER_SQL_EXECUTE, "division by zero");
- goto abort_due_to_error;
-integer_overflow:
- diag_set(ClientError, ER_SQL_EXECUTE, "integer is overflowed");
- goto abort_due_to_error;
}
/* Opcode: CollSeq P1 * * P4
--
2.25.1
More information about the Tarantool-patches
mailing list