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 151EE74147; Tue, 5 Oct 2021 00:53:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 151EE74147 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633384403; bh=OrOj+WOSG6nWlaQ87tCVnUfTgerxwUC27lRYrG5wRYc=; 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=xsvKoNHVtQA6j45pyjziwE6BjSJf675P30ROJZGpqOOukThsaIIBReq1g2OZkjG9J JMMuDPn+G/ecz/NUuW6D8A+beIaL+kG+uGNn9EE0k5PsIwANAnLAV3heNoey+eKMwM jTD+x9NIokOnJS+9eePEwl9rRHutFajTbLrEoNrE= 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 AD12C74145 for ; Tue, 5 Oct 2021 00:53:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AD12C74145 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1mXVtg-00052W-3B; Tue, 05 Oct 2021 00:53:20 +0300 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <3543f4417e240c74d1dea9a2b6e086aeca950167.1633092363.git.imeevma@gmail.com> Message-ID: <6dfd69ff-a807-b0d5-4896-4b5118ee2679@tarantool.org> Date: Mon, 4 Oct 2021 23:53:19 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <3543f4417e240c74d1dea9a2b6e086aeca950167.1633092363.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9064ADF4728AA0EE9F29F6F937CFD73092774A1760F25EB43182A05F53808504015831D055F48524EBFC514BF7BA8DCAFD67C8ACACE7DE80F115C2DC0296F5CD7 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7FBCED7D376B82B5EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B997C8222C70C3D98638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8E9B009134280C0DE64E9E3C6B7F074C7117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC1BE95B8C87527B4BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352026055571C92BF10FBDFBBEFFF4125B51D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B613439FA09F3DCB32089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B505C0B97CAE4A76F82F79D495EF6C6B6EAC X-C1DE0DAB: 0D63561A33F958A58D93A4FD0451628C1B45A3D12E56C0AA77C8D678601109C0D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7557E988E9157162368E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34AAC3D1FDB34D0488AB4E3345989442C216570DE7D65B6CCD68F2C893DE5675D8DF354F3CDE986B0D1D7E09C32AA3244C2FEF458EFA2A88D835854C6DBA9AE96E795D98D676DD64D0729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj+1ww+tpaZeoacHwteMNMtQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D82068432C406426AA7635B54715E93BE3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v4 10/16] sql: refactor AVG() function 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 fixes! > diff --git a/src/box/sql/func.c b/src/box/sql/func.c > index 8a9de1254..94ec811ef 100644 > --- a/src/box/sql/func.c > +++ b/src/box/sql/func.c > @@ -102,6 +102,58 @@ fin_total(struct sql_context *ctx) <...> > + > +/** Finalizer for the AVG() function. */ > +static void > +fin_avg(struct sql_context *ctx) > +{ > + assert(mem_is_null(ctx->pMem) || mem_is_bin(ctx->pMem)); > + if (mem_is_null(ctx->pMem)) > + return mem_set_null(ctx->pOut); > + struct Mem *tmp = (struct Mem *)ctx->pMem->z; > + uint32_t *count_val = (uint32_t *)(tmp + 1); > + struct Mem sum; > + mem_create(&sum); > + mem_copy_as_ephemeral(&sum, tmp); > + mem_destroy(tmp); > + struct Mem count; > + mem_create(&count); > + mem_set_uint(&count, *count_val); > + if (mem_div(&sum, &count, ctx->pOut) != 0) > + ctx->is_aborted = true; Consider this: ==================== @@ -141,17 +141,14 @@ fin_avg(struct sql_context *ctx) assert(mem_is_null(ctx->pMem) || mem_is_bin(ctx->pMem)); if (mem_is_null(ctx->pMem)) return mem_set_null(ctx->pOut); - struct Mem *tmp = (struct Mem *)ctx->pMem->z; - uint32_t *count_val = (uint32_t *)(tmp + 1); - struct Mem sum; - mem_create(&sum); - mem_copy_as_ephemeral(&sum, tmp); - mem_destroy(tmp); + struct Mem *sum = (struct Mem *)ctx->pMem->z; + uint32_t *count_val = (uint32_t *)(sum + 1); struct Mem count; mem_create(&count); mem_set_uint(&count, *count_val); if (mem_div(&sum, &count, ctx->pOut) != 0) ctx->is_aborted = true; + mem_destroy(sum); }