From: Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v2 09/15] sql: rework AVG() Date: Thu, 23 Sep 2021 00:48:58 +0200 [thread overview] Message-ID: <62bdd807-6f60-4307-1ed8-0badb6c014ae@tarantool.org> (raw) In-Reply-To: <48ee23c47c696c5e002347841b652677ca877507.1632220375.git.imeevma@gmail.com> Thanks for the fixes! > diff --git a/src/box/sql/func.c b/src/box/sql/func.c > index 12a6a5a2c..b5f154fb1 100644 > --- a/src/box/sql/func.c > +++ b/src/box/sql/func.c > @@ -102,6 +102,54 @@ 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; > + struct Mem *mem; > + uint32_t *count; > + if (ctx->pMem->type == MEM_TYPE_NULL) { > + uint32_t size = sizeof(struct Mem) + sizeof(uint32_t); > + mem = sqlDbMallocRawNN(sql_get(), size); 1. Where is it deleted? Can't find. > + if (mem == NULL) { > + ctx->is_aborted = true; > + return; > + } > + count = (uint32_t *)(mem + 1); > + mem_create(mem); > + *count = 1; > + mem_copy_as_ephemeral(mem, argv[0]); > + mem_set_bin_allocated(ctx->pMem, (char *)mem, size); > + return; > + } > 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 > @@ -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)); 2. I don't understand how does it work. Why not column_1? Why does it fail? tarantool> box.execute('SELECT column_1 from (values(1), (123.432));') --- - null - Can’t resolve field 'COLUMN_1' ... Isn't there 2 tuples [1], and [123.432] with just 1 column each? And why does it work when I delete one of the values? tarantool> box.execute('SELECT column_1 from (values(1));') --- - metadata: - name: COLUMN_1 type: integer rows: - [1] ... > + ]], > + { > + dec.new(62.216) > + } > +) > + > test:finish_test() >
next prev parent reply other threads:[~2021-09-22 22:49 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1632220375.git.imeevma@gmail.com> 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 01/15] sql: fix possible undefined behavior during cast Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 02/15] sql: use register P1 for number of arguments Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 04/15] sql: move collation to struct sql_context Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 05/15] sql: introduce mem_append() Mergen Imeev via Tarantool-patches 2021-09-25 11:06 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 06/15] sql: remove sql_vdbemem_finalize() Mergen Imeev via Tarantool-patches 2021-09-22 22:47 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-25 11:13 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 07/15] sql: rework SUM() Mergen Imeev via Tarantool-patches 2021-09-22 22:48 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-25 11:17 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 08/15] sql: rework TOTAL() Mergen Imeev via Tarantool-patches 2021-09-25 11:20 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 09/15] sql: rework AVG() Mergen Imeev via Tarantool-patches 2021-09-22 22:48 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-09-25 11:32 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 10/15] sql: rework COUNT() Mergen Imeev via Tarantool-patches 2021-09-25 11:34 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 11/15] sql: rework MIN() and MAX() Mergen Imeev via Tarantool-patches 2021-09-25 11:36 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 12/15] sql: rework GROUP_CONCAT() Mergen Imeev via Tarantool-patches 2021-09-22 22:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-25 11:42 ` Mergen Imeev via Tarantool-patches 2021-09-29 7:03 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 13/15] sql: remove copying of result in finalizers Mergen Imeev via Tarantool-patches 2021-09-22 22:50 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-25 11:47 ` Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 14/15] sql: remove MEM_TYPE_AGG Mergen Imeev via Tarantool-patches 2021-09-21 10:59 ` [Tarantool-patches] [PATCH v2 15/15] sql: remove field argv from struct sql_context Mergen Imeev via Tarantool-patches 2021-09-22 22:51 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-25 12:03 ` Mergen Imeev via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=62bdd807-6f60-4307-1ed8-0badb6c014ae@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 09/15] sql: rework AVG()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox