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 v5 24/52] sql: introduce mem_set_int()
Date: Tue, 13 Apr 2021 01:32:47 +0200 [thread overview]
Message-ID: <23d58d25-f012-f0c2-8c52-1f56fadb28eb@tarantool.org> (raw)
In-Reply-To: <69aa47b1575b768da04cc579e70038f5be272027.1617984948.git.imeevma@gmail.com>
Good job on the fixes!
See 3 comments below.
> diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
> index 937fa3272..075000218 100644
> --- a/src/box/sql/mem.c
> +++ b/src/box/sql/mem.c
> @@ -1384,8 +1393,9 @@ 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->u.u = (uint64_t)mem->u.b;
> + mem->flags = MEM_UInt;
> + mem->field_type = FIELD_TYPE_UNSIGNED;
1. Field type wasn't set before. Why did you change that?
> return 0;
> }
> assert((mem->flags & (MEM_Blob | MEM_Str)) != 0);
> @@ -1454,20 +1464,23 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type)
> return 0;
> }
> if ((pMem->flags & MEM_Bool) != 0) {
> - pMem->u.u = pMem->u.b;
> - MemSetTypeFlag(pMem, MEM_UInt);
> + pMem->u.u = (uint64_t)pMem->u.b;
> + pMem->flags = MEM_UInt;
> + pMem->field_type = FIELD_TYPE_UNSIGNED;
2. Ditto.
> return 0;
> }
> @@ -1801,10 +1826,15 @@ mem_convert_to_integer(struct Mem *mem)
> double d = mem->u.r;
> 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);
> - else
> - mem_set_int(mem, (uint64_t) d, false);
> + if (d < 0.) {
> + mem->u.i = (int64_t)d;
> + mem->flags = MEM_Int;
> + mem->field_type = FIELD_TYPE_INTEGER;
> + } else {
> + mem->u.u = (uint64_t)d;
> + mem->flags = MEM_UInt;
> + mem->field_type = FIELD_TYPE_UNSIGNED;
3. Previously it was FIELD_TYPE_INTEGER in both cases. Why
did you change that?
next prev parent reply other threads:[~2021-04-12 23:32 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 16:51 [Tarantool-patches] [PATCH v5 00/52] Move mem-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches
2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 01/52] sql: enhance vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches
2021-04-11 17:42 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 12:01 ` Mergen Imeev via Tarantool-patches
2021-04-13 12:12 ` Mergen Imeev via Tarantool-patches
2021-04-13 23:22 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 23:34 ` Mergen Imeev via Tarantool-patches
2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 02/52] sql: disable unused code in sql/analyze.c Mergen Imeev via Tarantool-patches
2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 03/52] sql: disable unused code in sql/legacy.c Mergen Imeev via Tarantool-patches
2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 04/52] sql: remove NULL-termination in OP_ResultRow Mergen Imeev via Tarantool-patches
2021-04-14 22:23 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-14 22:37 ` Mergen Imeev via Tarantool-patches
2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 05/52] sql: move MEM-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches
2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 06/52] sql: refactor port_vdbemem_*() functions Mergen Imeev via Tarantool-patches
2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 07/52] sql: remove unused MEM-related functions Mergen Imeev via Tarantool-patches
2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 08/52] sql: disable unused code in sql/vdbemem.c Mergen Imeev via Tarantool-patches
2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 09/52] sql: introduce mem_str() Mergen Imeev via Tarantool-patches
2021-04-11 17:44 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 12:36 ` Mergen Imeev via Tarantool-patches
2021-04-14 22:23 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-14 22:42 ` Mergen Imeev via Tarantool-patches
2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 10/52] sql: introduce mem_create() Mergen Imeev via Tarantool-patches
2021-04-09 17:36 ` [Tarantool-patches] [PATCH v5 11/52] sql: introduce mem_destroy() Mergen Imeev via Tarantool-patches
2021-04-11 17:46 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 12:42 ` Mergen Imeev via Tarantool-patches
2021-04-09 17:36 ` [Tarantool-patches] [PATCH v5 12/52] sql: introduce mem_is_*() functions() Mergen Imeev via Tarantool-patches
2021-04-11 17:59 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 16:09 ` Mergen Imeev via Tarantool-patches
2021-04-14 22:48 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-14 23:07 ` Mergen Imeev via Tarantool-patches
2021-04-09 17:36 ` [Tarantool-patches] [PATCH v5 13/52] sql: introduce mem_copy() Mergen Imeev via Tarantool-patches
2021-04-11 18:06 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 16:18 ` Mergen Imeev via Tarantool-patches
2021-04-09 17:36 ` [Tarantool-patches] [PATCH v5 14/52] sql: introduce mem_copy_as_ephemeral() Mergen Imeev via Tarantool-patches
2021-04-11 18:10 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 16:31 ` Mergen Imeev via Tarantool-patches
2021-04-09 17:37 ` [Tarantool-patches] [PATCH v5 15/52] sql: rework mem_move() Mergen Imeev via Tarantool-patches
2021-04-11 18:10 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 16:38 ` Mergen Imeev via Tarantool-patches
2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 16/52] sql: rework vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches
2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 17/52] sql: remove sql_column_to_messagepack() Mergen Imeev via Tarantool-patches
2021-04-14 22:58 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-14 23:14 ` Mergen Imeev via Tarantool-patches
2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 18/52] sql: introduce mem_concat() Mergen Imeev via Tarantool-patches
2021-04-11 18:11 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 16:57 ` Mergen Imeev via Tarantool-patches
2021-04-14 23:04 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-14 23:22 ` Mergen Imeev via Tarantool-patches
2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 19/52] sql: introduce arithmetic operations for MEM Mergen Imeev via Tarantool-patches
2021-04-11 18:13 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 17:06 ` Mergen Imeev via Tarantool-patches
2021-04-14 23:10 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-14 23:33 ` Mergen Imeev via Tarantool-patches
2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 20/52] sql: introduce mem_compare() Mergen Imeev via Tarantool-patches
2021-04-11 18:16 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 18:33 ` Mergen Imeev via Tarantool-patches
2021-04-14 23:20 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-14 23:40 ` Mergen Imeev via Tarantool-patches
2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 21/52] sql: introduce bitwise operations for MEM Mergen Imeev via Tarantool-patches
2021-04-12 23:31 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 20:49 ` Mergen Imeev via Tarantool-patches
2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 22/52] sql: Initialize MEM in sqlVdbeAllocUnpackedRecord() Mergen Imeev via Tarantool-patches
2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 23/52] sql: introduce mem_set_null() Mergen Imeev via Tarantool-patches
2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 24/52] sql: introduce mem_set_int() Mergen Imeev via Tarantool-patches
2021-04-12 23:32 ` Vladislav Shpilevoy via Tarantool-patches [this message]
2021-04-13 20:56 ` Mergen Imeev via Tarantool-patches
2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 25/52] sql: introduce mem_set_uint() Mergen Imeev via Tarantool-patches
2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 26/52] sql: move mem_set_bool() and mem_set_double() Mergen Imeev via Tarantool-patches
2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 27/52] sql: introduce mem_set_str_*() functions Mergen Imeev via Tarantool-patches
2021-04-12 23:34 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 21:36 ` Mergen Imeev via Tarantool-patches
2021-04-14 23:49 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-15 1:25 ` Mergen Imeev via Tarantool-patches
2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 28/52] sql: introduce mem_copy_str() and mem_copy_str0() Mergen Imeev via Tarantool-patches
2021-04-12 23:35 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 22:00 ` Mergen Imeev via Tarantool-patches
2021-04-14 23:54 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-15 0:30 ` Mergen Imeev via Tarantool-patches
2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 29/52] sql: introduce mem_set_bin_*() functions Mergen Imeev via Tarantool-patches
2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 30/52] sql: introduce mem_copy_bin() Mergen Imeev via Tarantool-patches
2021-04-12 23:36 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 22:06 ` Mergen Imeev via Tarantool-patches
2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 31/52] sql: introduce mem_set_zerobin() Mergen Imeev via Tarantool-patches
2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 32/52] sql: introduce mem_set_*() for map and array Mergen Imeev via Tarantool-patches
2021-04-12 23:36 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 22:08 ` Mergen Imeev via Tarantool-patches
2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 33/52] sql: introduce mem_set_invalid() Mergen Imeev via Tarantool-patches
2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 34/52] sql: refactor mem_set_ptr() Mergen Imeev via Tarantool-patches
2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 35/52] sql: introduce mem_set_frame() Mergen Imeev via Tarantool-patches
2021-04-12 23:37 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 22:19 ` Mergen Imeev via Tarantool-patches
2021-04-09 20:25 ` [Tarantool-patches] [PATCH v5 36/52] sql: introduce mem_set_agg() Mergen Imeev via Tarantool-patches
2021-04-12 23:37 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 22:46 ` Mergen Imeev via Tarantool-patches
2021-04-09 20:25 ` [Tarantool-patches] [PATCH v5 37/52] sql: introduce mem_set_null_clear() Mergen Imeev via Tarantool-patches
2021-04-12 23:38 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 22:50 ` Mergen Imeev via Tarantool-patches
2021-04-09 20:25 ` [Tarantool-patches] [PATCH v5 38/52] sql: move MEM flags to mem.c Mergen Imeev via Tarantool-patches
2021-04-13 20:42 ` Mergen Imeev via Tarantool-patches
2021-04-09 20:25 ` [Tarantool-patches] [PATCH v5 39/52] sql: introduce mem_to_int*() functions Mergen Imeev via Tarantool-patches
2021-04-12 23:39 ` Vladislav Shpilevoy via Tarantool-patches
2021-04-13 22:58 ` Mergen Imeev via Tarantool-patches
2021-04-13 23:10 ` Mergen Imeev via Tarantool-patches
2021-04-09 20:26 ` [Tarantool-patches] [PATCH v5 40/52] sql: introduce mem_to_double() Mergen Imeev via Tarantool-patches
2021-04-13 23:21 ` Mergen Imeev via Tarantool-patches
2021-04-15 0:39 ` [Tarantool-patches] [PATCH v5 00/52] Move mem-related functions to mem.c/mem.h Vladislav Shpilevoy via Tarantool-patches
2021-04-15 6:49 ` Kirill Yukhin 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=23d58d25-f012-f0c2-8c52-1f56fadb28eb@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 v5 24/52] sql: introduce mem_set_int()' \
/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