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 6C5D21288DCD; Tue, 11 Mar 2025 17:46:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6C5D21288DCD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1741704405; bh=v611SsGUGWkam5DP+S+/IJlAusvf3ynGTTPmWF+Fa0k=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=s3340trZsBitwDuuge0V5Xix/Rk/nDKyL3CFtc3qUk2MOT9721OhIF4twttUZIDI6 9dJ0MJ3YVd2zigSe2hUHfWlf2ppy/Rtecpu9ALCvVGq6bYKdYh5yQOyxE0Ws8UcYHr X3hVucn6svWY53R24SZHRdQGHNOiy/0c6mMKkHRY= Received: from send129.i.mail.ru (send129.i.mail.ru [89.221.237.224]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 3EB531288DCD for ; Tue, 11 Mar 2025 17:46:44 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3EB531288DCD Received: by exim-smtp-69cc44787d-kmglc with esmtpa (envelope-from ) id 1ts0sV-00000000AFp-0iCK; Tue, 11 Mar 2025 17:46:43 +0300 Content-Type: multipart/alternative; boundary="------------453UIDpQSqWE0OZCneJRwVha" Message-ID: Date: Tue, 11 Mar 2025 17:46:41 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org References: <9dbb7d455c1953fcab6a82944b073348c17e46ac.1741617766.git.skaplun@tarantool.org> <5760221d-71f0-4443-8b77-3da6bb412931@tarantool.org> In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD96E8ECD36702C4DEFDB79D8803DCDD2B6E0425645395082EB182A05F5380850402EEDA87D6BCCD3423DE06ABAFEAF6705BD5F27092B6EDAFE9F261CA54DE3F3FAEEF59CA297A41560 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77D3344F2D0C9F5BEEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB55337566A1031DB47C569B60EFB62E1C4C48FB3EB0C949294345E1FE400A2BED003500E6389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C091DAD9F922AA71188941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6F459A8243F1D1D44CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C2249967BDCD67D9299A676E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8BEE6861575290A7923AA81AA40904B5D99C9F4D5AE37F343AD1F44FA8B9022EA23BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B093A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735458315FA5AE40766C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A5AE437341949730625002B1117B3ED6960D192CAF7849F1F2AD0703CEB2EF9A27823CB91A9FED034534781492E4B8EEAD1DEE520572A35377BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFB17B92000EB809E099E438C47008A5987D17D5B4EEB8E89D9BBE1CD3B3D48D33F09515A9A3E4BB8D5FC880DB409560E689D7D50992287628F7C516DFD46C2FE6A7B9741EFEFED612111DC66A97D0BFE2913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVQiWK+2I7Y2srntXWfBjsVM= X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F25884588BEAD3E394E51E9CD85FDC519B836460EF6D19361BB0A22AA00BF4DCB1108DEC645D15D82EE4B272BD6E4642A116CA93524AA66B5ACBE6721EF430B9A63E2A504198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/3] Restore state when recording __concat metamethod throws OOM. 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: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This is a multi-part message in MIME format. --------------453UIDpQSqWE0OZCneJRwVha Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Thanks! LGTM On 11.03.2025 15:37, Sergey Kaplun wrote: > Hi, Sergey! > Thanks for the review! > Fixed your comment and force-pushed the branch. > > On 11.03.25, Sergey Bronnikov wrote: >> Hi, Sergey, >> >> thanks for the patch! LGTM with a minor comment below. >> >> Sergey >> >> On 10.03.2025 17:51, Sergey Kaplun wrote: > > >>> +local bigstr = string.rep('x', ALLOC_LIMIT) >>> +local __concat = function() >>> + return 'concated' >> s/concated/concatenated/ > Fixed, thanks: > > =================================================================== > diff --git a/test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua b/test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua > index 961df798..20d93c43 100644 > --- a/test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua > +++ b/test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua > @@ -20,7 +20,7 @@ local ALLOC_LIMIT = 2048 > > local bigstr = string.rep('x', ALLOC_LIMIT) > local __concat = function() > - return 'concated' > + return 'concatenated' > end > > -- Need to use metamethod call in the concat recording. > =================================================================== > > I've also checked that this is not ruined the testcase. > >> >> --------------453UIDpQSqWE0OZCneJRwVha Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Thanks! LGTM

On 11.03.2025 15:37, Sergey Kaplun wrote:
Hi, Sergey!
Thanks for the review!
Fixed your comment and force-pushed the branch.

On 11.03.25, Sergey Bronnikov wrote:

Hi, Sergey,

thanks for the patch! LGTM with a minor comment below.

Sergey

On 10.03.2025 17:51, Sergey Kaplun wrote:

<snipped>


+local bigstr = string.rep('x', ALLOC_LIMIT)
+local __concat = function()
+  return 'concated'

s/concated/concatenated/

Fixed, thanks:

===================================================================
diff --git a/test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua b/test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua
index 961df798..20d93c43 100644
--- a/test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua
+++ b/test/tarantool-tests/lj-1298-oom-on-concat-recording.test.lua
@@ -20,7 +20,7 @@ local ALLOC_LIMIT = 2048
 
 local bigstr = string.rep('x', ALLOC_LIMIT)
 local __concat = function()
-  return 'concated'
+  return 'concatenated'
 end
 
 -- Need to use metamethod call in the concat recording.
===================================================================

I've also checked that this is not ruined the testcase.



<snipped>


    

  
  


--------------453UIDpQSqWE0OZCneJRwVha--