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 2CB386EC5B; Wed, 14 Apr 2021 01:00:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2CB386EC5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618351228; bh=UWjWBq+mNA8lQ2PQG1aT241LVrjc6GQL5ucWiQLTltQ=; 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=k5O6UjfuGfIZkAHCfBRI9jMxOUI+R5uehDAnFsS7w5pLsnf9miTBcVVrk+AinqiVw Rw2bjGxvct7s039Y+Zhhaeul1p7zPTltbEX3r5ttlVxfPySNlGT/s5ja7d095w/7Yo yFPdmt7t09N3M90GURVwTwZH+LOg1MwQgznhxLfs= 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 D28156EC5B for ; Wed, 14 Apr 2021 01:00:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D28156EC5B Received: by smtp46.i.mail.ru with esmtpa (envelope-from ) id 1lWR58-0005tI-US; Wed, 14 Apr 2021 01:00:27 +0300 Date: Wed, 14 Apr 2021 01:00:25 +0300 To: Vladislav Shpilevoy Message-ID: <20210413220025.GA39274@tarantool.org> References: <2a22e2c47ad16b38bb7dcfb6b35a6a61b8b94e5e.1617984948.git.imeevma@gmail.com> <76e3ed67-6f88-8480-4a1d-080e3e01e788@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <76e3ed67-6f88-8480-4a1d-080e3e01e788@tarantool.org> X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480EBD5CA77A668ECB87DA2124B0A8E6609182A05F5380850409545B736FEBBAF5B3005AB2AC799B549375A43A13B41F4246992B5E08D3DBC97 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F6EE1C40B2E8BE15EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E724D704EAF55A818638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B27A1038CD4F2C2768493292377D551765B10649542A97EE81D2E47CDBA5A96583C09775C1D3CA48CF4964A708C60C975A117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE78C592797616C97AB9FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE701E2861C75CA6BE0D32BA5DBAC0009BE395957E7521B51C20BC6067A898B09E4090A508E0FED6299176DF2183F8FC7C0382823F45A83FAFACD04E86FAF290E2D4AB7DE70F7409F1A1DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C332C16DEEF884694935872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2368A440D3B0F6089093C9A16E5BC824A2A04A2ABAA09D25379311020FFC8D4ADD69086D7A80F17D38B910ACD9743CCA0 X-C1DE0DAB: 0D63561A33F958A5F5B7981373CA3360AA614AAB85275B7C6E0D8BD7A3A18D5BD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34980A6B448CFD1B8A90FEE057BC2BC89FE528899168A102961F95CDBA0893CB79E0F4739681C6C1271D7E09C32AA3244C566C8839E74958C0EE160545814ADBFCFE8DA44ABE2443F7FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnA7/qPBUIXG+TEsTfbjYgQ== X-Mailru-Sender: 5C3750E245F362008BC1685FEC6306ED4972B3BF895D40D43005AB2AC799B549E5E949923882BAAD5105BD0848736F9966FEC6BF5C9C28D97E07721503EA2E00ED97202A5A4E92BF7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v5 28/52] sql: introduce mem_copy_str() and mem_copy_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 answers and new patch below. There won't be diff since I added mem_copy_strl() during merge caused by previous patch. On Tue, Apr 13, 2021 at 01:35:19AM +0200, Vladislav Shpilevoy wrote: > Thanks for the fixes! > > See 2 comments below. > > > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > > index 87e1bcfd1..045c44e8f 100644 > > --- a/src/box/sql/mem.c > > +++ b/src/box/sql/mem.c > > @@ -394,6 +394,34 @@ mem_set_str0_allocated(struct Mem *mem, char *value) > > mem->flags |= MEM_Term; > > } > > > > +int > > +mem_copy_str(struct Mem *mem, const char *value, uint32_t len) > > +{ > > + if ((mem->flags & (MEM_Agg | MEM_Frame)) != 0) > > + mem_clear(mem); > > 1. Why don't you call clear always? Anyway 'dynamic' memory can't > be reused. It is freed in sqlVdbeMemGrow() AFAIS. > It is possible that value given to mem_copy_*() is own value of the MEM. If it is of MEM_Dyn type it will be lost in case of clear() being called. Function sqlVdbeMemGrow() will free this memory after value will be copied. > > + bool is_own_value = (mem->flags & (MEM_Str | MEM_Blob)) != 0 && > > + mem->z == value; > > + if (sqlVdbeMemGrow(mem, len, is_own_value) != 0) > > + return -1; > > diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c > > index e0903e3b0..ee095f36e 100644 > > --- a/src/box/sql/vdbeapi.c > > +++ b/src/box/sql/vdbeapi.c > > @@ -798,8 +803,14 @@ bindText(sql_stmt * pStmt, /* The statement to bind against */ > > mem_set_str0_dynamic(pVar, (char *)zData); > > else > > mem_set_str_dynamic(pVar, (char *)zData, nData); > > - } else if (sqlVdbeMemSetStr(pVar, zData, nData, 1, xDel) != 0) { > > - return -1; > > + } else { > > + if (nData < 0) { > > + if (mem_copy_str0(pVar, zData) != 0) > > + return -1; > > + } else { > > + if (mem_copy_str(pVar, zData, nData) != 0) > > + return -1; > > + } > > 2. For mem_set_str* and mem_copy_str* you could probably have 3 > versions: mem_set_strn(const char *, uint32 len), > mem_set_str0(const char *), and mem_set_str(const char *, uint32 len_hint). > In the last version len_hint might be -1 and then strlen() is called. > It would keep the places like that as simple as they were. > Done, in previous patch and here. I named functions with len_hint as mem_set_strl_*() and mem_copy_strl(). > > } > > return sql_bind_type(p, i, "text"); > > } > > New patch: commit 3e3f08f8c3bc2fb45a62c992cdf4f9ce20890641 Author: Mergen Imeev Date: Mon Mar 15 16:59:27 2021 +0300 sql: introduce mem_copy_str() and mem_copy_str0() This patch introduces mem_copy_str() and mem_copy_str0() functions. These functions copy given string to newly allocated by MEM memory. String given to mem_copy_str0() should be NULL-terminated. This is not necessary for mem_copy_str(). Part of #5818 diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 5cf067453..ded20315b 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -252,6 +252,34 @@ mem_set_str0_allocated(struct Mem *mem, char *value) mem->flags |= MEM_Term; } +int +mem_copy_str(struct Mem *mem, const char *value, uint32_t len) +{ + if ((mem->flags & (MEM_Agg | MEM_Frame)) != 0) + mem_clear(mem); + 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_str0(struct Mem *mem, const char *value) +{ + uint32_t len = strlen(value); + if (mem_copy_str(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) { @@ -1441,8 +1469,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_str0(pMem, str_bool) != 0) + return -1; return 0; } pMem->flags |= (pMem->flags & MEM_Blob) >> 3; @@ -2903,9 +2931,8 @@ port_lua_get_vdbemem(struct port *base, uint32_t *size) val[i].u.i = field.ival; break; case MP_STR: - if (sqlVdbeMemSetStr(&val[i], field.sval.data, - field.sval.len, 1, - SQL_TRANSIENT) != 0) + if (mem_copy_str(&val[i], field.sval.data, + field.sval.len) != 0) goto error; break; case MP_NIL: @@ -2980,8 +3007,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_str(&val[i], str, len) != 0) goto error; break; case MP_NIL: diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index f029ee0e5..aaecd064a 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -409,6 +409,25 @@ mem_set_strl_allocated(struct Mem *mem, char *value, int len_hint) mem_set_str_allocated(mem, value, len_hint); } +/** Copy string to a newly allocated memory. The MEM type becomes STRING. */ +int +mem_copy_str(struct Mem *mem, const char *value, uint32_t len); + +/** + * Copy NULL-terminated string to a newly allocated memory. The MEM type becomes + * STRING. + */ +int +mem_copy_str0(struct Mem *mem, const char *value); + +static inline int +mem_copy_strl(struct Mem *mem, const char *value, int len_hint) +{ + if (len_hint < 0) + return mem_copy_str0(mem, value); + return mem_copy_str(mem, value, len_hint); +} + /** * Copy content of MEM from one MEM to another. In case source MEM contains * string or binary and allocation type is not STATIC, this value is copied to diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 484c66b29..69dd1fb0d 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -131,7 +131,7 @@ setResultStrOrError(sql_context * pCtx, /* Function context */ return mem_set_strl_allocated(pCtx->pOut, (char *)z, n); if (xDel != SQL_TRANSIENT) return mem_set_strl_dynamic(pCtx->pOut, (char *)z, n); - if (sqlVdbeMemSetStr(pCtx->pOut, z, n, 1, xDel) != 0) + if (mem_copy_strl(pCtx->pOut, z, n) != 0) pCtx->is_aborted = true; } @@ -774,7 +774,7 @@ bindText(sql_stmt * pStmt, /* The statement to bind against */ mem_set_strl_allocated(pVar, (char *)zData, nData); else if (xDel != SQL_TRANSIENT) mem_set_strl_dynamic(pVar, (char *)zData, nData); - else if (sqlVdbeMemSetStr(pVar, zData, nData, 1, xDel) != 0) + else if (mem_copy_strl(pVar, zData, nData) != 0) return -1; return sql_bind_type(p, i, "text"); }