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 963AC6BD28; Tue, 13 Apr 2021 02:34:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 963AC6BD28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618270465; bh=1KF+CSZDT5eKOFY269Y9LYFLQP0hP7PNR73ULKBF5Bc=; 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=Kky+X+wL665G34KrgK1melRpokMRpsoHJjlSDMsqcvDlFH8ryv37+p8YfxjKtFHJW yovdKg33GhfvaHYgfcBBkxdDmq2Z8+wb+CEKRcFAXnHeb1CcRDfMgd5Ng32FfVs+0E wpqPWNolXSStFmkTa/xllY8FkQwGbIpVWqgyHIbE= Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 E44F96BD23 for ; Tue, 13 Apr 2021 02:34:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E44F96BD23 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1lW64V-0003ks-65; Tue, 13 Apr 2021 02:34:23 +0300 To: imeevma@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: Message-ID: Date: Tue, 13 Apr 2021 01:34:22 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480B1C8842CE613979723F2FB4628545A35182A05F5380850409DE128B08C1F295F19F78C94A21364E34395A6B6575475FA5182532C58D7648A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7D6964C9E324ABA58EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379703D7D5B138802D8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B29528CC15160190D2EBC2EFC0780A98BDF04B652EEC242312D2E47CDBA5A96583C09775C1D3CA48CFE478A468B35FE767117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE77E7E81EEA8A9722B8941B15DA834481F9449624AB7ADAF372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89F83C798A30B85E16BC6EABA9B74D0DA47B5C8C57E37DE458BEDA766A37F9254B7 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831F781103E644F2A4AAB73A7D1547457A7 X-C1DE0DAB: 0D63561A33F958A54D7487C4F30C19EEA585FA499C3C5661260ECC9E756EE21DD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D347215713CF3EEE9D1530999F92932A29EF77F136F6CB65E85AF387BB21B727ABCA31F6469E5CB73431D7E09C32AA3244CDBAFE02CED08BA2E5AFF33E3FA6523D105AB220A9D022EBCFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojq8JA+pXcDuma6ZGEwkzfAw== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638223277F97946469D89D0B2878DC6FECFDC3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v5 27/52] sql: introduce mem_set_str_*() functions 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" Nice fixes! See 2 comments below. > diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c > index 6c08e772d..e0903e3b0 100644 > --- a/src/box/sql/vdbeapi.c > +++ b/src/box/sql/vdbeapi.c > @@ -125,6 +125,27 @@ setResultStrOrError(sql_context * pCtx, /* Function context */ > void (*xDel) (void *) /* Destructor function */ > ) > { > + if (xDel == SQL_STATIC) { > + if (n < 0) > + mem_set_str0_static(pCtx->pOut, (char *)z); > + else > + mem_set_str_static(pCtx->pOut, (char *)z, n); > + return; > + } > + if (xDel == SQL_DYNAMIC) { > + if (n < 0) > + mem_set_str0_allocated(pCtx->pOut, (char *)z); > + else > + mem_set_str_allocated(pCtx->pOut, (char *)z, n); 1. I don't understand. You check for xDel == SQL_DYNAMIC and yet you use 'allocated' suffix. Below you check for != TRANSIENT instead of == DYNAMIC, and use 'dynamic'. Why? All looks messed up. The same in the next hunk. > + return; > + }> diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c > index ae55e4c29..171cb8946 100644 > --- a/src/box/sql/vdbeaux.c > +++ b/src/box/sql/vdbeaux.c > @@ -1333,41 +1331,34 @@ sqlVdbeList(Vdbe * p) > mem_set_int(pMem, pOp->p3, pOp->p3 < 0); > pMem++; > > - if (sqlVdbeMemClearAndResize(pMem, 256)) { > - assert(p->db->mallocFailed); > + char *buf = sqlDbMallocRaw(sql_get(), 256); 2. I think you need some kind of mem_set_strlen(), or mem_grow()/mem_reserve(), or something else to reserve the memory. To extend zMalloc. Otherwise you can't reuse the memory which might already be in the mem object.