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 AC8DA6EC5D; Tue, 21 Sep 2021 14:02:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AC8DA6EC5D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1632222152; bh=gWzdUBEggZOTaxTz4Q2YEbpSrCl9oU/B1ltLmG37Yz4=; 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=HpycqNaPNeWHG5WW01gOtDrHU8spSI9I87N/DjnjQojsFRoidIubWvQ+hjxciJsZ6 YW+YC8dAO9bP3OqZcwsL8KZgMA9xHuuCWxjhpIRAViDtvY4GktSIXOfmh3RcDiCibz +UHdDhfEOM+fnXkVlpAlcUrg6fzcX4svQ2k3epjg= 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 47D726EC5D for ; Tue, 21 Sep 2021 13:59:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 47D726EC5D Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1mSdUZ-0002S3-JT; Tue, 21 Sep 2021 13:59:16 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 21 Sep 2021 13:59:15 +0300 Message-Id: <2db7d1a625d267ce15bcd1779b732bfdc4421694.1632220375.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: 4F1203BC0FB41BD91AE02D33A9C88A2F5A5BD9D2085A59586CBBC9313A5A610100894C459B0CD1B9A7DBC5AE6C60A510F8AA41E2670A5D5B994D8960CDEEF0A829BB0F96A4111E0F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E245C2B74AF15DC8EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006377CB294AC37272EBD8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8AFB2A3319C1868C6AC416A578292EFEE117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC60CDF180582EB8FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CB382FA991BF7A44CD1BAD0901FF15F275D3F5C2DF3D2FB879C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742F36E2E0160E5C5538A5251AA20633D2658C12E6D310A6D53C899C4B0487787E7DC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D343FB425EC7F4D4A4BB71A2294B06001C1F640A525481CC2ECABBC0E233A4B9993456029EF9A6423FE1D7E09C32AA3244C9F92C7165F2E1787669E459868240FF9F165894D92D62706729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnvI84oHUDXCzaOjBmEUdVw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DB7724027CA8DC628E18181A2923F66E683D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 07/15] sql: rework SUM() 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 SUM() accept DOUBLE values by default. Also, after this patch SUM() will be able to work with DECIMAL values. Part of #4145 Part of #6355 --- src/box/sql/func.c | 39 ++++++++++++++++-------- src/box/sql/vdbe.c | 1 - test/sql-tap/built-in-functions.test.lua | 35 +++++++++++++++++++-- 3 files changed, 59 insertions(+), 16 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index b4461c6ee..b06955302 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -53,6 +53,29 @@ static struct mh_strnptr_t *built_in_functions = NULL; static struct func_sql_builtin **functions; +/** Implementation of the SUM() function. */ +static void +step_sum(struct sql_context *ctx, int argc, struct Mem **argv) +{ + assert(argc == 1); + (void)argc; + assert(ctx->pMem->type == MEM_TYPE_NULL || mem_is_num(ctx->pMem)); + if (argv[0]->type == MEM_TYPE_NULL) + return; + if (ctx->pMem->type == MEM_TYPE_NULL) + return mem_copy_as_ephemeral(ctx->pMem, argv[0]); + if (mem_add(ctx->pMem, argv[0], ctx->pMem) != 0) + ctx->is_aborted = true; +} + +/** Finalizer for the SUM() function. */ +static void +fin_sum(struct sql_context *ctx) +{ + assert(ctx->pMem->type == MEM_TYPE_NULL || mem_is_num(ctx->pMem)); + mem_copy_as_ephemeral(ctx->pOut, ctx->pMem); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1654,17 +1677,6 @@ sum_step(struct sql_context *context, int argc, sql_value **argv) context->is_aborted = true; } -static void -sumFinalize(sql_context * context) -{ - SumCtx *p; - p = sql_aggregate_context(context, 0); - if (p == NULL || p->count == 0) - mem_set_null(context->pOut); - else - mem_copy_as_ephemeral(context->pOut, &p->mem); -} - static void avgFinalize(sql_context * context) { @@ -2113,8 +2125,9 @@ static struct sql_func_definition definitions[] = { {"SUBSTR", 3, {FIELD_TYPE_VARBINARY, FIELD_TYPE_INTEGER, FIELD_TYPE_INTEGER}, FIELD_TYPE_VARBINARY, substrFunc, NULL}, - {"SUM", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, sum_step, sumFinalize}, - {"SUM", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, sum_step, sumFinalize}, + {"SUM", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_sum, fin_sum}, + {"SUM", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, step_sum, fin_sum}, + {"SUM", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, step_sum, fin_sum}, {"TOTAL", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_DOUBLE, sum_step, totalFinalize}, {"TOTAL", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, sum_step, diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index dfab86c50..a74ee29ea 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -4207,7 +4207,6 @@ case OP_AggFinal: { assert(pOp->p1>0 && pOp->p1<=(p->nMem+1 - p->nCursor)); struct func_sql_builtin *func = (struct func_sql_builtin *)pOp->p4.func; struct Mem *pIn1 = &aMem[pOp->p1]; - assert(mem_is_null(pIn1) || mem_is_agg(pIn1)); struct sql_context ctx; memset(&ctx, 0, sizeof(ctx)); diff --git a/test/sql-tap/built-in-functions.test.lua b/test/sql-tap/built-in-functions.test.lua index 6fae811dc..8daf41c1d 100755 --- a/test/sql-tap/built-in-functions.test.lua +++ b/test/sql-tap/built-in-functions.test.lua @@ -1,6 +1,8 @@ #!/usr/bin/env tarantool local test = require("sqltester") -test:plan(52) +test:plan(55) + +local dec = require('decimal') -- -- Make sure that number of arguments check is checked properly for SQL built-in @@ -455,7 +457,7 @@ test:do_test( local res = {pcall(box.execute, [[SELECT SUM(?);]], {'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( @@ -545,4 +547,33 @@ test:do_test( {name = "COLUMN_2", type = "scalar"}, }) +-- Make sure SUM() accepts and returns DOUBLE by default. +test:do_test( + "builtins-4.1.1", + function() + return box.execute([[SELECT SUM(?);]], {1}).metadata + end, { + {name = "COLUMN_1", type = "double"}, + }) + +test:do_test( + "builtins-4.1.2", + function() + local res = {pcall(box.execute, [[SELECT SUM(?);]], {-1ULL})} + return {tostring(res[3])} + end, { + "Type mismatch: can not convert integer(18446744073709551615) to double" + }) + +-- Make sure SUM() works with DECIMAL properly. +test:do_execsql_test( + "builtins-4.1.3", + [[ + SELECT SUM(cast(column_2 as DECIMAL)) from (values(1), (123.432)); + ]], + { + dec.new(124.432) + } +) + test:finish_test() -- 2.25.1