[Tarantool-patches] [PATCH v4 10/16] sql: refactor AVG() function

[Vladislav Shpilevoy]

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);
 }