From: Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: imeevma@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v4 18/53] sql: introduce mem_arithmetic() Date: Tue, 30 Mar 2021 01:02:52 +0200 [thread overview] Message-ID: <95ed9427-b28d-e4d8-8147-729dba11a3ae@tarantool.org> (raw) In-Reply-To: <3f1a796a92670c57203c5a6c7d1b47856db96917.1616491731.git.imeevma@gmail.com> Thanks for the patch! See 3 comments below. On 23.03.2021 10:35, Mergen Imeev via Tarantool-patches wrote: > 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); 1. Lets use mem_clear() directly. You delete sqlVdbeMemSetNull() later anyway. > + 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; 2. Looks surprising when you use 'l' in 3 variables before and suddenly 'left' here. Tbh, the old names with A and B looked easier to read. Up to you, I can live with both. > + 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; 3. The original code looked shorter and easier to read. Why did you pad it out so much? Additionally, since you now have a function for doing arith, you could make one function for each opcode with common parts as a static functions in mem.c, and call them right from 'case's in vdbe.c. So instead of one big case,case,case,case: arith which also has a switch inside, we would have proper case: plus, case: multiply, etc. Would be faster and would make each individual function simpler I think. The names could be mem_arith_plus(), mem_arith_mul(), mem_arith_minus(), etc.
next prev parent reply other threads:[~2021-03-29 23:03 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-23 9:34 [Tarantool-patches] [PATCH v4 00/53] Move mem-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 01/53] sql: enchance vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches 2021-03-29 22:57 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 02/53] sql: disable unused code in sql/analyze.c Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 03/53] sql: disable unused code in sql/legacy.c Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 04/53] sql: remove NULL-termination in OP_ResultRow Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 05/53] sql: move MEM-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 06/53] sql: remove unused MEM-related functions Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 07/53] sql: disable unused code in sql/vdbemem.c Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 08/53] sql: introduce mem_str() Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 09/53] sql: introduce mem_create() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 10/53] sql: introduce mem_destroy() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 11/53] sql: introduce mem_is_*() functions() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 12/53] sql: introduce mem_copy() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 13/53] sql: introduce mem_copy_as_ephemeral() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 14/53] sql: rework mem_move() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 15/53] sql: rework vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches 2021-03-29 23:02 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 16/53] sql: remove sql_column_to_messagepack() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 17/53] sql: introduce mem_concat() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 18/53] sql: introduce mem_arithmetic() Mergen Imeev via Tarantool-patches 2021-03-29 23:02 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 19/53] sql: introduce mem_compare() Mergen Imeev via Tarantool-patches 2021-03-29 23:03 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 20/53] sql: introduce mem_bitwise() Mergen Imeev via Tarantool-patches 2021-03-29 23:03 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 21/53] sql: introduce mem_bit_not() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 22/53] sql: Initialize MEM in sqlVdbeAllocUnpackedRecord() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 23/53] sql: introduce mem_set_null() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 24/53] sql: introduce mem_set_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 25/53] sql: introduce mem_set_unsigned() Mergen Imeev via Tarantool-patches 2021-03-29 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 26/53] sql: introduce mem_set_boolean() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 27/53] sql: refactor mem_set_double() Mergen Imeev via Tarantool-patches 2021-03-29 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 28/53] sql: refactor mem_set_*_string() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 29/53] sql: introduce mem_copy_string() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 30/53] sql: introduce mem_set_*_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 31/53] sql: introduce mem_copy_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 32/53] sql: introduce mem_set_zerobinary() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 33/53] sql: introduce mem_append_to_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-09 19:52 ` Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 34/53] sql: introduce mem_set_*_map() and mem_set_*_array() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 35/53] sql: introduce mem_set_undefined() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 36/53] sql: introduce mem_set_pointer() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 37/53] sql: introduce mem_set_frame() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 38/53] sql: introduce mem_*_aggregate() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 39/53] sql: introduce mem_set_cleared() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 40/53] sql: move MEM flags to mem.c Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 41/53] sql: introduce mem_convert_to_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 42/53] sql: introduce mem_convert_to_double() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 43/53] sql: introduce mem_convert_to_number() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 44/53] sql: introduce mem_convert_to_string() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 45/53] sql: introduce mem_explicit_cast() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 46/53] sql: introduce mem_implicit_cast() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 47/53] sql: introduce mem_get_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 48/53] sql: introduce mem_get_unsigned() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 49/53] sql: introduce mem_get_double() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 50/53] sql: introduce mem_get_boolean() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 51/53] sql: introduce mem_get_string0() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 52/53] sql: introduce mem_get_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:09 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 53/53] sql: introduce mem_get_length() Mergen Imeev via Tarantool-patches 2021-03-29 23:09 ` Vladislav Shpilevoy via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=95ed9427-b28d-e4d8-8147-729dba11a3ae@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=tsafin@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v4 18/53] sql: introduce mem_arithmetic()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox