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 096F66FC87; Fri, 1 Oct 2021 15:55:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 096F66FC87 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633092904; bh=BZL/qX2/JOtgibN95C4dxP1vvO1SpyyeX/Rj/oJAlM4=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=EYck97HEeSzIZHWrzx8RqsY6rT7bAWjKTYaRhDj7HLs4G62iw+CuIgNXg8uCtBvDZ mIDSzcIrNPPzwBh2//1y2vKysU8rRsFcaO6zcYhY1GLcNS/2xrjftUlHShDcDqRdg4 xGY3r5RH3VPTW5oOklRnWKHBS//txeqj4r14iFSs= 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 749AE7414D for ; Fri, 1 Oct 2021 15:48:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 749AE7414D Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mWHyB-00040F-RH; Fri, 01 Oct 2021 15:48:56 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 1 Oct 2021 15:48:55 +0300 Message-Id: <4ef039ca9cf571d15636db1c51f87683f9f06c63.1633092363.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD96A58C36AA2E99649E150573C3DCDB29943BD5C8B56246B79182A05F5380850407AAA3147E02DB29CFF35FD4725FA50803B6A3A935F906A92940A912162DDC458 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F8E53417176C7207EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637FBDDB35DE4C816078638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8419EB877948AEB0611AACFD64303D157117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBBB17C150BCA6793793B7ED878F914A68357D3D2A12A90DB9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF783E2B6F79C23BED699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348BF433665406F39018BEA0C2299A9DE0FA1DA9BE21C74BEA81D6D1AD4E697FE7DD47F630693154D21D7E09C32AA3244C3BA759F90CF0B6D2A3F37556F437173F3A92A9747B6CC886729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojJNmX3owDPmEM0IlvHByZ5Q== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DA9C85DFC71CDC1D8BD9B7CD59B8963DE83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 13/16] sql: refactor GROUP_CONCAT() function 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" Part of #4145 --- src/box/sql/func.c | 117 ++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 71 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 51693d47b..b669402bb 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -217,6 +217,48 @@ 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 (mem_is_null(argv[0])) + return; + assert(mem_is_str(argv[0]) || mem_is_bin(argv[0])); + if (mem_is_null(ctx->pMem)) { + if (mem_copy(ctx->pMem, argv[0]) != 0) + ctx->is_aborted = true; + return; + } + const char *sep = NULL; + int sep_len = 0; + if (argc == 1) { + sep = ","; + sep_len = 1; + } else if (mem_is_null(argv[1])) { + sep = ""; + sep_len = 0; + } else { + assert(mem_is_same_type(argv[0], argv[1])); + sep = argv[1]->z; + sep_len = argv[1]->n; + } + 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; +} + +/** 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) { @@ -1769,73 +1811,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) { @@ -2002,13 +1977,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