From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: s.ostanevich@corp.mail.ru, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1 04/10] sql: introduce mem_convert_to_binary() Date: Mon, 1 Feb 2021 11:14:56 +0300 [thread overview] Message-ID: <7b6a3cf80a894403d3ce6b9bcc50d805868a9df8.1612166870.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1612166870.git.imeevma@gmail.com> This patch introduces function mem_convert_to_binary() which allows us to unify a method to convert a MEM to a MEM of type VARBINARY. Part of #4470 --- src/box/sql/vdbeInt.h | 8 ++++++++ src/box/sql/vdbemem.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/box/sql/vdbeInt.h b/src/box/sql/vdbeInt.h index 0bb045170..213531d05 100644 --- a/src/box/sql/vdbeInt.h +++ b/src/box/sql/vdbeInt.h @@ -713,6 +713,14 @@ mems_have_same_type(const struct Mem *mem1, const struct Mem *mem2) (mem2->flags & MEM_PURE_TYPE_MASK); } +/** + * Cast MEM to varbinary according to explicit cast rules. + * + * @param mem VDBE memory register to convert. + */ +int +mem_convert_to_binary(struct Mem *mem); + void sqlVdbeMemInit(Mem *, sql *, u32); void sqlVdbeMemSetNull(Mem *); void sqlVdbeMemSetZeroBlob(Mem *, int); diff --git a/src/box/sql/vdbemem.c b/src/box/sql/vdbemem.c index 186aebe03..849d490b8 100644 --- a/src/box/sql/vdbemem.c +++ b/src/box/sql/vdbemem.c @@ -981,6 +981,21 @@ mem_set_array(struct Mem *mem, char *value, uint32_t size, int alloc_type) return 0; } +int +mem_convert_to_binary(struct Mem *mem) +{ + if (mem_is_null(mem) || mem_is_binary(mem)) + return 0; + if (mem_is_string(mem)) { + mem->flags = (mem->flags & (MEM_Dyn | MEM_Static | MEM_Ephem)) | + MEM_Blob; + return 0; + } + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, sql_value_to_diag_str(mem), + "varbinary"); + return -1; +} + /* * Return true if the Mem object contains a TEXT or BLOB that is * too large - whose size exceeds SQL_MAX_LENGTH. -- 2.25.1
next prev parent reply other threads:[~2021-02-01 8:16 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-01 8:14 [Tarantool-patches] [PATCH v1 00/10] Encapsulate MEM type changing and checking Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 01/10] sql: introduce mem_set_*() functions Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 02/10] sql: Initialize MEM in sqlVdbeAllocUnpackedRecord() Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 03/10] sql: introduce mem_is_*() functions Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` Mergen Imeev via Tarantool-patches [this message] 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 05/10] sql: refactor vdbesort.c Mergen Imeev via Tarantool-patches 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 06/10] sql: refactor sql/func.c Mergen Imeev via Tarantool-patches 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 07/10] sql: refactor vdbetrace.c Mergen Imeev via Tarantool-patches 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 08/10] sql: refactor vdbeapi.c Mergen Imeev via Tarantool-patches 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 09/10] sql: refactor vdbeaux.c Mergen Imeev via Tarantool-patches 2021-02-09 9:51 ` [Tarantool-patches] FW: " Timur Safin via Tarantool-patches 2021-02-13 15:33 ` Mergen Imeev via Tarantool-patches 2021-02-28 17:35 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 10/10] sql: refactor vdbe.c Mergen Imeev via Tarantool-patches [not found] ` <047f01d6fec7$b5a90bb0$20fb2310$@tarantool.org> 2021-02-13 15:26 ` Mergen Imeev via Tarantool-patches 2021-02-09 9:36 ` [Tarantool-patches] [PATCH v1 00/10] Encapsulate MEM type changing and checking Timur Safin via Tarantool-patches 2021-02-13 15:13 ` 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=7b6a3cf80a894403d3ce6b9bcc50d805868a9df8.1612166870.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=s.ostanevich@corp.mail.ru \ --cc=tsafin@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 04/10] sql: introduce mem_convert_to_binary()' \ /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