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 5D9006D3F5; Mon, 25 Oct 2021 11:33:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5D9006D3F5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1635150830; bh=oQxo3owZJux82VWFjmR3GowBTyXoXIojHHx1tMcuZME=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=xwICFh4QDsYec9Y23gIEQyySTVJiX7dYgh/beEvw/MyxrDup/DWqvuipxNu0Vfhi4 sQuB+hOh/INEuiU8cWNIXuoEupb3czjVJNlu/7+4Tp2NCRPPzwkGHAOcV3j++XqMc6 Hem4mbTzJRxa4RUe6ZB8yRjua6LIIuv9jqLWU5dY= 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 5DBC86D3F5 for ; Mon, 25 Oct 2021 11:33:49 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5DBC86D3F5 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mevQS-0007SY-O5; Mon, 25 Oct 2021 11:33:49 +0300 Date: Mon, 25 Oct 2021 11:33:47 +0300 To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Message-ID: <20211025083347.GE36295@tarantool.org> References: <170d02abda41079806062247363d898d73202b44.1633713432.git.imeevma@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9C7814344C8C501C8A875D1C8D969D20CAE380EF370D08BF9182A05F53808504094A75EDC36FE056D4E526B3D49DDD5D527F4D5CBE0921176D3BE621C6EE5969F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72424932217190DC2EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637279A5203CF71F5518638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F40B75E16C024C876BBB216479CD9171117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B50586D2C678351386E0473B800094D35BEA X-C1DE0DAB: 0D63561A33F958A5428A2AFFA5F1399201471B12FF4D0461ED04ED91DBE416B9D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75FA7FF33AA1A4D21C410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3463DBE2ADA183F62F74061A0162DCB1C4E05AE47B81C77FD7CF3CA66AE557321ADD305439EB2F21A91D7E09C32AA3244C9F5ABADEA003554781824091ABDBD0FE05AB220A9D022EBC729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojPL6H901iH3Gn70WDKutz1g== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D0F67F7D35E1E1B92252AA64A3B1BEB6483D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [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: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thank you for the review! My answer, diff and new patch below. I also simplified the code a bit. On Fri, Oct 15, 2021 at 12:44:08AM +0200, Vladislav Shpilevoy wrote: > Thanks for the patch! > > > 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) > > It leaks now, because sqlStrAccumFinish is not destroyed. Previously it > was 'moved' into the mem via SQL_DYNAMIC. But now you copy it and the > original is not freed. Thanks, fixed. Diff: diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 48d248568..de2bbb20e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -861,23 +861,14 @@ func_printf(struct sql_context *ctx, int argc, struct Mem *argv) 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]; + pargs.apArg = argv + 1; + struct sql *db = sql_get(); 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; + mem_set_str_allocated(ctx->pOut, sqlStrAccumFinish(&acc), acc.nChar); } static const unsigned char * diff --git a/src/box/sql/printf.c b/src/box/sql/printf.c index b4ab0d0f9..5b61646e3 100644 --- a/src/box/sql/printf.c +++ b/src/box/sql/printf.c @@ -144,7 +144,7 @@ getIntArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0; - return mem_get_int_unsafe(p->apArg[p->nUsed++]); + return mem_get_int_unsafe(&p->apArg[p->nUsed++]); } static double @@ -152,7 +152,7 @@ getDoubleArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0.0; - return mem_get_double_unsafe(p->apArg[p->nUsed++]); + return mem_get_double_unsafe(&p->apArg[p->nUsed++]); } static char * @@ -160,7 +160,7 @@ getTextArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0; - struct Mem *mem = p->apArg[p->nUsed++]; + struct Mem *mem = &p->apArg[p->nUsed++]; return (char *)mem_as_str0(mem); } diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index cfdf71f1f..9361775b1 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -2511,7 +2511,8 @@ int sqlIsNaN(double); struct PrintfArguments { int nArg; /* Total number of arguments */ int nUsed; /* Number of arguments used so far */ - sql_value **apArg; /* The argument values */ + /** The argument values. */ + struct Mem *apArg; }; void sqlVXPrintf(StrAccum *, const char *, va_list); New patch: commit 8d7ab164e7c69faf1a6f74b75deb769da0a0ee27 Author: Mergen Imeev Date: Tue Oct 5 18:25:55 2021 +0300 sql: refactor PRINTF() function Part of #4145 diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 8eb3400bf..de2bbb20e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -846,6 +846,31 @@ 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; + pargs.nArg = argc - 1; + pargs.nUsed = 0; + pargs.apArg = argv + 1; + struct sql *db = sql_get(); + sqlStrAccumInit(&acc, db, 0, 0, db->aLimit[SQL_LIMIT_LENGTH]); + acc.printfFlags = SQL_PRINTF_SQLFUNC; + sqlXPrintf(&acc, format, &pargs); + mem_set_str_allocated(ctx->pOut, sqlStrAccumFinish(&acc), acc.nChar); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -940,40 +965,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 +1907,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, diff --git a/src/box/sql/printf.c b/src/box/sql/printf.c index b4ab0d0f9..5b61646e3 100644 --- a/src/box/sql/printf.c +++ b/src/box/sql/printf.c @@ -144,7 +144,7 @@ getIntArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0; - return mem_get_int_unsafe(p->apArg[p->nUsed++]); + return mem_get_int_unsafe(&p->apArg[p->nUsed++]); } static double @@ -152,7 +152,7 @@ getDoubleArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0.0; - return mem_get_double_unsafe(p->apArg[p->nUsed++]); + return mem_get_double_unsafe(&p->apArg[p->nUsed++]); } static char * @@ -160,7 +160,7 @@ getTextArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0; - struct Mem *mem = p->apArg[p->nUsed++]; + struct Mem *mem = &p->apArg[p->nUsed++]; return (char *)mem_as_str0(mem); } diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index cfdf71f1f..9361775b1 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -2511,7 +2511,8 @@ int sqlIsNaN(double); struct PrintfArguments { int nArg; /* Total number of arguments */ int nUsed; /* Number of arguments used so far */ - sql_value **apArg; /* The argument values */ + /** The argument values. */ + struct Mem *apArg; }; void sqlVXPrintf(StrAccum *, const char *, va_list);