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 ABAED6E45E; Fri, 8 Oct 2021 20:34:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org ABAED6E45E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633714450; bh=8l/4kPQDr+NkEwVslyTDiiCl0Hdgy3KgpsdTEqV32y8=; 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=nYAjYy9d0VJHXxmYuEgxsQn6sUtkULFGtJoradjPTQT3ClrT0ggVDIk/jmQYJ+K+/ o6dz8KhS9Y89xO0DYT82hoj9eZuh7gnp8jkRz4lhHYFBlsTKZiFqojn82a6UlnKrC+ BXPbGMfzNfbJf93Og9xk81JLZGilPOPCmYzRITTc= 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 96F296E464 for ; Fri, 8 Oct 2021 20:31:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 96F296E464 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mYtig-00081U-0y; Fri, 08 Oct 2021 20:31:42 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 8 Oct 2021 20:31:41 +0300 Message-Id: <170d02abda41079806062247363d898d73202b44.1633713432.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: 4F1203BC0FB41BD9A6D4E3B1981C4C7DC9765195527EE77661ADD44F6E79FA5A182A05F5380850407F918D7D7C9F52AED6FCFDFB1D155DBAB4B3114B3C08F25AC0CD24E97C023A84 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C6068CE86C2B75F5EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637DD7A7F9003AF293F8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8C24856721E9B2AF7CFB9C23594EEE007117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C650BD2383FF25EF5C75C9EC123E38A6C70FDA5D35FFD8A599C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3438BC6CF312DA7315CE4ED07C7B33C0B4720E172ED259E1AE9A2C2973FF219F6BD49B2A7B23998A171D7E09C32AA3244C8424549A6CF6759B9C30F19B1F68412DD08D48398F32B4A6729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMZ06aokA6bpT58vKrnHvLA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DCB4BB54E3A1716EA26BD4499C31254A683D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 05/21] sql: refactor PRINTF() 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 | 71 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 863dbf1c4..f5040fb6e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -846,6 +846,40 @@ func_octet_length(struct sql_context *ctx, int argc, struct Mem *argv) mem_set_uint(ctx->pOut, arg->n); } +/** Implementation of the PRINTF() function. */ +static void +func_printf(struct sql_context *ctx, int argc, struct Mem *argv) +{ + if (argc < 1 || mem_is_null(&argv[0])) + return; + if (argc == 1 || !mem_is_str(&argv[0])) { + struct Mem *mem = ctx->pOut; + if (mem_copy(mem, &argv[0]) != 0 || mem_to_str(mem) != 0) + ctx->is_aborted = true; + return; + } + struct PrintfArguments pargs; + struct StrAccum acc; + char *format = argv[0].z; + struct sql *db = sql_get(); + + pargs.nArg = argc - 1; + pargs.nUsed = 0; + pargs.apArg = sqlDbMallocRawNN(db, (argc - 1) * sizeof(*pargs.apArg)); + if (pargs.apArg == NULL) { + ctx->is_aborted = true; + return; + } + for (int i = 1; i < argc; ++i) + pargs.apArg[i - 1] = &argv[i]; + sqlStrAccumInit(&acc, db, 0, 0, db->aLimit[SQL_LIMIT_LENGTH]); + acc.printfFlags = SQL_PRINTF_SQLFUNC; + sqlXPrintf(&acc, format, &pargs); + sqlDbFree(db, pargs.apArg); + if (mem_copy_str(ctx->pOut, sqlStrAccumFinish(&acc), acc.nChar) != 0) + ctx->is_aborted = true; +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -940,40 +974,6 @@ typeofFunc(struct sql_context *context, int argc, struct Mem *argv) sql_result_text(context, z, -1, SQL_STATIC); } -/* - * Implementation of the printf() function. - */ -static void -printfFunc(struct sql_context *context, int argc, struct Mem *argv) -{ - PrintfArguments x; - StrAccum str; - const char *zFormat; - int n; - sql *db = sql_context_db_handle(context); - - if (argc >= 1 && (zFormat = mem_as_str0(&argv[0])) != NULL) { - x.nArg = argc - 1; - x.nUsed = 0; - x.apArg = sqlDbMallocRawNN(sql_get(), - (argc - 1) * sizeof(*x.apArg)); - if (x.apArg == NULL) { - context->is_aborted = true; - return; - } - for (int i = 1; i < argc; ++i) - x.apArg[i - 1] = &argv[i]; - sqlStrAccumInit(&str, db, 0, 0, - db->aLimit[SQL_LIMIT_LENGTH]); - str.printfFlags = SQL_PRINTF_SQLFUNC; - sqlXPrintf(&str, zFormat, &x); - sqlDbFree(sql_get(), x.apArg); - n = str.nChar; - sql_result_text(context, sqlStrAccumFinish(&str), n, - SQL_DYNAMIC); - } -} - /* * Implementation of the round() function */ @@ -1916,8 +1916,7 @@ static struct sql_func_definition definitions[] = { FIELD_TYPE_INTEGER, func_position_characters, NULL}, {"POSITION", 2, {FIELD_TYPE_VARBINARY, FIELD_TYPE_VARBINARY}, FIELD_TYPE_INTEGER, func_position_octets, NULL}, - {"PRINTF", -1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, printfFunc, - NULL}, + {"PRINTF", -1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, func_printf, NULL}, {"QUOTE", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, quoteFunc, NULL}, {"RANDOM", 0, {}, FIELD_TYPE_INTEGER, randomFunc, NULL}, {"RANDOMBLOB", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_VARBINARY, -- 2.25.1