From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 4B1006B962; Wed, 14 Apr 2021 02:41:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4B1006B962 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618357306; bh=Xt16IHAbgjoMGixJk27CgbTIHwBSwxx42xivmgr+UgA=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=l2bToKQB5rC58cvlI7oeN+dLe9jnjJVvxlANzeXju0BCp9ZiYNtH16b86LyhzDB47 rCBjVUxKiruyd/8dbRnFVAiZFhpIVAiW8PPQyXM52MMCAfO6krnEvPU9+dnFfi+RwB DLpEd5MkhXgTaPZbkK9wSnsZ590RxczZCB1rEgCk= Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [217.69.128.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 807096EC5B for ; Wed, 14 Apr 2021 02:41:44 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 807096EC5B Received: by smtp59.i.mail.ru with esmtpa (envelope-from ) id 1lWSf9-0000JT-IV; Wed, 14 Apr 2021 02:41:44 +0300 Date: Wed, 14 Apr 2021 02:41:42 +0300 To: Vladislav Shpilevoy Message-ID: <20210413234142.GA101298@tarantool.org> References: <39f3cc5d8873f763fb0d609f64e026120cbf6de4.1618000037.git.imeevma@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74806859AC5FE18436AEED970E897805ADA4182A05F5380850404C6C14AA0D6DD78B1F916042211D82A721E9D1C3F9AA966BB2CF574C75D92F52 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72AC9FB60380F23AEEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379E90269B204C5E5D8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2EDA9303A10655C6795717D4CC574BFC216A3AA18C56759C2D2E47CDBA5A96583C09775C1D3CA48CFCA5A41EBD8A3A0199FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3ED8438A78DFE0A9E117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CFBADDBDADFC7C5BB2BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B6EC21FACCB09232A276E601842F6C81A1F004C906525384307823802FF610243D2EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7AD122C37AACC1F02731C566533BA786AA5CC5B56E945C8DA X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2368A440D3B0F6089093C9A16E5BC824A2A04A2ABAA09D2538DECB10C4E1BE3BCB8CCF60F6B7FD3948E1CD14B953EB46D7383FCAA5385BD6F355D89D7DBCDD132 X-C1DE0DAB: 0D63561A33F958A53752A9FE535F95920B49A8668E026F8B17F6E448DD866C64D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34351729636A02D1DEAC522A3FC833B92656219426DE450C462BAAD83C14C64B90BAF3155F8FA742F81D7E09C32AA3244C4497B4DD718CFA0162B5BFDA0B8B6490F2F5F14F68F1805BFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnA7/qPBUIXFEBHY/IECWgw== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306EDE08E053CDB1F682A1F916042211D82A7EC9A243AB1C8B1BC5105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v5 42/52] sql: introduce mem_to_str() and mem_to_str0() X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mergen Imeev via Tarantool-patches Reply-To: Mergen Imeev Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thank you for the review! My answer, diff and new patch below. Also, I moved _to_() 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 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)