From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v4 52/53] sql: introduce mem_get_binary() Date: Tue, 23 Mar 2021 12:36:52 +0300 [thread overview] Message-ID: <92aa7f0028c320067de4761114c9b01baebe7be9.1616491731.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1616491730.git.imeevma@gmail.com> This patch introduces mem_get_binary() which is used to receive binary value from MEM. Part of #5818 --- src/box/sql/func.c | 31 ++++++++++++++++++++++--------- src/box/sql/mem.c | 35 +++++++++++++---------------------- src/box/sql/mem.h | 6 +++--- src/box/sql/sqlInt.h | 3 --- src/box/sql/vdbeapi.c | 7 ------- 5 files changed, 38 insertions(+), 44 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 78f4ec3b5..199f3abef 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -72,6 +72,19 @@ mem_get_ustr(struct Mem *mem) return (const unsigned char *)str; } +static const void * +mem_get_blob(struct Mem *mem) +{ + const char *s; + if (!mem_is_varstring(mem) && mem_convert_to_string(mem) != 0) + return NULL; + if (ExpandBlob(mem) != 0) + return NULL; + if (mem_get_binary(mem, &s) != 0) + return NULL; + return (const void *)s; +} + /* * Return the collating function associated with a function. */ @@ -154,7 +167,7 @@ port_vdbemem_dump_lua(struct port *base, struct lua_State *L, bool is_flat) case MP_BIN: case MP_ARRAY: case MP_MAP: - lua_pushlstring(L, sql_value_blob(param), + lua_pushlstring(L, mem_get_blob(param), (size_t) sql_value_bytes(param)); break; case MP_NIL: @@ -218,7 +231,7 @@ port_vdbemem_get_msgpack(struct port *base, uint32_t *size) case MP_ARRAY: case MP_MAP: { mpstream_encode_binl(&stream, sql_value_bytes(param)); - mpstream_memcpy(&stream, sql_value_blob(param), + mpstream_memcpy(&stream, mem_get_blob(param), sql_value_bytes(param)); break; } @@ -641,8 +654,8 @@ position_func(struct sql_context *context, int argc, struct Mem **argv) const unsigned char *haystack_str; const unsigned char *needle_str; if (haystack_type == MP_BIN) { - needle_str = sql_value_blob(needle); - haystack_str = sql_value_blob(haystack); + needle_str = mem_get_blob(needle); + haystack_str = mem_get_blob(haystack); assert(needle_str != NULL); assert(haystack_str != NULL || n_haystack_bytes == 0); /* @@ -785,7 +798,7 @@ substrFunc(sql_context * context, int argc, sql_value ** argv) mem_get_integer(argv[1], &p1, &unused); if (p0type == MP_BIN) { len = sql_value_bytes(argv[0]); - z = sql_value_blob(argv[0]); + z = mem_get_blob(argv[0]); if (z == 0) return; assert(len == sql_value_bytes(argv[0])); @@ -1420,9 +1433,9 @@ quoteFunc(sql_context * context, int argc, sql_value ** argv) case MP_ARRAY: case MP_MAP: { char *zText = 0; - char const *zBlob = sql_value_blob(argv[0]); + char const *zBlob = mem_get_blob(argv[0]); int nBlob = sql_value_bytes(argv[0]); - assert(zBlob == sql_value_blob(argv[0])); /* No encoding change */ + assert(zBlob == mem_get_blob(argv[0])); /* No encoding change */ zText = (char *)contextMalloc(context, (2 * (i64) nBlob) + 4); @@ -1556,9 +1569,9 @@ hexFunc(sql_context * context, int argc, sql_value ** argv) char *zHex, *z; assert(argc == 1); UNUSED_PARAMETER(argc); - pBlob = sql_value_blob(argv[0]); + pBlob = mem_get_blob(argv[0]); n = sql_value_bytes(argv[0]); - assert(pBlob == sql_value_blob(argv[0])); /* No encoding change */ + assert(pBlob == mem_get_blob(argv[0])); /* No encoding change */ z = zHex = contextMalloc(context, ((i64) n) * 2 + 1); if (zHex) { for (i = 0; i < n; i++, pBlob++) { diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index efd3e4677..bed9ae64a 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -1328,6 +1328,19 @@ mem_get_string0(const struct Mem *mem, const char **s) return 0; } +int +mem_get_binary(const struct Mem *mem, const char **s) +{ + if ((mem->flags & MEM_Str) != 0) { + *s = mem->n > 0 ? mem->z : NULL; + return 0; + } + if ((mem->flags & MEM_Blob) == 0 || (mem->flags & MEM_Zero) != 0) + return -1; + *s = mem->z; + return 0; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -2434,28 +2447,6 @@ releaseMemArray(Mem * p, int N) } } -/**************************** sql_value_ ****************************** - * The following routines extract information from a Mem or sql_value - * structure. - */ -const void * -sql_value_blob(sql_value * pVal) -{ - Mem *p = (Mem *) pVal; - if (p->flags & (MEM_Blob | MEM_Str)) { - if (ExpandBlob(p) != 0) { - assert(p->flags == MEM_Null && p->z == 0); - return 0; - } - p->flags |= MEM_Blob; - return p->n ? p->z : 0; - } else { - if (mem_convert_to_string(pVal) != 0) - return NULL; - return pVal->z; - } -} - int sql_value_bytes(sql_value * pVal) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index fb2385541..8af924d43 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -360,6 +360,9 @@ mem_get_boolean(const struct Mem *mem, bool *b); int mem_get_string0(const struct Mem *mem, const char **s); +int +mem_get_binary(const struct Mem *mem, const char **s); + /** * Simple type to str convertor. It is used to simplify * error reporting. @@ -435,9 +438,6 @@ releaseMemArray(Mem * p, int N); /** Getters. */ -const void * -sql_value_blob(struct Mem *); - int sql_value_bytes(struct Mem *); diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 2f995ffc6..9dfd0e4cc 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -433,9 +433,6 @@ sql_stmt_compile(const char *sql, int bytes_count, struct Vdbe *re_prepared, int sql_step(sql_stmt *); -const void * -sql_column_blob(sql_stmt *, int iCol); - int sql_column_bytes(sql_stmt *, int iCol); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 465284567..e76170965 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -471,13 +471,6 @@ columnMem(sql_stmt * pStmt, int i) * The following routines are used to access elements of the current row * in the result set. */ -const void * -sql_column_blob(sql_stmt * pStmt, int i) -{ - const void *val; - val = sql_value_blob(columnMem(pStmt, i)); - return val; -} int sql_column_bytes(sql_stmt * pStmt, int i) -- 2.25.1
next prev parent reply other threads:[~2021-03-23 10:00 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 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 ` Mergen Imeev via Tarantool-patches [this message] 2021-03-29 23:09 ` [Tarantool-patches] [PATCH v4 52/53] sql: introduce mem_get_binary() 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=92aa7f0028c320067de4761114c9b01baebe7be9.1616491731.git.imeevma@gmail.com \ --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 52/53] sql: introduce mem_get_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