From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v2 2/3] sql: make mem_is_bin() to check only for VARBINARY Date: Tue, 27 Apr 2021 19:55:24 +0300 [thread overview] Message-ID: <73769b1c3a358ebdbdb603592bda2353c0e6b800.1619542456.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1619542456.git.imeevma@gmail.com> After this patch, the mem_is_bin() function will return 'true' only if the value that the MEM contains is of type VARBINARY. This patch also adds the mem_is_bin_ext() function, which is used to check if a MEM contains value of type VARBINARY or value of types that are currently considered VARBINARY extensions - MAP and ARRAY. Part of #4906 --- src/box/sql/func.c | 10 +++++----- src/box/sql/mem.h | 8 +++++++- src/box/sql/vdbe.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index d282b2cea..bed7e8488 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -553,7 +553,7 @@ roundFunc(sql_context * context, int argc, sql_value ** argv) } if (mem_is_null(argv[0])) return; - if (mem_is_bin(argv[0])) { + if (mem_is_bin_ext(argv[0])) { diag_set(ClientError, ER_SQL_TYPE_MISMATCH, mem_str(argv[0]), "numeric"); context->is_aborted = true; @@ -613,7 +613,7 @@ case_type##ICUFunc(sql_context *context, int argc, sql_value **argv) \ const char *z2; \ int n; \ UNUSED_PARAMETER(argc); \ - if (mem_is_bin(argv[0])) { \ + if (mem_is_bin_ext(argv[0])) { \ diag_set(ClientError, ER_INCONSISTENT_TYPES, "text", \ "varbinary"); \ context->is_aborted = true; \ @@ -694,7 +694,7 @@ randomBlob(sql_context * context, int argc, sql_value ** argv) unsigned char *p; assert(argc == 1); UNUSED_PARAMETER(argc); - if (mem_is_bin(argv[0])) { + if (mem_is_bin_ext(argv[0])) { diag_set(ClientError, ER_SQL_TYPE_MISMATCH, mem_str(argv[0]), "numeric"); context->is_aborted = true; @@ -1455,7 +1455,7 @@ trim_func_one_arg(struct sql_context *context, sql_value *arg) const unsigned char *default_trim; if (mem_is_null(arg)) return; - if (mem_is_bin(arg)) + if (mem_is_bin_ext(arg)) default_trim = (const unsigned char *) "\0"; else default_trim = (const unsigned char *) " "; @@ -1584,7 +1584,7 @@ soundexFunc(sql_context * context, int argc, sql_value ** argv) 1, 2, 6, 2, 3, 0, 1, 0, 2, 0, 2, 0, 0, 0, 0, 0, }; assert(argc == 1); - if (mem_is_bin(argv[0])) { + if (mem_is_bin_ext(argv[0])) { diag_set(ClientError, ER_SQL_TYPE_MISMATCH, mem_str(argv[0]), "text"); context->is_aborted = true; diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 1db7f4deb..6fc15617d 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -184,7 +184,7 @@ mem_is_bool(const struct Mem *mem) static inline bool mem_is_bin(const struct Mem *mem) { - return (mem->flags & MEM_Blob) != 0; + return (mem->flags & MEM_Blob) != 0 && (mem->flags & MEM_Subtype) == 0; } static inline bool @@ -206,6 +206,12 @@ mem_is_array(const struct Mem *mem) mp_typeof(*mem->z) == MP_ARRAY; } +static inline bool +mem_is_bin_ext(const struct Mem *mem) +{ + return (mem->flags & MEM_Blob) != 0; +} + static inline bool mem_is_agg(const struct Mem *mem) { diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 2308587e7..bedfa87af 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1634,9 +1634,9 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ "boolean"); goto abort_due_to_error; } - } else if (mem_is_bin(pIn3) || mem_is_bin(pIn1)) { + } else if (mem_is_bin_ext(pIn3) || mem_is_bin_ext(pIn1)) { if (mem_cmp_bin(pIn3, pIn1, &res) != 0) { - char *str = !mem_is_bin(pIn3) ? + char *str = !mem_is_bin_ext(pIn3) ? mem_type_to_str(pIn3) : mem_type_to_str(pIn1); diag_set(ClientError, ER_SQL_TYPE_MISMATCH, str, @@ -2991,7 +2991,7 @@ case OP_Found: { /* jump, in3 */ } else { pFree = pIdxKey = sqlVdbeAllocUnpackedRecord(db, pC->key_def); if (pIdxKey==0) goto no_mem; - assert(mem_is_bin(pIn3)); + assert(mem_is_bin_ext(pIn3)); (void)ExpandBlob(pIn3); sqlVdbeRecordUnpackMsgpack(pC->key_def, pIn3->z, pIdxKey); @@ -3253,7 +3253,7 @@ case OP_SorterData: { assert(isSorter(pC)); if (sqlVdbeSorterRowkey(pC, pOut) != 0) goto abort_due_to_error; - assert(mem_is_bin(pOut)); + assert(mem_is_bin_ext(pOut)); assert(pOp->p1>=0 && pOp->p1<p->nCursor); p->apCsr[pOp->p3]->cacheStatus = CACHE_STALE; break; @@ -3616,7 +3616,7 @@ case OP_SorterInsert: { /* in2 */ assert(cursor != NULL); assert(isSorter(cursor)); pIn2 = &aMem[pOp->p2]; - assert(mem_is_bin(pIn2)); + assert(mem_is_bin_ext(pIn2)); if (ExpandBlob(pIn2) != 0 || sqlVdbeSorterWrite(cursor, pIn2) != 0) goto abort_due_to_error; @@ -3650,7 +3650,7 @@ case OP_SorterInsert: { /* in2 */ case OP_IdxReplace: case OP_IdxInsert: { pIn2 = &aMem[pOp->p1]; - assert(mem_is_bin(pIn2)); + assert(mem_is_bin_ext(pIn2)); if (ExpandBlob(pIn2) != 0) goto abort_due_to_error; struct space *space; @@ -3741,10 +3741,10 @@ case OP_Update: { assert(pOp->p4type == P4_SPACEPTR); struct Mem *key_mem = &aMem[pOp->p2]; - assert(mem_is_bin(key_mem)); + assert(mem_is_bin_ext(key_mem)); struct Mem *upd_fields_mem = &aMem[pOp->p3]; - assert(mem_is_bin(upd_fields_mem)); + assert(mem_is_bin_ext(upd_fields_mem)); uint32_t *upd_fields = (uint32_t *)upd_fields_mem->z; uint32_t upd_fields_cnt = upd_fields_mem->n / sizeof(uint32_t); -- 2.25.1
next prev parent reply other threads:[~2021-04-27 16:56 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1619542456.git.imeevma@gmail.com> 2021-04-27 16:55 ` [Tarantool-patches] [PATCH v2 1/3] sql: initialize MEM used in aggregate functions Mergen Imeev via Tarantool-patches 2021-04-29 21:02 ` Vladislav Shpilevoy via Tarantool-patches 2021-05-17 11:38 ` Mergen Imeev via Tarantool-patches 2021-04-27 16:55 ` Mergen Imeev via Tarantool-patches [this message] 2021-04-29 21:05 ` [Tarantool-patches] [PATCH v2 2/3] sql: make mem_is_bin() to check only for VARBINARY Vladislav Shpilevoy via Tarantool-patches 2021-05-17 12:05 ` 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=73769b1c3a358ebdbdb603592bda2353c0e6b800.1619542456.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 2/3] sql: make mem_is_bin() to check only for VARBINARY' \ /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