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 204AB6EC55; Fri, 10 Sep 2021 19:05:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 204AB6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1631289954; bh=U/pzO72SemqE3YZUnb5o2olBjYRtvSH/U7n6uaqL+f8=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=vpeWRCQt2b4oqpRF1iMVL4/0J+bYq+qP2kGLn84NUCXtMl5wbXsWwEa855S2EUos2 jq9/qoJ3G+G3fqNOfuGP2V3qdFqjKaL+I+525rQ7oAfTvckmNWjjl7cl0GhtA3kFv5 ZJTgp1U20xWp/C7RENoNMQHHm3+1sKqQPed+DtBQ= Received: from smtpng2.i.mail.ru (smtpng2.i.mail.ru [94.100.179.3]) (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 E44566E466 for ; Fri, 10 Sep 2021 19:02:13 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E44566E466 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1mOiyj-000144-Ba; Fri, 10 Sep 2021 19:02:13 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 10 Sep 2021 19:02:13 +0300 Message-Id: <094e9605f220dbc257dbe43cdd3432934ddd5975.1631289462.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD91AE02D33A9C88A2F5B11AABA1A86F90E3128B236C8D9319300894C459B0CD1B9A2F38D81E1F78D6CCE16318D3DE1FCC659451B28AE1D56592476E39F0D35E726 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A72B1EA4C8D5AD81EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637389D8DDD54F43F7A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8C5CBC0A1C06B917854A84BEBABBD555D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18618001F51B5FD3F9D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBF3286B3348795C6A519A91F129EC73AE94D0BDA0F6461E79C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFB4CA5BC574AE2910699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3407FE5477D6A8AF089A8D0A4F3CE1D9F6EF6535B3CB7DFA47E9730EEC0E77D82C386C3CA5B56D91C51D7E09C32AA3244CC15B3543E6EFAEB16345C6BF32BCD797E3D93501275E802F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojFfmM42hctyQYfZzWrZxFEA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D9F0FEAC9CC3430B15C497C5FF37F658683D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 08/13] sql: rework AVG() 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: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch makes AVG() accept DOUBLE values by default. Also, after this patch AVG() will be able to work with DECIMAL values. Part of #4145 Part of #6355 --- src/box/sql/func.c | 106 +++++++++-------------- test/sql-tap/built-in-functions.test.lua | 33 ++++++- 2 files changed, 72 insertions(+), 67 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 12a6a5a2c..9e0c09206 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -102,6 +102,44 @@ fin_total(struct sql_context *ctx) mem_copy_as_ephemeral(ctx->pOut, ctx->pMem); } +/** Implementation of the AVG() function. */ +static void +step_avg(struct sql_context *ctx, int argc, struct Mem **argv) +{ + assert(argc == 1); + (void)argc; + assert(ctx->pMem->type == MEM_TYPE_NULL || mem_is_bin(ctx->pMem)); + if (argv[0]->type == MEM_TYPE_NULL) + return; + if (ctx->pMem->type == MEM_TYPE_NULL) { + uint32_t size = 2 * sizeof(struct Mem); + struct Mem *mems = sqlDbMallocRawNN(sql_get(), size); + mem_create(&mems[0]); + mem_create(&mems[1]); + mem_copy_as_ephemeral(&mems[0], argv[0]); + mem_set_uint(&mems[1], 1); + mem_set_bin_allocated(ctx->pMem, (char *)mems, size); + return; + } + struct Mem *mems = (struct Mem *)ctx->pMem->z; + assert(mems[1].type = MEM_TYPE_UINT); + ++mems[1].u.u; + if (mem_add(&mems[0], argv[0], &mems[0]) != 0) + ctx->is_aborted = true; +} + +/** Finalizer for the AVG() function. */ +static void +fin_avg(struct sql_context *ctx) +{ + assert(ctx->pMem->type == MEM_TYPE_NULL || mem_is_bin(ctx->pMem)); + if (ctx->pMem->type == MEM_TYPE_NULL) + return mem_set_null(ctx->pOut); + struct Mem *mems = (struct Mem *)ctx->pMem->z; + if (mem_div(&mems[0], &mems[1], ctx->pOut) != 0) + ctx->is_aborted = true; +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1656,69 +1694,6 @@ soundexFunc(sql_context * context, int argc, sql_value ** argv) } } -/* - * An instance of the following structure holds the context of a - * sum() or avg() aggregate computation. - */ -typedef struct SumCtx SumCtx; -struct SumCtx { - struct Mem mem; - uint32_t count; -}; - -/* - * Routines used to compute the sum, average, and total. - * - * The SUM() function follows the (broken) SQL standard which means - * that it returns NULL if it sums over no inputs. TOTAL returns - * 0.0 in that case. In addition, TOTAL always returns a float where - * SUM might return an integer if it never encounters a floating point - * value. TOTAL never fails, but SUM might through an exception if - * it overflows an integer. - */ -static void -sum_step(struct sql_context *context, int argc, sql_value **argv) -{ - assert(argc == 1); - UNUSED_PARAMETER(argc); - struct SumCtx *p = sql_aggregate_context(context, sizeof(*p)); - if (p == NULL) { - context->is_aborted = true; - return; - } - if (p->count == 0) { - mem_create(&p->mem); - assert(context->func->def->returns == FIELD_TYPE_INTEGER || - context->func->def->returns == FIELD_TYPE_DOUBLE); - if (context->func->def->returns == FIELD_TYPE_INTEGER) - mem_set_uint(&p->mem, 0); - else - mem_set_double(&p->mem, 0.0); - } - if (argv[0]->type == MEM_TYPE_NULL) - return; - ++p->count; - assert(mem_is_num(argv[0])); - if (mem_add(&p->mem, argv[0], &p->mem) != 0) - context->is_aborted = true; -} - -static void -avgFinalize(sql_context * context) -{ - SumCtx *p; - p = sql_aggregate_context(context, 0); - if (p == NULL || p->count == 0) { - mem_set_null(context->pOut); - return; - } - struct Mem mem; - mem_create(&mem); - mem_set_uint(&mem, p->count); - if (mem_div(&p->mem, &mem, context->pOut) != 0) - context->is_aborted = true; -} - /* * The following structure keeps track of state information for the * count() aggregate function. @@ -2015,8 +1990,9 @@ struct sql_func_definition { static struct sql_func_definition definitions[] = { {"ABS", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, absFunc, NULL}, {"ABS", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, absFunc, NULL}, - {"AVG", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, sum_step, avgFinalize}, - {"AVG", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, sum_step, avgFinalize}, + {"AVG", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_avg, fin_avg}, + {"AVG", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, step_avg, fin_avg}, + {"AVG", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, step_avg, fin_avg}, {"CHAR", -1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_STRING, charFunc, NULL}, {"CHAR_LENGTH", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_INTEGER, lengthFunc, NULL}, diff --git a/test/sql-tap/built-in-functions.test.lua b/test/sql-tap/built-in-functions.test.lua index 507d06549..08a63b86d 100755 --- a/test/sql-tap/built-in-functions.test.lua +++ b/test/sql-tap/built-in-functions.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool local test = require("sqltester") -test:plan(58) +test:plan(61) local dec = require('decimal') @@ -477,7 +477,7 @@ test:do_test( local res = {pcall(box.execute, [[SELECT AVG(?);]], {'1'})} return {tostring(res[3])} end, { - "Type mismatch: can not convert string('1') to integer" + "Type mismatch: can not convert string('1') to double" }) test:do_catchsql_test( @@ -605,4 +605,33 @@ test:do_execsql_test( } ) +-- Make sure AVG() accepts and returns DOUBLE by default. +test:do_test( + "builtins-4.1.1", + function() + return box.execute([[SELECT AVG(?);]], {1}).metadata + end, { + {name = "COLUMN_1", type = "double"}, + }) + +test:do_test( + "builtins-4.1.2", + function() + local res = {pcall(box.execute, [[SELECT AVG(?);]], {-1ULL})} + return {tostring(res[3])} + end, { + "Type mismatch: can not convert integer(18446744073709551615) to double" + }) + +-- Make sure AVG() works with DECIMAL properly. +test:do_execsql_test( + "builtins-4.1.3", + [[ + SELECT AVG(cast(column_2 as DECIMAL)) from (values(1), (123.432)); + ]], + { + dec.new(62.216) + } +) + test:finish_test() -- 2.25.1