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 E71086EC5F; Thu, 15 Apr 2021 01:23:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E71086EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618438991; bh=JR8V3HcYVqA5+d/DMHI+NZ5qHZOEgAUhl9JJD1F7TpU=; 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=IWWQdi2hAiDVCT/DigFYv8C5OjpxAtmepk3lV7PY0UodvaM3UltFsp+ViRipRaedu sZoBNMglcHdefk427ydg6I3Rr7S23Y+k36jcwtWRWnfckeIm7sgyGCeEZleVpawr2i vs1J0XC9HJK7Hm285WxWNE2/QfpSftZ+kDKEVE24= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 6AAFE6EC5F for ; Thu, 15 Apr 2021 01:23:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6AAFE6EC5F Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lWnue-0002Fu-B8; Thu, 15 Apr 2021 01:23:08 +0300 To: imeevma@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <27e3259d43aef66129582e4461a064c38599a72e.1617984948.git.imeevma@gmail.com> Message-ID: <7af908cf-f9ec-3ba8-e98c-e46f9ce0911c@tarantool.org> Date: Thu, 15 Apr 2021 00:23:07 +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: <27e3259d43aef66129582e4461a064c38599a72e.1617984948.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74807BAE725B9AE625DE765B0E193B5B7687182A05F538085040E011ABED143FC568789560BABEE1A3DB4ACC704AD7FA1088607E4A42AC08993D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE74260010D6E447003EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375448D590B04CE87D8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2CF0C78ADBA462C72710FDF1F45A012E4BDFBBEFFF4125B51D2E47CDBA5A96583C09775C1D3CA48CF7EF884183F8E4D67117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE7BEE62E5629C982429FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735C6C49853BF2B2AEEC4224003CC83647689D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C978314CC61BE31755856863EC326E2DBBB914 X-C1DE0DAB: 0D63561A33F958A542E54DC57543CA25B6E79E7D4B40AAEEB1C29BFD126E7493D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34AF12ADB97C97CD89EE3C7C9CFDC60233ABA06C442D44FFFFE4D158743578C7D5497FCBACC1A470FF1D7E09C32AA3244CD0ED9C4A3FB536E8D1D40323EDE8727F3C6EB905E3A8056BFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojrcJA+pXcDulFXu0epLzQQQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822D01A4D33417824948077E6483B5146313841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v5 04/52] sql: remove NULL-termination in OP_ResultRow 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! > diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c > index 4c1cd582b..18806b93f 100644 > --- a/src/box/sql/vdbe.c > +++ b/src/box/sql/vdbe.c > @@ -1516,20 +1513,14 @@ case OP_ResultRow: { > /* Invalidate all ephemeral cursor row caches */ > p->cacheCtr = (p->cacheCtr + 2)|1; > > - /* Make sure the results of the current row are \000 terminated > - * and have an assigned type. The results are de-ephemeralized as > - * a side effect. > - */ > - pMem = p->pResultSet = &aMem[pOp->p1]; > - for(i=0; ip2; i++) { > + p->pResultSet = &aMem[pOp->p1]; > +#ifdef SQL_DEBUG > + struct Mem *pMem = p->pResultSet; > + for(int i = 0; i < pOp->p2; i++) { Please, add a whitespace after 'for'.