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 3D6A46EC41; Tue, 21 Sep 2021 14:05:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3D6A46EC41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1632222305; bh=rrpWSCdPvqK+3neUr0KBmhTPJ0hx+WpXfPttyF920nE=; 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=VAWrvj58znWBZRwtKu11LYoX8Lo17FlWuljfLJknMQkBd/7TJURSC55cX3z12TTQr LnQHBsDqaWgSLDVKWkxkpzk7ioXhm9CJhgnSj3Mt3oDxQdLUT6PDE95tHvuSpwgvwC WC1kd6M4A06raWHrBPCWCxAfCFlaSWSygYh/+11s= Received: from smtpng2.i.mail.ru (smtpng2.i.mail.ru [94.100.179.3]) (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 4BB926EC41 for ; Tue, 21 Sep 2021 13:59:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4BB926EC41 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1mSdUn-0002Vt-Jm; Tue, 21 Sep 2021 13:59:30 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 21 Sep 2021 13:59:29 +0300 Message-Id: <265692b0b90cd9ce0a5362b55e81f7a2d598ad19.1632220375.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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD91AE02D33A9C88A2F7631404A3C5D35349DE4D58F47F062C400894C459B0CD1B9F5E02570191D55955294AA5FF96FD0B1994D8960CDEEF0A8A4B6E33E76DF1710 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE797F4D2EDC29AFAF7EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E78B284398E2029E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F605163A258560FBF9787EBCCE0A0C3F117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CB382FA991BF7A44CD1BAD0901FC55F271B44D1B1ACB0E86F9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742F36E2E0160E5C5538A5251AA20633D2658C12E6D310A6D53F77088377309FF52DC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3454E98140CCACB5B36083947EDEB5132ABE26A62E924976D4CE44B260C4DB872AC2AEB388D00647C01D7E09C32AA3244C5154D93A1BD858482B321EB6632A09733E8609A02908F271729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnvI84oHUDXCPUB400eYdHA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DDA982669B501EB5205F7C66B5E983AC383D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 12/15] sql: rework GROUP_CONCAT() 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" 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 f699aa927..001a8641c 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -213,6 +213,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) { @@ -1757,73 +1803,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) { @@ -1991,13 +1970,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