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 8C4936EC40; Sat, 25 Sep 2021 14:20:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8C4936EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1632568826; bh=JYZA/HeGDZDoV7P+8m6e6UpzmhEFukCkRaIXi5mY3mY=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=TSGhVg55ZwIfCpT9zQnpUpvxcFL5dbc3lS/eSStza9FeUeaJOPnbembXv93Zk7O1a 4zmcriUYv5r7ZNRyIViHQLhttS6GI0q3OGUNWpCHuUoNxpajNw6peA1ftGLkHcQ+9c 435XG3mo/UyokVY60eg9HmAG6AJSTECKO8QR6ORs= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 BD61F6EC40 for ; Sat, 25 Sep 2021 14:20:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BD61F6EC40 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mU5jF-000098-2h; Sat, 25 Sep 2021 14:20:25 +0300 Date: Sat, 25 Sep 2021 14:20:23 +0300 To: v.shpilevoy@tarantool.org, tarantool-patches@dev.tarantool.org Message-ID: <20210925112023.GE290467@tarantool.org> References: <6a8a797563addb11efb18b424a625e12c8464a03.1632220375.git.imeevma@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <6a8a797563addb11efb18b424a625e12c8464a03.1632220375.git.imeevma@gmail.com> X-4EC0790: 10 X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD96A58C36AA2E99649DFE41A06634A2C4EB30EB11CC09FFC21182A05F538085040D51968174DE1A22CA488B6763544C6CDB2EF2ECDCB09C315C3E47D448A7B37B6 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BC4E2FB7ADD5BA16EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637BE899A9B5C1209058638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8854A761D90E76FF72EDDD12192F97FA4117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A57B8B891BBD30F5926308519B7CFE4C1ECCCF2C129A42529BD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75BFC02AB3DF06BA5A410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3419891600CCEF4607D5D709C9AD7711993E50980C440F863BAAA58C60995CF87E66341FB645A4C08E1D7E09C32AA3244C91874F64050BCD247B7AEB77BD38F3E9C86C126E7119A0FE729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojqHUEAOTxd4jUgsu0modJAg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D06A031F5FA645F02BAFBAC4BAD91345683D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 08/15] sql: rework TOTAL() 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: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thank you for the review! I replaced manual checks of MEM type by mem_is_*() functions. Diff and new patch below. On Tue, Sep 21, 2021 at 01:59:18PM +0300, Mergen Imeev via Tarantool-patches wrote: > This patch makes TOTAL() accept DOUBLE values by default. Also, after > this patch TOTAL() will be able to work with DECIMAL values. > > Part of #4145 > Part of #6355 > --- > src/box/sql/func.c | 47 ++++++++++++++++-------- > test/sql-tap/built-in-functions.test.lua | 33 ++++++++++++++++- > 2 files changed, 63 insertions(+), 17 deletions(-) > > diff --git a/src/box/sql/func.c b/src/box/sql/func.c > index b06955302..12a6a5a2c 100644 > --- a/src/box/sql/func.c > +++ b/src/box/sql/func.c > @@ -76,6 +76,32 @@ fin_sum(struct sql_context *ctx) > mem_copy_as_ephemeral(ctx->pOut, ctx->pMem); > } > > +/** Implementation of the TOTAL() function. */ > +static void > +step_total(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) > + mem_set_double(ctx->pMem, 0.0); > + if (mem_add(ctx->pMem, argv[0], ctx->pMem) != 0) > + ctx->is_aborted = true; > +} > + > +/** Finalizer for the TOTAL() function. */ > +static void > +fin_total(struct sql_context *ctx) > +{ > + assert(ctx->pMem->type == MEM_TYPE_NULL || mem_is_double(ctx->pMem)); > + if (ctx->pMem->type == MEM_TYPE_NULL) > + mem_set_double(ctx->pOut, 0.0); > + else > + mem_copy_as_ephemeral(ctx->pOut, ctx->pMem); > +} > + > static const unsigned char * > mem_as_ustr(struct Mem *mem) > { > @@ -1693,17 +1719,6 @@ avgFinalize(sql_context * context) > context->is_aborted = true; > } > > -static void > -totalFinalize(sql_context * context) > -{ > - SumCtx *p; > - p = sql_aggregate_context(context, 0); > - if (p == NULL || p->count == 0) > - mem_set_double(context->pOut, 0.0); > - else > - mem_copy_as_ephemeral(context->pOut, &p->mem); > -} > - > /* > * The following structure keeps track of state information for the > * count() aggregate function. > @@ -2128,10 +2143,12 @@ static struct sql_func_definition definitions[] = { > {"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, > - totalFinalize}, > + {"TOTAL", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_total, > + fin_total}, > + {"TOTAL", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_DOUBLE, step_total, > + fin_total}, > + {"TOTAL", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DOUBLE, step_total, > + fin_total}, > > {"TRIM", 2, {FIELD_TYPE_STRING, FIELD_TYPE_INTEGER}, > FIELD_TYPE_STRING, trim_func, NULL}, > diff --git a/test/sql-tap/built-in-functions.test.lua b/test/sql-tap/built-in-functions.test.lua > index 8daf41c1d..507d06549 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(55) > +test:plan(58) > > local dec = require('decimal') > > @@ -497,7 +497,7 @@ test:do_test( > local res = {pcall(box.execute, [[SELECT TOTAL(?);]], {'1'})} > return {tostring(res[3])} > end, { > - "Type mismatch: can not convert string('1') to integer" > + "Type mismatch: can not convert string('1') to double" > }) > > -- > @@ -576,4 +576,33 @@ test:do_execsql_test( > } > ) > > +-- Make sure TOTAL() accepts DOUBLE by default. > +test:do_test( > + "builtins-4.2.1", > + function() > + return box.execute([[SELECT TOTAL(?);]], {1}).metadata > + end, { > + {name = "COLUMN_1", type = "double"}, > + }) > + > +test:do_test( > + "builtins-4.2.2", > + function() > + local res = {pcall(box.execute, [[SELECT TOTAL(?);]], {-1ULL})} > + return {tostring(res[3])} > + end, { > + "Type mismatch: can not convert integer(18446744073709551615) to double" > + }) > + > +-- Make sure TOTAL() works with DECIMAL properly. > +test:do_execsql_test( > + "builtins-4.2.3", > + [[ > + SELECT TOTAL(cast(column_2 as DECIMAL)) from (values(1), (123.432)); > + ]], > + { > + 124.432 > + } > +) > + > test:finish_test() > -- > 2.25.1 > Diff: diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 6cd884221..d0606744c 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -82,10 +82,10 @@ step_total(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) + assert(mem_is_null(ctx->pMem) || mem_is_num(ctx->pMem)); + if (mem_is_null(argv[0])) return; - if (ctx->pMem->type == MEM_TYPE_NULL) + if (mem_is_null(ctx->pMem)) mem_set_double(ctx->pMem, 0.0); if (mem_add(ctx->pMem, argv[0], ctx->pMem) != 0) ctx->is_aborted = true; @@ -95,8 +95,8 @@ step_total(struct sql_context *ctx, int argc, struct Mem **argv) static void fin_total(struct sql_context *ctx) { - assert(ctx->pMem->type == MEM_TYPE_NULL || mem_is_double(ctx->pMem)); - if (ctx->pMem->type == MEM_TYPE_NULL) + assert(mem_is_null(ctx->pMem) || mem_is_double(ctx->pMem)); + if (mem_is_null(ctx->pMem)) mem_set_double(ctx->pOut, 0.0); else mem_copy_as_ephemeral(ctx->pOut, ctx->pMem); New patch: commit 3d6db454539f77cd9c3d96aacdc8c4ff3a74ef2f Author: Mergen Imeev Date: Thu Sep 9 18:02:59 2021 +0300 sql: rework TOTAL() This patch makes TOTAL() accept DOUBLE values by default. Also, after this patch TOTAL() will be able to work with DECIMAL values. Part of #4145 Part of #6355 diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 4cc6f378b..d0606744c 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -76,6 +76,32 @@ fin_sum(struct sql_context *ctx) mem_copy_as_ephemeral(ctx->pOut, ctx->pMem); } +/** Implementation of the TOTAL() function. */ +static void +step_total(struct sql_context *ctx, int argc, struct Mem **argv) +{ + assert(argc == 1); + (void)argc; + assert(mem_is_null(ctx->pMem) || mem_is_num(ctx->pMem)); + if (mem_is_null(argv[0])) + return; + if (mem_is_null(ctx->pMem)) + mem_set_double(ctx->pMem, 0.0); + if (mem_add(ctx->pMem, argv[0], ctx->pMem) != 0) + ctx->is_aborted = true; +} + +/** Finalizer for the TOTAL() function. */ +static void +fin_total(struct sql_context *ctx) +{ + assert(mem_is_null(ctx->pMem) || mem_is_double(ctx->pMem)); + if (mem_is_null(ctx->pMem)) + mem_set_double(ctx->pOut, 0.0); + else + mem_copy_as_ephemeral(ctx->pOut, ctx->pMem); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1693,17 +1719,6 @@ avgFinalize(sql_context * context) context->is_aborted = true; } -static void -totalFinalize(sql_context * context) -{ - SumCtx *p; - p = sql_aggregate_context(context, 0); - if (p == NULL || p->count == 0) - mem_set_double(context->pOut, 0.0); - else - mem_copy_as_ephemeral(context->pOut, &p->mem); -} - /* * The following structure keeps track of state information for the * count() aggregate function. @@ -2128,10 +2143,12 @@ static struct sql_func_definition definitions[] = { {"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, - totalFinalize}, + {"TOTAL", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_total, + fin_total}, + {"TOTAL", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_DOUBLE, step_total, + fin_total}, + {"TOTAL", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DOUBLE, step_total, + fin_total}, {"TRIM", 2, {FIELD_TYPE_STRING, FIELD_TYPE_INTEGER}, FIELD_TYPE_STRING, trim_func, NULL}, diff --git a/test/sql-tap/built-in-functions.test.lua b/test/sql-tap/built-in-functions.test.lua index 8daf41c1d..507d06549 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(55) +test:plan(58) local dec = require('decimal') @@ -497,7 +497,7 @@ test:do_test( local res = {pcall(box.execute, [[SELECT TOTAL(?);]], {'1'})} return {tostring(res[3])} end, { - "Type mismatch: can not convert string('1') to integer" + "Type mismatch: can not convert string('1') to double" }) -- @@ -576,4 +576,33 @@ test:do_execsql_test( } ) +-- Make sure TOTAL() accepts DOUBLE by default. +test:do_test( + "builtins-4.2.1", + function() + return box.execute([[SELECT TOTAL(?);]], {1}).metadata + end, { + {name = "COLUMN_1", type = "double"}, + }) + +test:do_test( + "builtins-4.2.2", + function() + local res = {pcall(box.execute, [[SELECT TOTAL(?);]], {-1ULL})} + return {tostring(res[3])} + end, { + "Type mismatch: can not convert integer(18446744073709551615) to double" + }) + +-- Make sure TOTAL() works with DECIMAL properly. +test:do_execsql_test( + "builtins-4.2.3", + [[ + SELECT TOTAL(cast(column_2 as DECIMAL)) from (values(1), (123.432)); + ]], + { + 124.432 + } +) + test:finish_test()