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 7C3B86E459; Sat, 20 Nov 2021 02:35:49 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7C3B86E459 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1637364949; bh=w6M8zcDBEtLZrDtT3kZfwYABLczubCMU+/eBMibnWWQ=; 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=lu1aMN7BivtAKz220URsoebmJ3Z5isL6bvZEPt5HLIP0u4tIuekGBDBTUclCtqMcF QLjbHO/u3YYxIMRK0iXsAItf/Eknqdf30wrhRLAIl/bZ/ERE7Iadh1y58bUgdW+XkV wk6Lh5c99VGRxJ8l67tThuSUPzycgRYiwNO65CqQ= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [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 97E0A6E459 for ; Sat, 20 Nov 2021 02:35:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 97E0A6E459 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1moDQ3-0002vW-Jp; Sat, 20 Nov 2021 02:35:48 +0300 Message-ID: Date: Sat, 20 Nov 2021 00:35:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.3.1 Content-Language: en-US To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <5c49fd526a5fcf59c4d8b1d222016dc3c08f35c7.1637159909.git.imeevma@gmail.com> In-Reply-To: <5c49fd526a5fcf59c4d8b1d222016dc3c08f35c7.1637159909.git.imeevma@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9731B3922EC063979F46AE45382ECCE5A15643A7EFE44EA7F00894C459B0CD1B9A167AD56D3F5E6A5880D99A1D6F7D887D603AD2D7E66C77F39C31E52C72DD4EE X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7B4F69EC2502AC40EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637FF37B1FF54E2C7C48638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8A91F2AF647B9905CD55B4A0C4B7F64A3117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCECADA55FE5B58BB7A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520B28585415E75ADA928451B159A507268D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6B1CFA6D474D4A6A4089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A561E80B78FF9AE6ECCBBB4A3B173740C07055F9CB5EEFBB94D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7506FE1F977233B9BB410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3457FA942CB4462B4CD110B12D5DB8EEC1F8274E3208CAFE2E0C3AA1801DC5A60FC47FB3AD0E2EA8C71D7E09C32AA3244C8F14FE95293A99D3D22C4E956628E1188894E9C85370243E729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojUkwcpHt8ZEe+IQkBpdM98g== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D908E1322827D0CB01A2DC0F56617E9B93841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 2/3] sql: refactor sql_vdbe_mem_encode_tuple() 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" Hi! Thanks for the patch! > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 356b2c7be..2ba4135b0 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -3013,31 +3013,31 @@ mem_to_mpstream(const struct Mem *var, struct mpstream *stream) > } > > char * > -sql_vdbe_mem_encode_tuple(struct Mem *fields, uint32_t field_count, > - uint32_t *tuple_size, struct region *region) > +mem_encode_array(const struct Mem *mems, uint32_t count, uint32_t *size, > + struct region *region) > { > size_t used = region_used(region); > bool is_error = false; > struct mpstream stream; > mpstream_init(&stream, region, region_reserve_cb, region_alloc_cb, > set_encode_error, &is_error); > - mpstream_encode_array(&stream, field_count); > - for (struct Mem *field = fields; field < fields + field_count; field++) > - mem_to_mpstream(field, &stream); > + mpstream_encode_array(&stream, count); > + for (const struct Mem *mem = mems; mem < mems + count; mem++) > + mem_to_mpstream(mem, &stream); > mpstream_flush(&stream); > if (is_error) { If some memory was allocated/reserved before mpstream_flush() failed (inside of mem_to_mpstream()), then the region might leak. I would recommend to add a truncate here. > diag_set(OutOfMemory, stream.pos - stream.buf, > "mpstream_flush", "stream"); > return NULL; > }