From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v3 10/15] sql: refactor COUNT() function Date: Fri, 1 Oct 2021 10:43:05 +0300 [thread overview] Message-ID: <8d151d2fb1c2f9a766529d8d9126d92715bef295.1633073759.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1633073759.git.imeevma@gmail.com> Part of #4145 --- src/box/sql/func.c | 64 +++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 4ee0937a5..6c4f80243 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -154,6 +154,29 @@ fin_avg(struct sql_context *ctx) ctx->is_aborted = true; } +/** Implementation of the COUNT() function. */ +static void +step_count(struct sql_context *ctx, int argc, struct Mem **argv) +{ + assert(argc == 0 || argc == 1); + if (mem_is_null(ctx->pMem)) + mem_set_uint(ctx->pMem, 0); + if (argc == 1 && mem_is_null(argv[0])) + return; + assert(mem_is_uint(ctx->pMem)); + ++ctx->pMem->u.u; +} + +/** Finalizer for the COUNT() function. */ +static void +fin_count(struct sql_context *ctx) +{ + assert(mem_is_null(ctx->pMem) || mem_is_uint(ctx->pMem)); + if (mem_is_null(ctx->pMem)) + return mem_set_uint(ctx->pOut, 0); + mem_copy_as_ephemeral(ctx->pOut, ctx->pMem); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1708,41 +1731,6 @@ soundexFunc(sql_context * context, int argc, sql_value ** argv) } } -/* - * The following structure keeps track of state information for the - * count() aggregate function. - */ -typedef struct CountCtx CountCtx; -struct CountCtx { - i64 n; -}; - -/* - * Routines to implement the count() aggregate function. - */ -static void -countStep(sql_context * context, int argc, sql_value ** argv) -{ - CountCtx *p; - if (argc != 0 && argc != 1) { - diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, - "COUNT", "0 or 1", argc); - context->is_aborted = true; - return; - } - p = sql_aggregate_context(context, sizeof(*p)); - if ((argc == 0 || !mem_is_null(argv[0])) && p != NULL) - p->n++; -} - -static void -countFinalize(sql_context * context) -{ - CountCtx *p; - p = sql_aggregate_context(context, 0); - sql_result_uint(context, p ? p->n : 0); -} - /* * Routines to implement min() and max() aggregate functions. */ @@ -2011,9 +1999,9 @@ static struct sql_func_definition definitions[] = { NULL}, {"COALESCE", -1, {FIELD_TYPE_ANY}, FIELD_TYPE_SCALAR, sql_builtin_stub, NULL}, - {"COUNT", 0, {}, FIELD_TYPE_INTEGER, countStep, countFinalize}, - {"COUNT", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_INTEGER, countStep, - countFinalize}, + {"COUNT", 0, {}, FIELD_TYPE_INTEGER, step_count, fin_count}, + {"COUNT", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_INTEGER, step_count, + fin_count}, {"GREATEST", -1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, minmaxFunc, NULL}, -- 2.25.1
next prev parent reply other threads:[~2021-10-01 7:49 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-01 7:42 [Tarantool-patches] [PATCH v3 00/15] sql: refactor aggregate functions Mergen Imeev via Tarantool-patches 2021-10-01 7:42 ` [Tarantool-patches] [PATCH v3 01/15] sql: fix possible undefined behavior during cast Mergen Imeev via Tarantool-patches 2021-10-01 7:42 ` [Tarantool-patches] [PATCH v3 02/15] sql: use register P1 for number of arguments Mergen Imeev via Tarantool-patches 2021-10-01 7:42 ` [Tarantool-patches] [PATCH v3 03/15] sql: remove AggStep0 and OP_BuiltinFunction0 Mergen Imeev via Tarantool-patches 2021-10-01 7:42 ` [Tarantool-patches] [PATCH v3 04/15] sql: move collation to struct sql_context Mergen Imeev via Tarantool-patches 2021-10-01 7:42 ` [Tarantool-patches] [PATCH v3 05/15] sql: introduce mem_append() Mergen Imeev via Tarantool-patches 2021-10-01 7:42 ` [Tarantool-patches] [PATCH v3 06/15] sql: remove sql_vdbemem_finalize() Mergen Imeev via Tarantool-patches 2021-10-01 7:42 ` [Tarantool-patches] [PATCH v3 07/15] sql: refactor SUM() function Mergen Imeev via Tarantool-patches 2021-10-01 7:43 ` [Tarantool-patches] [PATCH v3 08/15] sql: refactor TOTAL() function Mergen Imeev via Tarantool-patches 2021-10-01 7:43 ` [Tarantool-patches] [PATCH v3 09/15] sql: refactor AVG() function Mergen Imeev via Tarantool-patches 2021-10-01 7:43 ` Mergen Imeev via Tarantool-patches [this message] 2021-10-01 7:43 ` [Tarantool-patches] [PATCH v3 11/15] sql: refactor MIN() and MAX() functions Mergen Imeev via Tarantool-patches 2021-10-01 7:43 ` [Tarantool-patches] [PATCH v3 12/15] sql: refactor GROUP_CONCAT() function Mergen Imeev via Tarantool-patches 2021-10-01 7:43 ` [Tarantool-patches] [PATCH v3 13/15] sql: remove copying of result in finalizers Mergen Imeev via Tarantool-patches 2021-10-01 7:43 ` [Tarantool-patches] [PATCH v3 14/15] sql: remove MEM_TYPE_AGG Mergen Imeev via Tarantool-patches 2021-10-01 7:43 ` [Tarantool-patches] [PATCH v3 15/15] sql: remove field argv from struct sql_context 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=8d151d2fb1c2f9a766529d8d9126d92715bef295.1633073759.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 10/15] sql: refactor COUNT() function' \ /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