From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1 20/21] sql: remove MEM_Term flag Date: Thu, 11 Nov 2021 13:49:26 +0300 [thread overview] Message-ID: <a57d93a04fbc3a18e81b0569f45ba6e7d22af17b.1636627580.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1636627579.git.imeevma@gmail.com> This patch removes the MEM_Term flag, because after changes in the SQL built-in functions, this flag is no longer used. Needed for #4145 --- src/box/sql/mem.c | 78 +++-------------------------------------- src/box/sql/mem.h | 36 ------------------- src/box/sql/printf.c | 20 +++++++++-- src/box/sql/vdbe.h | 4 ++- src/box/sql/vdbeaux.c | 31 ++++------------ src/box/sql/whereexpr.c | 18 +++++++--- 6 files changed, 43 insertions(+), 144 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 4150a24f0..1f5df3332 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -346,21 +346,18 @@ void mem_set_str0_ephemeral(struct Mem *mem, char *value) { set_str_const(mem, value, strlen(value), MEM_Ephem); - mem->flags |= MEM_Term; } void mem_set_str0_static(struct Mem *mem, char *value) { set_str_const(mem, value, strlen(value), MEM_Static); - mem->flags |= MEM_Term; } void mem_set_str0_allocated(struct Mem *mem, char *value) { set_str_dynamic(mem, value, strlen(value), 0); - mem->flags |= MEM_Term; } int @@ -392,7 +389,6 @@ mem_copy_str0(struct Mem *mem, const char *value) if (mem_copy_str(mem, value, len + 1) != 0) return -1; mem->n = len; - mem->flags |= MEM_Term; return 0; } @@ -657,24 +653,12 @@ int_to_str0(struct Mem *mem) return mem_copy_str0(mem, str); } -static inline int -str_to_str0(struct Mem *mem) -{ - assert(mem->type == MEM_TYPE_STR); - if (sqlVdbeMemGrow(mem, mem->n + 1, 1) != 0) - return -1; - mem->z[mem->n] = '\0'; - mem->flags |= MEM_Term; - mem->flags &= ~MEM_Scalar; - return 0; -} - static inline int str_to_bin(struct Mem *mem) { assert(mem->type == MEM_TYPE_STR); mem->type = MEM_TYPE_BIN; - mem->flags &= ~(MEM_Term | MEM_Scalar); + mem->flags &= ~MEM_Scalar; return 0; } @@ -725,18 +709,6 @@ bin_to_str(struct Mem *mem) return 0; } -static inline int -bin_to_str0(struct Mem *mem) -{ - assert(mem->type == MEM_TYPE_BIN); - if (sqlVdbeMemGrow(mem, mem->n + 1, 1) != 0) - return -1; - mem->z[mem->n] = '\0'; - mem->type = MEM_TYPE_STR; - mem->flags = MEM_Term; - return 0; -} - static inline int bin_to_uuid(struct Mem *mem) { @@ -1002,7 +974,7 @@ double_to_str0(struct Mem *mem) sql_snprintf(BUF_SIZE, mem->z, "%!.15g", mem->u.r); mem->n = strlen(mem->z); mem->type = MEM_TYPE_STR; - mem->flags = MEM_Term; + mem->flags = 0; return 0; } @@ -1284,39 +1256,6 @@ mem_to_number(struct Mem *mem) return -1; } -int -mem_to_str0(struct Mem *mem) -{ - assert(mem->type < MEM_TYPE_INVALID); - switch (mem->type) { - case MEM_TYPE_STR: - if ((mem->flags & MEM_Term) != 0) { - mem->flags &= ~MEM_Scalar; - return 0; - } - return str_to_str0(mem); - case MEM_TYPE_INT: - case MEM_TYPE_UINT: - return int_to_str0(mem); - case MEM_TYPE_DOUBLE: - return double_to_str0(mem); - case MEM_TYPE_BOOL: - return bool_to_str0(mem); - case MEM_TYPE_BIN: - return bin_to_str0(mem); - case MEM_TYPE_MAP: - return map_to_str0(mem); - case MEM_TYPE_ARRAY: - return array_to_str0(mem); - case MEM_TYPE_UUID: - return uuid_to_str0(mem); - case MEM_TYPE_DEC: - return dec_to_str0(mem); - default: - return -1; - } -} - int mem_to_str(struct Mem *mem) { @@ -1763,15 +1702,6 @@ mem_get_bool(const struct Mem *mem, bool *b) return -1; } -int -mem_get_str0(const struct Mem *mem, const char **s) -{ - if (mem->type != MEM_TYPE_STR || (mem->flags & MEM_Term) == 0) - return -1; - *s = mem->z; - return 0; -} - int mem_get_bin(const struct Mem *mem, const char **s) { @@ -1814,7 +1744,7 @@ mem_copy(struct Mem *to, const struct Mem *from) to->szMalloc = sqlDbMallocSize(to->db, to->zMalloc); memcpy(to->zMalloc, to->z, to->n); to->z = to->zMalloc; - to->flags &= MEM_Term; + to->flags = 0; return 0; } @@ -1831,7 +1761,7 @@ mem_copy_as_ephemeral(struct Mem *to, const struct Mem *from) return; if ((to->flags & (MEM_Static | MEM_Ephem)) != 0) return; - to->flags &= MEM_Term; + to->flags = 0; to->flags |= MEM_Ephem; return; } diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index d2e9cc135..1ef8a945b 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -98,13 +98,6 @@ struct Mem { /** MEM is of SCALAR meta-type. */ #define MEM_Scalar 0x0002 #define MEM_Cleared 0x0200 /* NULL set by OP_Null, not from data */ - -/* Whenever Mem contains a valid string or blob representation, one of - * the following flags must be set to determine the memory management - * policy for Mem.z. The MEM_Term flag tells us whether or not the - * string is \000 or \u0000 terminated - */ -#define MEM_Term 0x0400 /* String rep is nul terminated */ #define MEM_Static 0x1000 /* Mem.z points to a static string */ #define MEM_Ephem 0x2000 /* Mem.z points to an ephemeral string */ @@ -610,14 +603,6 @@ mem_to_number(struct Mem *mem); int mem_to_str(struct Mem *mem); -/** - * Convert the given MEM to STRING. This function and the function above define - * the rules that are used to convert values of all other types to STRING. In - * this function, the string received after convertion is NULL-terminated. - */ -int -mem_to_str0(struct Mem *mem); - /** Convert the given MEM to given type according to explicit cast rules. */ int mem_cast_explicit(struct Mem *mem, enum field_type type); @@ -722,27 +707,6 @@ mem_get_bool_unsafe(const struct Mem *mem) return b; } -/** - * Return value for MEM of STRING type if MEM contains a NULL-terminated string. - * Otherwise convert value of the MEM to NULL-terminated string if possible and - * return converted value. Original MEM is not changed. - */ -int -mem_get_str0(const struct Mem *mem, const char **s); - -/** - * Return value for MEM of STRING type if MEM contains NULL-terminated string. - * Otherwise convert MEM to MEM of string type that contains NULL-terminated - * string and return its value. Return NULL if conversion is impossible. - */ -static inline const char * -mem_as_str0(struct Mem *mem) -{ - if (mem_to_str0(mem) != 0) - return NULL; - return mem->z; -} - /** * Return value for MEM of VARBINARY type. For MEM of all other types convert * value of the MEM to VARBINARY if possible and return converted value. diff --git a/src/box/sql/printf.c b/src/box/sql/printf.c index 5b61646e3..8da7c9878 100644 --- a/src/box/sql/printf.c +++ b/src/box/sql/printf.c @@ -160,8 +160,20 @@ getTextArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0; - struct Mem *mem = &p->apArg[p->nUsed++]; - return (char *)mem_as_str0(mem); + struct Mem mem; + mem_create(&mem); + mem_copy_as_ephemeral(&mem, &p->apArg[p->nUsed++]); + if (mem_to_str(&mem) != 0) { + mem_destroy(&mem); + return NULL; + } + char *str = sqlDbMallocRawNN(sql_get(), mem.n + 1); + if (str == NULL) + return NULL; + memcpy(str, mem.z, mem.n); + str[mem.n] = '\0'; + mem_destroy(&mem); + return str; } /* @@ -677,6 +689,7 @@ sqlVXPrintf(StrAccum * pAccum, /* Accumulate results here */ if (bArgList) { bufpt = getTextArg(pArgList); c = bufpt ? bufpt[0] : 0; + zExtra = bufpt; } else { c = va_arg(ap, int); } @@ -697,7 +710,7 @@ sqlVXPrintf(StrAccum * pAccum, /* Accumulate results here */ case etDYNSTRING: if (bArgList) { bufpt = getTextArg(pArgList); - xtype = etSTRING; + xtype = etDYNSTRING; } else { bufpt = va_arg(ap, char *); } @@ -727,6 +740,7 @@ sqlVXPrintf(StrAccum * pAccum, /* Accumulate results here */ if (bArgList) { escarg = getTextArg(pArgList); + zExtra = escarg; } else { escarg = va_arg(ap, char *); } diff --git a/src/box/sql/vdbe.h b/src/box/sql/vdbe.h index 106555bb1..48e687d49 100644 --- a/src/box/sql/vdbe.h +++ b/src/box/sql/vdbe.h @@ -260,6 +260,9 @@ vdbe_metadata_set_col_autoincrement(struct Vdbe *p, int idx); int vdbe_metadata_set_col_span(struct Vdbe *p, int idx, const char *span); +const struct Mem * +vdbe_get_bound_value(struct Vdbe *vdbe, int id); + void sqlVdbeCountChanges(Vdbe *); sql *sqlVdbeDb(Vdbe *); void sqlVdbeSetSql(Vdbe *, const char *z, int n); @@ -268,7 +271,6 @@ void sqlVdbeSwap(Vdbe *, Vdbe *); struct VdbeOp * sqlVdbeTakeOpArray(struct Vdbe *p, int *pnOp); -sql_value *sqlVdbeGetBoundValue(Vdbe *, int); char *sqlVdbeExpandSql(Vdbe *, const char *); /** diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index b71f65966..109ab1446 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -2285,31 +2285,12 @@ sqlVdbeDb(Vdbe * v) return v->db; } -/* - * Return a pointer to an sql_value structure containing the value bound - * parameter iVar of VM v. Except, if the value is an SQL NULL, return - * 0 instead. Unless it is NULL, apply type to the value before returning it. - * - * The returned value must be freed by the caller using sqlValueFree(). - */ -sql_value * -sqlVdbeGetBoundValue(struct Vdbe *v, int iVar) -{ - assert(iVar > 0); - if (v) { - Mem *pMem = &v->aVar[iVar - 1]; - if (!mem_is_null(pMem)) { - sql_value *pRet = sqlValueNew(v->db); - if (pRet == NULL) - return NULL; - if (mem_copy(pRet, pMem) != 0) { - sqlValueFree(pRet); - return NULL; - } - return pRet; - } - } - return 0; +const struct Mem * +vdbe_get_bound_value(struct Vdbe *vdbe, int id) +{ + if (vdbe == NULL || id < 0 || id >= vdbe->nVar) + return NULL; + return &vdbe->aVar[id]; } void diff --git a/src/box/sql/whereexpr.c b/src/box/sql/whereexpr.c index 6849f13ec..08a1b4e3a 100644 --- a/src/box/sql/whereexpr.c +++ b/src/box/sql/whereexpr.c @@ -268,7 +268,6 @@ like_optimization_is_valid(Parse *pParse, Expr *pExpr, Expr **ppPrefix, int cnt; /* Database connection. */ sql *db = pParse->db; - sql_value *pVal = 0; /* Opcode of pRight. */ int op; /* Result code to return. */ @@ -306,13 +305,22 @@ like_optimization_is_valid(Parse *pParse, Expr *pExpr, Expr **ppPrefix, return 0; op = pRight->op; + struct region *region = &pParse->region; + size_t svp = region_used(region); if (op == TK_VARIABLE) { Vdbe *pReprepare = pParse->pReprepare; int iCol = pRight->iColumn; - pVal = sqlVdbeGetBoundValue(pReprepare, iCol); - if (pVal != NULL && mem_is_str(pVal)) { - if (mem_as_str0(pVal) == NULL) + const struct Mem *var = vdbe_get_bound_value(pReprepare, iCol); + if (var != NULL && mem_is_str(var)) { + uint32_t size = var->n + 1; + char *str = region_alloc(region, size); + if (str == NULL) { + diag_set(OutOfMemory, size, "region", "str"); return -1; + } + memcpy(str, var->z, var->n); + str[var->n] = '\0'; + z = str; } assert(pRight->op == TK_VARIABLE || pRight->op == TK_REGISTER); } else if (op == TK_STRING) { @@ -356,8 +364,8 @@ like_optimization_is_valid(Parse *pParse, Expr *pExpr, Expr **ppPrefix, } } + region_truncate(region, svp); rc = (z != 0); - sqlValueFree(pVal); return rc; } -- 2.25.1
next prev parent reply other threads:[~2021-11-11 11:00 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-11 10:48 [Tarantool-patches] [PATCH v1 00/21] Refactor non-standard and non-aggragate functions Mergen Imeev via Tarantool-patches 2021-11-11 10:48 ` [Tarantool-patches] [PATCH v1 01/21] sql: rework CHAR() function Mergen Imeev via Tarantool-patches 2021-11-11 10:48 ` [Tarantool-patches] [PATCH v1 02/21] sql: refactor GREATEST() and LEAST() functions Mergen Imeev via Tarantool-patches 2021-11-11 10:48 ` [Tarantool-patches] [PATCH v1 03/21] sql: refactor HEX() function Mergen Imeev via Tarantool-patches 2021-11-11 10:48 ` [Tarantool-patches] [PATCH v1 04/21] sql: refactor LENGTH() function Mergen Imeev via Tarantool-patches 2021-11-11 10:48 ` [Tarantool-patches] [PATCH v1 05/21] sql: refactor PRINTF() function Mergen Imeev via Tarantool-patches 2021-11-11 10:48 ` [Tarantool-patches] [PATCH v1 06/21] sql: refactor RANDOM() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 07/21] sql: rework RANDOMBLOB() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 08/21] sql: refactor ZEROBLOB() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 09/21] sql: refactor TYPEOF() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 10/21] sql: refactor ROUND() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 11/21] sql: refactor ROW_COUNT() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 12/21] sql: rework UUID() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 13/21] sql: refactor VERSION() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 14/21] sql: refactor UNICODE() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 15/21] sql: refactor SOUNDEX() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 16/21] sql: refactor REPLACE() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 17/21] sql: refactor QUOTE() function Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 18/21] sql: remove unused code Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 19/21] sql: remove MEM_Dyn flag Mergen Imeev via Tarantool-patches 2021-11-11 10:49 ` Mergen Imeev via Tarantool-patches [this message] 2021-11-11 10:49 ` [Tarantool-patches] [PATCH v1 21/21] sql: make arguments to be const Mergen Imeev via Tarantool-patches 2021-11-11 11:00 ` [Tarantool-patches] [PATCH v1 00/21] Refactor non-standard and non-aggragate functions Kirill Yukhin via Tarantool-patches -- strict thread matches above, loose matches on Subject: below -- 2021-10-08 17:31 Mergen Imeev via Tarantool-patches 2021-10-08 17:32 ` [Tarantool-patches] [PATCH v1 20/21] sql: remove MEM_Term flag Mergen Imeev via Tarantool-patches 2021-10-14 22:47 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-25 9:57 ` 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=a57d93a04fbc3a18e81b0569f45ba6e7d22af17b.1636627580.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=kyukhin@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 20/21] sql: remove MEM_Term flag' \ /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