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 42/52] sql: introduce mem_to_str() and mem_to_str0() Date: Wed, 14 Apr 2021 00:58:05 +0200 [thread overview] Message-ID: <afd5f3dd-9311-dae4-2631-64680bd1c6a7@tarantool.org> (raw) In-Reply-To: <39f3cc5d8873f763fb0d609f64e026120cbf6de4.1618000037.git.imeevma@gmail.com> Thanks for working on this! > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 9a0234e60..be7b47e76 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -822,6 +822,130 @@ mem_to_number(struct Mem *mem) <...> > + > +int > +mem_to_str0(struct Mem *mem) > +{ > + if ((mem->flags & (MEM_Str | MEM_Term)) == (MEM_Str | MEM_Term)) > + return 0; > + if ((mem->flags & MEM_Str) != 0) > + return str_to_str0(mem); > + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) > + return int_to_str0(mem); > + if ((mem->flags & MEM_Real) != 0) > + return double_to_str0(mem); > + if ((mem->flags & MEM_Bool) != 0) > + return bool_to_str0(mem); > + if ((mem->flags & MEM_Blob) != 0) { > + if ((mem->flags & MEM_Subtype) == 0) > + return bin_to_str0(mem); > + if (mp_typeof(*mem->z) == MP_MAP) > + return map_to_str0(mem); > + return array_to_str0(mem); > + } > + return -1; > +} > + > +int > +mem_to_str(struct Mem *mem) > +{ > + if ((mem->flags & MEM_Str) != 0) > + return 0; > + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) > + return int_to_str0(mem); > + if ((mem->flags & MEM_Real) != 0) > + return double_to_str0(mem); > + if ((mem->flags & MEM_Bool) != 0) > + return bool_to_str0(mem); > + if ((mem->flags & MEM_Blob) != 0) { > + if ((mem->flags & MEM_Subtype) == 0) > + return bin_to_str(mem); > + if (mp_typeof(*mem->z) == MP_MAP) > + return map_to_str0(mem); > + return array_to_str0(mem); > + } > + return -1; In the old function there was an assertion that only simple types are passed (no Aggs, Frames). Please, keep it, or add a diag_set() here. The same above.
next prev parent reply other threads:[~2021-04-13 22:58 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1618000036.git.imeevma@gmail.com> 2021-04-09 20:53 ` [Tarantool-patches] [PATCH v5 41/52] sql: introduce mem_to_number() Mergen Imeev via Tarantool-patches 2021-04-13 23:25 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:53 ` [Tarantool-patches] [PATCH v5 42/52] sql: introduce mem_to_str() and mem_to_str0() Mergen Imeev via Tarantool-patches 2021-04-13 22:58 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-04-13 23:41 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:53 ` [Tarantool-patches] [PATCH v5 43/52] sql: introduce mem_cast_explicit() Mergen Imeev via Tarantool-patches 2021-04-13 22:59 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 0:01 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:53 ` [Tarantool-patches] [PATCH v5 44/52] sql: introduce mem_cast_implicit() Mergen Imeev via Tarantool-patches 2021-04-13 22:59 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 0:05 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:53 ` [Tarantool-patches] [PATCH v5 45/52] sql: introduce mem_get_int() Mergen Imeev via Tarantool-patches 2021-04-13 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 0:28 ` Mergen Imeev via Tarantool-patches 2021-04-14 1:17 ` Mergen Imeev via Tarantool-patches 2021-04-09 21:08 ` [Tarantool-patches] [PATCH v5 46/52] sql: introduce mem_get_uint() Mergen Imeev via Tarantool-patches 2021-04-13 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 0:39 ` Mergen Imeev via Tarantool-patches 2021-04-14 1:21 ` Mergen Imeev via Tarantool-patches 2021-04-09 21:08 ` [Tarantool-patches] [PATCH v5 47/52] sql: introduce mem_get_double() Mergen Imeev via Tarantool-patches 2021-04-13 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 1:00 ` Mergen Imeev via Tarantool-patches 2021-04-15 0:17 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-15 0:46 ` Mergen Imeev via Tarantool-patches 2021-04-09 21:08 ` [Tarantool-patches] [PATCH v5 48/52] sql: introduce mem_get_bool() Mergen Imeev via Tarantool-patches 2021-04-13 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 1:29 ` Mergen Imeev via Tarantool-patches 2021-04-09 21:08 ` [Tarantool-patches] [PATCH v5 49/52] sql: introduce mem_get_str0() and mem_as_str0() Mergen Imeev via Tarantool-patches 2021-04-13 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 1:43 ` Mergen Imeev via Tarantool-patches 2021-04-09 21:08 ` [Tarantool-patches] [PATCH v5 50/52] sql: introduce mem_get_bin() Mergen Imeev via Tarantool-patches 2021-04-09 21:08 ` [Tarantool-patches] [PATCH v5 51/52] sql: introduce mem_get_bytes_len() Mergen Imeev via Tarantool-patches 2021-04-13 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 1:55 ` Mergen Imeev via Tarantool-patches 2021-04-15 0:21 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-15 0:51 ` Mergen Imeev via Tarantool-patches 2021-04-09 21:08 ` [Tarantool-patches] [PATCH v5 52/52] sql: introduce mem_get_agg() Mergen Imeev 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=afd5f3dd-9311-dae4-2631-64680bd1c6a7@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 42/52] sql: introduce mem_to_str() and mem_to_str0()' \ /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