From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@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 02:41:42 +0300 [thread overview] Message-ID: <20210413234142.GA101298@tarantool.org> (raw) In-Reply-To: <afd5f3dd-9311-dae4-2631-64680bd1c6a7@tarantool.org> Thank you for the review! My answer, diff and new patch below. Also, I moved <type>_to_<type>() functions to group them. On Wed, Apr 14, 2021 at 12:58:05AM +0200, Vladislav Shpilevoy wrote: > 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. Added. Diff: diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 761abbc2c..830fc3840 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -506,6 +506,53 @@ int_to_double(struct Mem *mem) return 0; } +static inline int +int_to_str0(struct Mem *mem) +{ + const char *str; + if ((mem->flags & MEM_UInt) != 0) + str = tt_sprintf("%llu", mem->u.u); + else + str = tt_sprintf("%lld", mem->u.i); + return mem_copy_str0(mem, str); +} + +static inline int +str_to_str0(struct Mem *mem) +{ + assert((mem->flags | MEM_Str) != 0); + if (sqlVdbeMemGrow(mem, mem->n + 1, 1) != 0) + return -1; + mem->z[mem->n] = '\0'; + mem->flags |= MEM_Term; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + +static inline int +bin_to_str(struct Mem *mem) +{ + if (ExpandBlob(mem) != 0) + return -1; + mem->flags = (mem->flags & (MEM_Dyn | MEM_Static | MEM_Ephem)) | + MEM_Str; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + +static inline int +bin_to_str0(struct Mem *mem) +{ + if (ExpandBlob(mem) != 0) + return -1; + if (sqlVdbeMemGrow(mem, mem->n + 1, 1) != 0) + return -1; + mem->z[mem->n] = '\0'; + mem->flags = MEM_Str | MEM_Term; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + static inline int bytes_to_int(struct Mem *mem) { @@ -565,6 +612,18 @@ double_to_int_precise(struct Mem *mem) return -1; } +static inline int +double_to_str0(struct Mem *mem) +{ + if (sqlVdbeMemGrow(mem, BUF_SIZE, 0) != 0) + return -1; + sql_snprintf(BUF_SIZE, mem->z, "%!.15g", mem->u.r); + mem->n = strlen(mem->z); + mem->flags = MEM_Str | MEM_Term; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + static inline int bool_to_int(struct Mem *mem) { @@ -574,6 +633,27 @@ bool_to_int(struct Mem *mem) return 0; } +static inline int +bool_to_str0(struct Mem *mem) +{ + const char *str = mem->u.b ? "TRUE" : "FALSE"; + return mem_copy_str0(mem, str); +} + +static inline int +array_to_str0(struct Mem *mem) +{ + const char *str = mp_str(mem->z); + return mem_copy_str0(mem, str); +} + +static inline int +map_to_str0(struct Mem *mem) +{ + const char *str = mp_str(mem->z); + return mem_copy_str0(mem, str); +} + int mem_to_int(struct Mem *mem) { @@ -631,89 +711,10 @@ mem_to_number(struct Mem *mem) return -1; } -static inline int -int_to_str0(struct Mem *mem) -{ - const char *str; - if ((mem->flags & MEM_UInt) != 0) - str = tt_sprintf("%llu", mem->u.u); - else - str = tt_sprintf("%lld", mem->u.i); - return mem_copy_str0(mem, str); -} - -static inline int -array_to_str0(struct Mem *mem) -{ - const char *str = mp_str(mem->z); - return mem_copy_str0(mem, str); -} - -static inline int -map_to_str0(struct Mem *mem) -{ - const char *str = mp_str(mem->z); - return mem_copy_str0(mem, str); -} - -static inline int -bool_to_str0(struct Mem *mem) -{ - const char *str = mem->u.b ? "TRUE" : "FALSE"; - return mem_copy_str0(mem, str); -} - -static inline int -bin_to_str(struct Mem *mem) -{ - if (ExpandBlob(mem) != 0) - return -1; - mem->flags = (mem->flags & (MEM_Dyn | MEM_Static | MEM_Ephem)) | - MEM_Str; - mem->field_type = FIELD_TYPE_STRING; - return 0; -} - -static inline int -bin_to_str0(struct Mem *mem) -{ - if (ExpandBlob(mem) != 0) - return -1; - if (sqlVdbeMemGrow(mem, mem->n + 1, 1) != 0) - return -1; - mem->z[mem->n] = '\0'; - mem->flags = MEM_Str | MEM_Term; - mem->field_type = FIELD_TYPE_STRING; - return 0; -} - -static inline int -double_to_str0(struct Mem *mem) -{ - if (sqlVdbeMemGrow(mem, BUF_SIZE, 0) != 0) - return -1; - sql_snprintf(BUF_SIZE, mem->z, "%!.15g", mem->u.r); - mem->n = strlen(mem->z); - mem->flags = MEM_Str | MEM_Term; - mem->field_type = FIELD_TYPE_STRING; - return 0; -} - -static inline int -str_to_str0(struct Mem *mem) -{ - assert((mem->flags | MEM_Str) != 0); - if (sqlVdbeMemGrow(mem, mem->n + 1, 1) != 0) - return -1; - mem->z[mem->n] = '\0'; - mem->flags |= MEM_Term; - mem->field_type = FIELD_TYPE_STRING; - return 0; -} - int mem_to_str0(struct Mem *mem) { + assert((mem->flags & MEM_PURE_TYPE_MASK) != 0); if ((mem->flags & (MEM_Str | MEM_Term)) == (MEM_Str | MEM_Term)) return 0; if ((mem->flags & MEM_Str) != 0) @@ -737,6 +738,7 @@ mem_to_str0(struct Mem *mem) int mem_to_str(struct Mem *mem) { + assert((mem->flags & MEM_PURE_TYPE_MASK) != 0); if ((mem->flags & MEM_Str) != 0) return 0; if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) New patch: commit 46a840d827f10f69cfcd7fd0075aa09ddd27ccc8 Author: Mergen Imeev <imeevma@gmail.com> Date: Wed Mar 17 11:55:48 2021 +0300 sql: introduce mem_to_str() and mem_to_str0() This patch introduces mem_to_str() and mem_to_str0() functions. These functions are used to convert a MEM to a MEM that contains string value. These functions defines the rules that are used during convertion from values of all other types to STRING. Part of #5818 diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 990e261b7..830fc3840 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -506,6 +506,53 @@ int_to_double(struct Mem *mem) return 0; } +static inline int +int_to_str0(struct Mem *mem) +{ + const char *str; + if ((mem->flags & MEM_UInt) != 0) + str = tt_sprintf("%llu", mem->u.u); + else + str = tt_sprintf("%lld", mem->u.i); + return mem_copy_str0(mem, str); +} + +static inline int +str_to_str0(struct Mem *mem) +{ + assert((mem->flags | MEM_Str) != 0); + if (sqlVdbeMemGrow(mem, mem->n + 1, 1) != 0) + return -1; + mem->z[mem->n] = '\0'; + mem->flags |= MEM_Term; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + +static inline int +bin_to_str(struct Mem *mem) +{ + if (ExpandBlob(mem) != 0) + return -1; + mem->flags = (mem->flags & (MEM_Dyn | MEM_Static | MEM_Ephem)) | + MEM_Str; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + +static inline int +bin_to_str0(struct Mem *mem) +{ + if (ExpandBlob(mem) != 0) + return -1; + if (sqlVdbeMemGrow(mem, mem->n + 1, 1) != 0) + return -1; + mem->z[mem->n] = '\0'; + mem->flags = MEM_Str | MEM_Term; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + static inline int bytes_to_int(struct Mem *mem) { @@ -565,6 +612,18 @@ double_to_int_precise(struct Mem *mem) return -1; } +static inline int +double_to_str0(struct Mem *mem) +{ + if (sqlVdbeMemGrow(mem, BUF_SIZE, 0) != 0) + return -1; + sql_snprintf(BUF_SIZE, mem->z, "%!.15g", mem->u.r); + mem->n = strlen(mem->z); + mem->flags = MEM_Str | MEM_Term; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + static inline int bool_to_int(struct Mem *mem) { @@ -574,6 +633,27 @@ bool_to_int(struct Mem *mem) return 0; } +static inline int +bool_to_str0(struct Mem *mem) +{ + const char *str = mem->u.b ? "TRUE" : "FALSE"; + return mem_copy_str0(mem, str); +} + +static inline int +array_to_str0(struct Mem *mem) +{ + const char *str = mp_str(mem->z); + return mem_copy_str0(mem, str); +} + +static inline int +map_to_str0(struct Mem *mem) +{ + const char *str = mp_str(mem->z); + return mem_copy_str0(mem, str); +} + int mem_to_int(struct Mem *mem) { @@ -631,6 +711,52 @@ mem_to_number(struct Mem *mem) return -1; } +int +mem_to_str0(struct Mem *mem) +{ + assert((mem->flags & MEM_PURE_TYPE_MASK) != 0); + 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) +{ + assert((mem->flags & MEM_PURE_TYPE_MASK) != 0); + 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; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -1291,7 +1417,7 @@ valueToText(sql_value * pVal) pVal->flags |= MEM_Str; sqlVdbeMemNulTerminate(pVal); /* IMP: R-31275-44060 */ } else { - sqlVdbeMemStringify(pVal); + mem_to_str(pVal); assert(0 == (1 & SQL_PTR_TO_INT(pVal->z))); } return pVal->z; @@ -1775,74 +1901,6 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type) } } -/* - * Add MEM_Str to the set of representations for the given Mem. Numbers - * are converted using sql_snprintf(). Converting a BLOB to a string - * is a no-op. - * - * Existing representations MEM_Int and MEM_Real are invalidated if - * bForce is true but are retained if bForce is false. - * - * A MEM_Null value will never be passed to this function. This function is - * used for converting values to text for returning to the user (i.e. via - * sql_value_text()), or for ensuring that values to be used as btree - * keys are strings. In the former case a NULL pointer is returned the - * user and the latter is an internal programming error. - */ -int -sqlVdbeMemStringify(Mem * pMem) -{ - int fg = pMem->flags; - int nByte = 32; - - if ((fg & (MEM_Null | MEM_Str | MEM_Blob)) != 0 && - !mem_has_msgpack_subtype(pMem)) - return 0; - - assert(!(fg & MEM_Zero)); - assert((fg & (MEM_Int | MEM_UInt | MEM_Real | MEM_Bool | - MEM_Blob)) != 0); - assert(EIGHT_BYTE_ALIGNMENT(pMem)); - - /* - * In case we have ARRAY/MAP we should save decoded value - * before clearing pMem->z. - */ - char *value = NULL; - if (mem_has_msgpack_subtype(pMem)) { - const char *value_str = mp_str(pMem->z); - nByte = strlen(value_str) + 1; - value = region_alloc(&fiber()->gc, nByte); - memcpy(value, value_str, nByte); - } - - if (sqlVdbeMemClearAndResize(pMem, nByte)) { - return -1; - } - if (fg & MEM_Int) { - sql_snprintf(nByte, pMem->z, "%lld", pMem->u.i); - pMem->flags &= ~MEM_Int; - } else if ((fg & MEM_UInt) != 0) { - sql_snprintf(nByte, pMem->z, "%llu", pMem->u.u); - pMem->flags &= ~MEM_UInt; - } else if ((fg & MEM_Bool) != 0) { - sql_snprintf(nByte, pMem->z, "%s", - SQL_TOKEN_BOOLEAN(pMem->u.b)); - pMem->flags &= ~MEM_Bool; - } else if (mem_has_msgpack_subtype(pMem)) { - sql_snprintf(nByte, pMem->z, "%s", value); - pMem->flags &= ~MEM_Subtype; - pMem->subtype = SQL_SUBTYPE_NO; - } else { - assert(fg & MEM_Real); - sql_snprintf(nByte, pMem->z, "%!.15g", pMem->u.r); - pMem->flags &= ~MEM_Real; - } - pMem->n = sqlStrlen30(pMem->z); - pMem->flags |= MEM_Str | MEM_Term; - return 0; -} - /* * Make sure the given Mem is \u0000 terminated. */ @@ -1965,7 +2023,7 @@ mem_apply_type(struct Mem *record, enum field_type type) */ if ((record->flags & MEM_Str) == 0 && (record->flags & (MEM_Real | MEM_Int | MEM_UInt)) != 0) - sqlVdbeMemStringify(record); + mem_to_str(record); record->flags &= ~(MEM_Real | MEM_Int | MEM_UInt); return 0; case FIELD_TYPE_VARBINARY: diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 85ad94ab3..454553d92 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -715,6 +715,23 @@ mem_to_double(struct Mem *mem); int mem_to_number(struct Mem *mem); +/** + * Convert the given MEM to STRING. This function and the function below define + * the rules that are used to convert values of all other types to STRING. In + * this function, the string received after the convertion may be not + * NULL-terminated. + */ +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); + /** * Simple type to str convertor. It is used to simplify * error reporting. @@ -749,7 +766,6 @@ registerTrace(int iReg, Mem *p); #endif int sqlVdbeMemCast(struct Mem *, enum field_type type); -int sqlVdbeMemStringify(struct Mem *); int sqlVdbeMemNulTerminate(struct Mem *); int sqlVdbeMemExpandBlob(struct Mem *); #define ExpandBlob(P) (((P)->flags&MEM_Zero)?sqlVdbeMemExpandBlob(P):0)
next prev parent reply other threads:[~2021-04-13 23:41 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 2021-04-13 23:41 ` Mergen Imeev via Tarantool-patches [this message] 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=20210413234142.GA101298@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@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