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 016596FC8F; Tue, 23 Mar 2021 12:49:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 016596FC8F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616492959; bh=Hwk/FYchLYu7IM7M6WsEFlCj/StMsHFC3h+mwXz4mO4=; 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=ap6oBp7c7gMYXqrbd3DxuhChUS8Oke3+T2vXVszgIxjWvPPail9n3j92MM/bPc5wG BzYmkxycxNpQ+Kgw2GAKp3sX0ndBtMMvcMAf4qrzkb0i+cQHSJp2f/kGWzeRmEmNQT ULTJw55xeI+qU2X+7C4t1cjSSnKtzPNcDh/qYGJo= Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (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 82EB668F52 for ; Tue, 23 Mar 2021 12:35:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 82EB668F52 Received: by smtp40.i.mail.ru with esmtpa (envelope-from ) id 1lOdS9-0005VW-QN; Tue, 23 Mar 2021 12:35:58 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 23 Mar 2021 12:35:57 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD95D6E7CC48CB1F5F10D3016C09B407F8B88411E9FEB481E8E182A05F538085040223A72B5B79C449EC6B49C9D447E3EE7D468D7FCDD8BA23CEB49CD522201A816 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE711269A7C2F827F16EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637578F58D66D7052C48638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C686AF563A045C75E9B1209ABBA18885E1D0E87E259B6C39FA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE77FFCE1C639F4728C9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C311471C67CF6D96D5117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CFEB76C46DA57105D6BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B69E7299252A2A5EB676E601842F6C81A1F004C906525384307823802FF610243DF43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B3BBE47FD9DD3FB59A8DF7F3B2552694A57739F23D657EF2B13377AFFFEAFD26923F8577A6DFFEA7C2C2559B29ED8195093EC92FD9297F6715571747095F342E857739F23D657EF2BD5E8D9A59859A8B6D75B66E98413B381089D37D7C0E48F6C5571747095F342E857739F23D657EF2B6825BDBE14D8E7024847893F9AA87235E5BFE6E7EFDEDCD789D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24A6D60772A99906F8E1CD14B953EB46DA9F0780757E13EC2355D89D7DBCDD132 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C686AF563A045C75E9B1209ABBA18885E1D0E87E259B6C39F9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34697E0FA301E282152759C7C1B21DD046794E9DCAD0D4FEF1BF9BB555DEC9EE068FA8E0F066F3AA501D7E09C32AA3244C31BD56DFA9764F3ADA6EEA4BD820546B69B6CAE0477E908DFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojWJZv20R+6Uibgrsv9fX8Wg== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306ED80097E6508FD0E73C6B49C9D447E3EE7B9A8FEFFB5F7F2D55105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 29/53] sql: introduce mem_copy_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_copy_string() function. Function mem_copy_string() clears MEM, allocates enough memory and copies given string to allocated memory. Part of #5818 --- src/box/sql/func.c | 8 +++----- src/box/sql/mem.c | 30 ++++++++++++++++++++++++++++-- src/box/sql/mem.h | 6 ++++++ src/box/sql/vdbeapi.c | 17 ++++++++++++++--- 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 6f5fe8cb6..1b3929259 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -284,9 +284,8 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size) mem_set_unsigned(&val[i], field.ival); break; case MP_STR: - if (sqlVdbeMemSetStr(&val[i], field.sval.data, - field.sval.len, 1, - SQL_TRANSIENT) != 0) + if (mem_copy_string(&val[i], field.sval.data, + field.sval.len) != 0) goto error; break; case MP_NIL: @@ -356,8 +355,7 @@ port_c_get_vdbemem(struct port *base, uint32_t *size) break; case MP_STR: str = mp_decode_str(&data, &len); - if (sqlVdbeMemSetStr(&val[i], str, len, - 1, SQL_TRANSIENT) != 0) + if (mem_copy_string(&val[i], str, len) != 0) goto error; break; case MP_NIL: diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 91ef7f3c8..59a378e1b 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -384,6 +384,32 @@ mem_set_allocated_string0(struct Mem *mem, char *value) mem->flags |= MEM_Term; } +int +mem_copy_string(struct Mem *mem, const char *value, uint32_t len) +{ + bool is_own_value = (mem->flags & (MEM_Str | MEM_Blob)) != 0 && + mem->z == value; + if (sqlVdbeMemGrow(mem, len, is_own_value) != 0) + return -1; + if (!is_own_value) + memcpy(mem->z, value, len); + mem->n = len; + mem->flags = MEM_Str; + mem->field_type = FIELD_TYPE_STRING; + return 0; +} + +int +mem_copy_string0(struct Mem *mem, const char *value) +{ + uint32_t len = strlen(value); + if (mem_copy_string(mem, value, len + 1) != 0) + return -1; + mem->n = len; + mem->flags |= MEM_Term; + return 0; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -1587,8 +1613,8 @@ sqlVdbeMemCast(Mem * pMem, enum field_type type) assert(MEM_Str == (MEM_Blob >> 3)); if ((pMem->flags & MEM_Bool) != 0) { const char *str_bool = SQL_TOKEN_BOOLEAN(pMem->u.b); - sqlVdbeMemSetStr(pMem, str_bool, strlen(str_bool), 1, - SQL_TRANSIENT); + if (mem_copy_string0(pMem, str_bool) != 0) + return -1; return 0; } pMem->flags |= (pMem->flags & MEM_Blob) >> 3; diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 70b5350f6..12853606d 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -211,6 +211,12 @@ mem_set_allocated_string0(struct Mem *mem, char *value); * string or binary and allocation type is not STATIC, this value is copied to * newly allocated by destination MEM memory. */ +int +mem_copy_string(struct Mem *mem, const char *value, uint32_t len); + +int +mem_copy_string0(struct Mem *mem, const char *value); + int mem_copy(struct Mem *to, const struct Mem *from); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 5fc7b4e44..5b5e5b0c8 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -146,7 +146,12 @@ setResultStrOrError(sql_context * pCtx, /* Function context */ mem_set_dynamic_string(pCtx->pOut, (char *)z, n); return; } - if (sqlVdbeMemSetStr(pCtx->pOut, z, n, 1, xDel) != 0) + if (n < 0) { + if (mem_copy_string0(pCtx->pOut, z) != 0) + pCtx->is_aborted = true; + return; + } + if (mem_copy_string(pCtx->pOut, z, n) != 0) pCtx->is_aborted = true; } @@ -798,8 +803,14 @@ bindText(sql_stmt * pStmt, /* The statement to bind against */ mem_set_dynamic_string0(pVar, (char *)zData); else mem_set_dynamic_string(pVar, (char *)zData, nData); - } else if (sqlVdbeMemSetStr(pVar, zData, nData, 1, xDel) != 0) { - return -1; + } else { + if (nData < 0) { + if (mem_copy_string0(pVar, zData) != 0) + return -1; + } else { + if (mem_copy_string(pVar, zData, nData) != 0) + return -1; + } } return sql_bind_type(p, i, "text"); } -- 2.25.1