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 5D8966ECE3; Mon, 22 Nov 2021 10:41:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5D8966ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1637566876; bh=/IO7wSvv84E6lfF9bd3Q/O6/PL+pWksKrcxMpUs/dvE=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=KHeLWuif/Ghol4vgYuiuP13yog4Ri+0NTz9NvPgyFZRaz7MtfRKFRak90/03sCw6P pILQWeT9feupwFjfKAjmWicqOG7HA6MOyFODSB3qY8IRcxQGSscm0wJKxebMcOaD2C RR8YsbsePv05VTcR68vxhEwNvFIGryoYZKSSaovA= 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 4CFB76ECE3 for ; Mon, 22 Nov 2021 10:41:15 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4CFB76ECE3 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mp3ww-0006V7-8T; Mon, 22 Nov 2021 10:41:14 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Mon, 22 Nov 2021 10:41:13 +0300 Message-Id: <34458ca49bd4bac9a7f568ff5028ad86fa05524a.1637566799.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9731B3922EC063979441C7E49BA1D360DCF2D4FD3FE2A0DCE00894C459B0CD1B9D8774CFAF1453E9B741DD071AC50325B081C4FCC9B9607BE80ACAB8EAC650A75 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C982EEF206AB12BEEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637EE76DA0D7A2874C78638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D87551AED4D5755F6C72E51072F728F32F117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735209ECD01F8117BC8BEA471835C12D1D977C4224003CC8364762BB6847A3DEAEFB0F43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7C565C1E6824D8037B43847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CC559E5F89E84DC556E862C7B5A9A1BA7A3FD46B1866DDD429C2B6934AE262D3EE7EAB7254005DCEDF106BCDE8ED9E2781E0A4E2319210D9B64D260DF9561598F01A9E91200F654B02E4E6844585584458E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D342E8FEDBD32DECB6D81C32A12E702C4D1ACEB2E6F25CEEC87EC08288198C5E4311B331F1670AD5CCE1D7E09C32AA3244C694F5E9193B9A3F67BE18A806B9679A5F165894D92D62706729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojp2KOOpFlmzdlyHxwZccfhQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DA5E04414AF19196A47CE657EC7885E9183D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 1/1] sql: introduce DECIMAL to SQL built-in functions 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" After this patch, all SQL built-in functions will work correctly with DECIMAL values. Closes #6355 --- https://github.com/tarantool/tarantool/issues/6355 https://github.com/tarantool/tarantool/tree/imeevma/gh-6355-introduce-decimal-to-builtins .../gh-6355-introduce-decimal-to-builtins.md | 3 + src/box/sql/func.c | 25 ++++++ src/box/sql/mem.h | 6 ++ test/sql-tap/decimal.test.lua | 81 ++++++++++++++++++- 4 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/gh-6355-introduce-decimal-to-builtins.md diff --git a/changelogs/unreleased/gh-6355-introduce-decimal-to-builtins.md b/changelogs/unreleased/gh-6355-introduce-decimal-to-builtins.md new file mode 100644 index 000000000..2a08f52a4 --- /dev/null +++ b/changelogs/unreleased/gh-6355-introduce-decimal-to-builtins.md @@ -0,0 +1,3 @@ +## feature/sql + +* Built-in SQL functions now work correctly with DECIMAL values (gh-6355). diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 5abaf490d..e3ce6c18e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -258,6 +258,19 @@ func_abs_double(struct sql_context *ctx, int argc, const struct Mem *argv) mem_set_double(ctx->pOut, arg->u.r < 0 ? -arg->u.r : arg->u.r); } +static void +func_abs_dec(struct sql_context *ctx, int argc, const struct Mem *argv) +{ + assert(argc == 1); + (void)argc; + const struct Mem *arg = &argv[0]; + if (mem_is_null(arg)) + return; + assert(mem_is_dec(arg)); + mem_set_dec(ctx->pOut, &arg->u.d); + decimal_abs(&ctx->pOut->u.d, &ctx->pOut->u.d); +} + /** Implementation of the CHAR_LENGTH() function. */ static void func_char_length(struct sql_context *ctx, int argc, const struct Mem *argv) @@ -1694,8 +1707,11 @@ static struct sql_func_definition definitions[] = { NULL}, {"ABS", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, func_abs_double, NULL}, + {"ABS", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, func_abs_dec, + NULL}, {"AVG", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, step_avg, fin_avg}, {"AVG", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_avg, fin_avg}, + {"AVG", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, step_avg, fin_avg}, {"CHAR", -1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_STRING, func_char, NULL}, {"CHAR_LENGTH", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_INTEGER, func_char_length, NULL}, @@ -1709,6 +1725,8 @@ static struct sql_func_definition definitions[] = { func_greatest_least, NULL}, {"GREATEST", -1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, func_greatest_least, NULL}, + {"GREATEST", -1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, + func_greatest_least, NULL}, {"GREATEST", -1, {FIELD_TYPE_NUMBER}, FIELD_TYPE_NUMBER, func_greatest_least, NULL}, {"GREATEST", -1, {FIELD_TYPE_VARBINARY}, FIELD_TYPE_VARBINARY, @@ -1737,6 +1755,8 @@ static struct sql_func_definition definitions[] = { func_greatest_least, NULL}, {"LEAST", -1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, func_greatest_least, NULL}, + {"LEAST", -1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, + func_greatest_least, NULL}, {"LEAST", -1, {FIELD_TYPE_NUMBER}, FIELD_TYPE_NUMBER, func_greatest_least, NULL}, {"LEAST", -1, {FIELD_TYPE_VARBINARY}, FIELD_TYPE_VARBINARY, @@ -1765,6 +1785,7 @@ static struct sql_func_definition definitions[] = { {"MAX", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, step_minmax, NULL}, {"MAX", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_minmax, NULL}, + {"MAX", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, step_minmax, NULL}, {"MAX", 1, {FIELD_TYPE_NUMBER}, FIELD_TYPE_NUMBER, step_minmax, NULL}, {"MAX", 1, {FIELD_TYPE_VARBINARY}, FIELD_TYPE_VARBINARY, step_minmax, NULL}, @@ -1774,6 +1795,7 @@ static struct sql_func_definition definitions[] = { {"MIN", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, step_minmax, NULL}, {"MIN", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_minmax, NULL}, + {"MIN", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, step_minmax, NULL}, {"MIN", 1, {FIELD_TYPE_NUMBER}, FIELD_TYPE_NUMBER, step_minmax, NULL}, {"MIN", 1, {FIELD_TYPE_VARBINARY}, FIELD_TYPE_VARBINARY, step_minmax, NULL}, @@ -1816,10 +1838,13 @@ static struct sql_func_definition definitions[] = { FIELD_TYPE_VARBINARY, func_substr_octets, NULL}, {"SUM", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, step_sum, NULL}, {"SUM", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, step_sum, NULL}, + {"SUM", 1, {FIELD_TYPE_DECIMAL}, FIELD_TYPE_DECIMAL, step_sum, NULL}, {"TOTAL", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_DOUBLE, step_total, fin_total}, {"TOTAL", 1, {FIELD_TYPE_DOUBLE}, 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, func_trim_str, NULL}, diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 9d5245708..6a04883be 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -147,6 +147,12 @@ mem_is_double(const struct Mem *mem) return mem->type == MEM_TYPE_DOUBLE; } +static inline bool +mem_is_dec(const struct Mem *mem) +{ + return mem->type == MEM_TYPE_DEC; +} + static inline bool mem_is_int(const struct Mem *mem) { diff --git a/test/sql-tap/decimal.test.lua b/test/sql-tap/decimal.test.lua index a6d66b75b..cf574ac79 100755 --- a/test/sql-tap/decimal.test.lua +++ b/test/sql-tap/decimal.test.lua @@ -3,7 +3,7 @@ local build_path = os.getenv("BUILDDIR") package.cpath = build_path..'/test/sql-tap/?.so;'..build_path..'/test/sql-tap/?.dylib;'..package.cpath local test = require("sqltester") -test:plan(109) +test:plan(117) local dec = require("decimal") local dec1 = dec.new("111") @@ -1018,4 +1018,83 @@ test:do_catchsql_test( "the supported range [-9223372036854775808, 18446744073709551615]" }) + +-- gh-6355: Make sure the SQL built-in functions work properly with DECIMAL. +test:execsql([[ + CREATE TABLE t18 (i INT PRIMARY KEY AUTOINCREMENT, d DECIMAL); + INSERT INTO t18(d) VALUES(123), (-0.7), (9999999999999999999999.0); +]]) + +test:do_execsql_test( + "dec-18.1", + [[ + SELECT typeof(ABS(d)), ABS(d) FROM t18; + ]], { + "decimal", dec.new(123), + "decimal", dec.new(0.7), + "decimal", dec.new('9999999999999999999999') + }) + +test:do_execsql_test( + "dec-18.2", + [[ + SELECT typeof(AVG(d)), AVG(d) FROM t18; + ]], { + "decimal", dec.new('3333333333333333333373.7666666666666667') + }) + +test:do_execsql_test( + "dec-18.3", + [[ + SELECT typeof(GREATEST(d, d * 0 + i)), GREATEST(d, d * 0 + i) FROM t18; + ]], { + "decimal", dec.new(123), + "decimal", dec.new(2), + "decimal", dec.new('9999999999999999999999') + }) + +test:do_execsql_test( + "dec-18.4", + [[ + SELECT typeof(LEAST(d, d * 0 + i)), LEAST(d, d * 0 + i) FROM t18; + ]], { + "decimal", dec.new(1), + "decimal", dec.new(-0.7), + "decimal", dec.new(3) + }) + +test:do_execsql_test( + "dec-18.5", + [[ + SELECT typeof(MAX(d)), MAX(d) FROM t18; + ]], { + "decimal", dec.new('9999999999999999999999') + }) + +test:do_execsql_test( + "dec-18.6", + [[ + SELECT typeof(MIN(d)), MIN(d) FROM t18; + ]], { + "decimal", dec.new(-0.7), + }) + +test:do_execsql_test( + "dec-18.7", + [[ + SELECT typeof(SUM(d)), SUM(d) FROM t18; + ]], { + "decimal", dec.new('10000000000000000000121.3') + }) + +test:do_execsql_test( + "dec-18.8", + [[ + SELECT typeof(TOTAL(d)), TOTAL(d) FROM t18; + ]], { + "double", 1e+22 + }) + +test:execsql([[DROP TABLE t18;]]) + test:finish_test() -- 2.25.1