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 8CF7E6BD34; Tue, 23 Mar 2021 12:56:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8CF7E6BD34 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616493408; bh=ZJ72z2e3xFNhbCWLpHjWSlretEM7F8FxiE9Joa4XvzY=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=a/Uge6WQ2TW8x+jCzC8JsL97C3RpX3qN1hDDuTiwcabBCoeLuLrIYIZyxHJu7N6Y/ ZGRSRnTHYJBrTnFGdnxRlNBfxKNaQV1q+NLDpXFFFa/n+JNgSdYTQab24U0TDGkblj zNKSg4sPsywthTFUqSBULJ4P8dobqmFqrJFQnh1E= Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [94.100.177.106]) (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 477EE68F61 for ; Tue, 23 Mar 2021 12:36:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 477EE68F61 Received: by smtp46.i.mail.ru with esmtpa (envelope-from ) id 1lOdSl-0006oo-G2; Tue, 23 Mar 2021 12:36:35 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 23 Mar 2021 12:36:35 +0300 Message-Id: <32e990d3f1683a87eba40d77874b4b3227ae1e71.1616491731.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD95D6E7CC48CB1F5F19D4B90E2C0E110A6B701D7D268243E19182A05F538085040E38FB6A45CB8D5710422742560058A44664C49811EA43B82C7C73800015D446F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73F94C36969B178B8EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378B67D2947F927BCB8638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C686AF563A045C75EFE549FF5CC2ADB8948D016FF4A8C5E8AA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE7328B01A8D746D8839FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C353FA85A707D24CADCC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C2249ADE67BC57278FB1076E601842F6C81A12EF20D2F80756B5F7E9C4E3C761E06A776E601842F6C81A127C277FBC8AE2E8BE78E946E591156C53AA81AA40904B5D9DBF02ECDB25306B2201CA6A4E26CD07C3BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B091A620F70A64A45A99449624AB7ADAF3735872C767BF85DA29E625A9149C048EE3F735096452955E34DCCFF368A6260CF4AD6D5ED66289B524E70A05D1297E1BB35872C767BF85DA227C277FBC8AE2E8BCFC11AAA4A30FD1F75ECD9A6C639B01B4E70A05D1297E1BBC6867C52282FAC85D9B7C4F32B44FF57D4B828FA1BC0F1ACBD9CCCA9EDD067B1EDA766A37F9254B7 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24A6D60772A99906F8E1CD14B953EB46D878200CEFCD84E84355D89D7DBCDD132 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C686AF563A045C75EFE549FF5CC2ADB8948D016FF4A8C5E8A9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34B0359B88B232A0C6FB920C3D3434FC7F0F884FE95B5C41F1C20F5494B4451AF63A47585D4538D33B1D7E09C32AA3244CEE96B39600FF02C1EB10436B8BCBCD5797FE24653F78E668FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojWJZv20R+6UgwxTAbE6eFUQ== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306ED606BBFF439DD154A0422742560058A4441B07CD4FDF173FB5105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 44/53] sql: introduce mem_convert_to_string() 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: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch introduces mem_convert_to_string(). This function is used to convert MEM to MEM contains string value. Part of #5818 --- src/box/sql/mem.c | 197 ++++++++++++++++++++++++++++++---------------- src/box/sql/mem.h | 7 +- 2 files changed, 133 insertions(+), 71 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 8600b5c41..262f48aca 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -818,6 +818,131 @@ mem_convert_to_number(struct Mem *mem) return -1; } +static inline int +mem_convert_integer_to_string(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_string0(mem, str); +} + +static inline int +mem_convert_array_to_string(struct Mem *mem) +{ + const char *str = mp_str(mem->z); + return mem_copy_string0(mem, str); +} + +static inline int +mem_convert_map_to_string(struct Mem *mem) +{ + const char *str = mp_str(mem->z); + return mem_copy_string0(mem, str); +} + +static inline int +mem_convert_boolean_to_string(struct Mem *mem) +{ + const char *str = mem->u.b ? "TRUE" : "FALSE"; + return mem_copy_string0(mem, str); +} + +static inline int +mem_convert_binary_to_string(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 +mem_convert_binary_to_string0(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 +mem_convert_double_to_string(struct Mem *mem) +{ + uint32_t size = 32; + if (sqlVdbeMemClearAndResize(mem, size) != 0) + return -1; + sql_snprintf(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 +mem_convert_string_to_string0(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_convert_to_string0(struct Mem *mem) +{ + if ((mem->flags & MEM_Str) != 0 && (mem->flags & MEM_Term) != 0) + return 0; + if ((mem->flags & MEM_Str) != 0) + return mem_convert_string_to_string0(mem); + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return mem_convert_integer_to_string(mem); + if ((mem->flags & MEM_Real) != 0) + return mem_convert_double_to_string(mem); + if ((mem->flags & MEM_Bool) != 0) + return mem_convert_boolean_to_string(mem); + if ((mem->flags & MEM_Blob) != 0) { + if ((mem->flags & MEM_Subtype) == 0) + return mem_convert_binary_to_string0(mem); + if (mp_typeof(*mem->z) == MP_MAP) + return mem_convert_map_to_string(mem); + return mem_convert_array_to_string(mem); + } + return -1; +} + +int +mem_convert_to_string(struct Mem *mem) +{ + if ((mem->flags & MEM_Str) != 0) + return 0; + if ((mem->flags & (MEM_Int | MEM_UInt)) != 0) + return mem_convert_integer_to_string(mem); + if ((mem->flags & MEM_Real) != 0) + return mem_convert_double_to_string(mem); + if ((mem->flags & MEM_Bool) != 0) + return mem_convert_boolean_to_string(mem); + if ((mem->flags & MEM_Blob) != 0) { + if ((mem->flags & MEM_Subtype) == 0) + return mem_convert_binary_to_string(mem); + if (mp_typeof(*mem->z) == MP_MAP) + return mem_convert_map_to_string(mem); + return mem_convert_array_to_string(mem); + } + return -1; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -1452,7 +1577,7 @@ valueToText(sql_value * pVal) pVal->flags |= MEM_Str; sqlVdbeMemNulTerminate(pVal); /* IMP: R-31275-44060 */ } else { - sqlVdbeMemStringify(pVal); + mem_convert_to_string(pVal); assert(0 == (1 & SQL_PTR_TO_INT(pVal->z))); } return pVal->z; @@ -1978,74 +2103,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. */ @@ -2163,7 +2220,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_convert_to_string(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 d5f0d7891..d370b448b 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -330,6 +330,12 @@ mem_convert_to_double(struct Mem *mem); int mem_convert_to_number(struct Mem *mem); +int +mem_convert_to_string(struct Mem *mem); + +int +mem_convert_to_string0(struct Mem *mem); + /** * Simple type to str convertor. It is used to simplify * error reporting. @@ -381,7 +387,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) (mem_is_zeroblob(P)? sqlVdbeMemExpandBlob(P) : 0) -- 2.25.1