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 v1 11/13] sql: rework GROUP_CONCAT() Date: Fri, 10 Sep 2021 19:02:27 +0300 [thread overview] Message-ID: <49ccc047ebd332d5867eeddb17eea1f6a3f24ebe.1631289462.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1631289462.git.imeevma@gmail.com> This patch simplifies SQL built-in aggregate function GROUP_CONCAT(). Part of #4145 --- src/box/sql/func.c | 121 +++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 71 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index a814228bb..72c1c7828 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -203,6 +203,52 @@ fin_minmax(struct sql_context *ctx) mem_copy(ctx->pOut, ctx->pMem); } +/** Implementation of the GROUP_CONCAT() function. */ +static void +step_group_concat(struct sql_context *ctx, int argc, struct Mem **argv) +{ + assert(argc == 1 || argc == 2); + (void)argc; + if (argv[0]->type == MEM_TYPE_NULL) + return; + assert(mem_is_str(argv[0]) || mem_is_bin(argv[0])); + if (ctx->pMem->type == MEM_TYPE_NULL) { + if (mem_copy_str(ctx->pMem, argv[0]->z, argv[0]->n) != 0) + ctx->is_aborted = true; + return; + } + const char *sep = NULL; + int sep_len = 0; + if (argc == 1) { + sep = ","; + sep_len = 1; + } else if (argv[1]->type == MEM_TYPE_NULL) { + sep = ""; + sep_len = 0; + } else { + assert(mem_is_same_type(argv[0], argv[0])); + sep = argv[1]->z; + sep_len = argv[1]->n; + } + if (sep_len > 0) { + if (mem_append(ctx->pMem, sep, sep_len) != 0) { + ctx->is_aborted = true; + return; + } + } + if (mem_append(ctx->pMem, argv[0]->z, argv[0]->n) != 0) { + ctx->is_aborted = true; + return; + } +} + +/** Finalizer for the GROUP_CONCAT() function. */ +static void +fin_group_concat(struct sql_context *ctx) +{ + mem_copy(ctx->pOut, ctx->pMem); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1747,73 +1793,6 @@ soundexFunc(sql_context * context, int argc, sql_value ** argv) } } -/* - * group_concat(EXPR, ?SEPARATOR?) - */ -static void -groupConcatStep(sql_context * context, int argc, sql_value ** argv) -{ - const char *zVal; - StrAccum *pAccum; - const char *zSep; - int nVal, nSep; - if (argc != 1 && argc != 2) { - diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, - "GROUP_CONCAT", "1 or 2", argc); - context->is_aborted = true; - return; - } - if (mem_is_null(argv[0])) - return; - pAccum = - (StrAccum *) sql_aggregate_context(context, sizeof(*pAccum)); - - if (pAccum) { - sql *db = sql_context_db_handle(context); - int firstTerm = pAccum->mxAlloc == 0; - pAccum->mxAlloc = db->aLimit[SQL_LIMIT_LENGTH]; - if (!firstTerm) { - if (argc == 2) { - zSep = mem_as_str0(argv[1]); - nSep = mem_len_unsafe(argv[1]); - } else { - zSep = ","; - nSep = 1; - } - if (zSep) - sqlStrAccumAppend(pAccum, zSep, nSep); - } - zVal = mem_as_str0(argv[0]); - nVal = mem_len_unsafe(argv[0]); - if (zVal) - sqlStrAccumAppend(pAccum, zVal, nVal); - } -} - -static void -groupConcatFinalize(sql_context * context) -{ - StrAccum *pAccum; - pAccum = sql_aggregate_context(context, 0); - if (pAccum) { - if (pAccum->accError == STRACCUM_TOOBIG) { - diag_set(ClientError, ER_SQL_EXECUTE, "string or binary"\ - "string is too big"); - context->is_aborted = true; - } else if (pAccum->accError == STRACCUM_NOMEM) { - context->is_aborted = true; - } else { - char *str = sqlStrAccumFinish(pAccum); - int len = pAccum->nChar; - assert(len >= 0); - if (context->func->def->returns == FIELD_TYPE_STRING) - mem_set_str_dynamic(context->pOut, str, len); - else - mem_set_bin_dynamic(context->pOut, str, len); - } - } -} - int sql_is_like_func(struct Expr *expr) { @@ -1981,13 +1960,13 @@ static struct sql_func_definition definitions[] = { NULL}, {"GROUP_CONCAT", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_STRING, - groupConcatStep, groupConcatFinalize}, + step_group_concat, fin_group_concat}, {"GROUP_CONCAT", 2, {FIELD_TYPE_STRING, FIELD_TYPE_STRING}, - FIELD_TYPE_STRING, groupConcatStep, groupConcatFinalize}, + FIELD_TYPE_STRING, step_group_concat, fin_group_concat}, {"GROUP_CONCAT", 1, {FIELD_TYPE_VARBINARY}, FIELD_TYPE_VARBINARY, - groupConcatStep, groupConcatFinalize}, + step_group_concat, fin_group_concat}, {"GROUP_CONCAT", 2, {FIELD_TYPE_VARBINARY, FIELD_TYPE_VARBINARY}, - FIELD_TYPE_VARBINARY, groupConcatStep, groupConcatFinalize}, + FIELD_TYPE_VARBINARY, step_group_concat, fin_group_concat}, {"HEX", 1, {FIELD_TYPE_VARBINARY}, FIELD_TYPE_STRING, hexFunc, NULL}, {"IFNULL", 2, {FIELD_TYPE_ANY, FIELD_TYPE_ANY}, FIELD_TYPE_SCALAR, -- 2.25.1
next prev parent reply other threads:[~2021-09-10 16:07 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-10 16:01 [Tarantool-patches] [PATCH v1 00/13] sql: reworks aggregate functions Mergen Imeev via Tarantool-patches 2021-09-10 16:01 ` [Tarantool-patches] [PATCH v1 01/13] sql: use register P1 for number of arguments Mergen Imeev via Tarantool-patches 2021-09-10 16:01 ` [Tarantool-patches] [PATCH v1 02/13] sql: remove AggStep0 and OP_BuiltinFunction0 Mergen Imeev via Tarantool-patches 2021-09-10 16:27 ` Mergen Imeev via Tarantool-patches 2021-09-14 21:21 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-10 16:01 ` [Tarantool-patches] [PATCH v1 03/13] sql: move collation to struct sql_context Mergen Imeev via Tarantool-patches 2021-09-14 21:22 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-21 10:40 ` Mergen Imeev via Tarantool-patches 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 04/13] sql: introduce mem_append() Mergen Imeev via Tarantool-patches 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 05/13] sql: remove sql_vdbemem_finalize() Mergen Imeev via Tarantool-patches 2021-09-14 21:23 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-21 10:47 ` Mergen Imeev via Tarantool-patches 2021-09-22 22:47 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 06/13] sql: rework SUM() Mergen Imeev via Tarantool-patches 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 07/13] sql: rework TOTAL() Mergen Imeev via Tarantool-patches 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 08/13] sql: rework AVG() Mergen Imeev via Tarantool-patches 2021-09-14 21:24 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 09/13] sql: rework COUNT() Mergen Imeev via Tarantool-patches 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 10/13] sql: rework MIN() and MAX() Mergen Imeev via Tarantool-patches 2021-09-10 16:02 ` Mergen Imeev via Tarantool-patches [this message] 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 12/13] sql: remove copying of result in finalizers Mergen Imeev via Tarantool-patches 2021-09-14 21:24 ` Vladislav Shpilevoy via Tarantool-patches 2021-09-21 10:49 ` Mergen Imeev via Tarantool-patches 2021-09-10 16:02 ` [Tarantool-patches] [PATCH v1 13/13] sql: remove MEM_TYPE_AGG 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=49ccc047ebd332d5867eeddb17eea1f6a3f24ebe.1631289462.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 11/13] sql: rework GROUP_CONCAT()' \ /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