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 4608B12882C0; Tue, 11 Mar 2025 15:37:13 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4608B12882C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1741696633; bh=9aQBKCcg4RiTtB5rJBm0R/TfGx37aq6zX+YEp9MrPUI=; 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=AI8JabPH9e9AXxnDd0Op4HYCf/VLfa0bi9YYzNONEWoVj31ocw6P4QZV2a4Swr0v1 OrboxMGG9fOJcJkDX3KaOxJTLdUXilp4buvpMKFgU2RAAkvZaJtm4+7jxicTQ3I036 5tHBadK2kNofwafGugEPF0OiPzKKtiCvX4XWCxoc= Received: from send60.i.mail.ru (send60.i.mail.ru [89.221.237.155]) (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 876BF451814 for ; Tue, 11 Mar 2025 15:37:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 876BF451814 Received: by exim-smtp-69cc44787d-wpp4t with esmtpa (envelope-from ) id 1tryr9-00000000Qu0-1QSw; Tue, 11 Mar 2025 15:37:12 +0300 Date: Tue, 11 Mar 2025 15:37:12 +0300 To: Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org Message-ID: References: <9dbb7d455c1953fcab6a82944b073348c17e46ac.1741617766.git.skaplun@tarantool.org> <5760221d-71f0-4443-8b77-3da6bb412931@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5760221d-71f0-4443-8b77-3da6bb412931@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD96E8ECD36702C4DEF2A13AEAD7B9CCF1D8672EFDED61BCA25182A05F538085040603CF5FF1085378C3DE06ABAFEAF6705EE114DB5D2C44E7E8A0EBFB2BBF6EA52303B288D58C5C93A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE737BB76880A4CA9A4EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637FE9EFE935CD7C6AE8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B20F8ED61481DDAD642E070BE324C7D3C4B3F67BE940A47C03F6B57BC7E64490618DEB871D839B73339E8FC8737B5C22495FF0BFC5AEE34BE6CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C0DEC8C2C8BCD2534D8941B15DA834481F9449624AB7ADAF372E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3C74813BC7F81EC8435872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5B2793C3387A1D00F5002B1117B3ED69670A70C02A13F057530E4A65F242F5898823CB91A9FED034534781492E4B8EEAD17AEC49845D0B908 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF31714AA55DBE4350FB91FBD1D0E38A8CB57B6947162EDE574693E2958A33735C1F616861E982FD8FF13513DA892F5B9DCA20A459367DE7F8D0277F7E6FC000DC4746D0F860EF4399111DC66A97D0BFE2913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVQiWK+2I7Y2so/kBOYGu5TQ= X-DA7885C5: A4D837E907153D8EF255D290C0D534F98E637C34FB519F85E13C35A866E49EF82C2FBAB818B6B5865B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F739381B31377CF4CA219FF1E7E0A5A9D253E528927BB6916C3D24E3045ACA2C5FBAEE49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F 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 Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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. > > > -- Best regards, Sergey Kaplun