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 03F506FC8B; Tue, 30 Mar 2021 02:07:53 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 03F506FC8B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617059273; bh=KDcftv0buJl+P3veGmc81jyLSyqiQsTx48hljprjWq0=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=IxY+KXA7rO1duooSWbcqfdcaknlH56WowYpjakqRG9s63nS39nR36QVtkWbHlZVU+ 2Hu4n+PAWhdQpzta1hgl3iBAATHmKseT6Z0b/Dn/2fQDQx7zIgdsbiOGWPL6Tc7ATs f+4KUKd+p7aHsM+7YdYhJ7yifIEKEbkj9tqZb994= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 500B26BD0B for ; Tue, 30 Mar 2021 02:05:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 500B26BD0B Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lR0wv-0004bL-Nv; Tue, 30 Mar 2021 02:05:34 +0300 To: imeevma@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: Message-ID: <929d12f8-5ef1-ddbd-19cd-08b9007700f3@tarantool.org> Date: Tue, 30 Mar 2021 01:05:32 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9ED7173E37F4E329498ADEA61F680B110809A4DE3E6FC56EA182A05F53808504024D0CBD68E8FA5B606F36B9250D4C317C0F95403732216F432E3BF61BFF8FDB6 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70312E9A300D47E3BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375A514678F9DF65078638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95CE99938B3FD79E1DF8A3A90478E494882DFDF3DE9A81ECFF3A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE7820CF4CC0E318EFB9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3329DC2EF12373DEA117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947C0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735F409322A2F59C95CC4224003CC83647689D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831FB965E4CF9DE7C1F7EE597FE6297188A X-C1DE0DAB: 0D63561A33F958A5253070E51898C1A84FB0C4885087D67B048FF615593E2AF1D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D344A431191C56981FEFDFE41ADAA7A615BDAE715D83CB8C4D0BDFD7EA2E64327A1253D7EBD871B24CD1D7E09C32AA3244CC98622610307F1B70171EBE45F89ACE860759606DA2E136AFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojljIiQOC84rQJnxqq/uihkA== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822A2A5D744CCFDF56EF2ED258FA58F54223841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v4 31/53] sql: introduce mem_copy_binary() 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for the patch! On 23.03.2021 10:36, Mergen Imeev via Tarantool-patches wrote: > This patch introduces mem_copy_binary() function. Function > mem_copy_binary() clears MEM, allocates enough memory and copies given > binary to allocated memory. > > Part of #5818 > --- > src/box/sql/mem.c | 14 ++++++++++++++ > src/box/sql/mem.h | 3 +++ > src/box/sql/vdbe.c | 7 ++----- > src/box/sql/vdbeapi.c | 4 ++-- > src/box/sql/vdbesort.c | 6 +----- > 5 files changed, 22 insertions(+), 12 deletions(-) > > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 5ee49cdca..99beec9ad 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -465,6 +465,20 @@ mem_set_allocated_binary(struct Mem *mem, char *value, uint32_t size) > mem_set_dyn_bin(mem, value, size, 0); > } > > +int > +mem_copy_binary(struct Mem *mem, const char *value, uint32_t size) > +{ What if mem is not a binary now? What if it is a frame? Why don't you clear it? > + bool is_own_value = (mem->flags & MEM_Blob) != 0 && mem->z == value; > + if (sqlVdbeMemGrow(mem, size, is_own_value) != 0) > + return -1; > + if (!is_own_value) > + memcpy(mem->z, value, size); > + mem->n = size; > + mem->flags = MEM_Blob; > + mem->field_type = FIELD_TYPE_VARBINARY; > + return 0; > +}