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 6F28B6ECE3; Mon, 22 Nov 2021 11:23:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6F28B6ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1637569423; bh=tH8DsKSLoBxNklPnY/WcosudLSi99KDlKu93gjlHrOI=; 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=iHpHwQi4Ssu+5r7s0lTemgDOV+0Ll/+ccplCNgKFnGyzyrqmRjzg4EZGHLJcQGBMt KpWxF8ZCX3lTmRd0PE5BgLeoaJ7YaDN9iGSZy+5rzCsKEzFhbMqIXq+7KLsaLNTqcR Q1U2MWSDEAMUmO/ks1Wb4Quk/5SAJTxGfXxdJXk4= 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 44AC06EC40 for ; Mon, 22 Nov 2021 11:22:44 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 44AC06EC40 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mp4b5-0000Jd-AD; Mon, 22 Nov 2021 11:22:43 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Mon, 22 Nov 2021 11:22:43 +0300 Message-Id: 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: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9731B3922EC063979F46AE45382ECCE5A15643A7EFE44EA7F00894C459B0CD1B98EB07CE521E3D8DEEA8E952660777496B5CF03A31D052D6B05836D1F9953231F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70D278D70F8433719EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063763305FB9D3ECC1898638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8523489C789D8BBADEC7E284C85CA4C95117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B613439FA09F3DCB32089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B5055D598F243B9C4A36B4158963C5F0867F X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CC559E5F89E84DC559E9CE23C14C3A51FF13C25A62A4EB5459C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF505D71D783575ABE699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34E20F2278F74481A123FD198A689DBE9F7A0C2345836FD16E30391BD1F9B3625398F2545A8B8F3D191D7E09C32AA3244CF80D535019EA0312DCC9977CB01B0E35725D5B54B2FE4575729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojp2KOOpFlmzcd0036K4v1qQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D415F70ADAD705C78A26F868424F3BBB183D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 2/2] sql: introduce mem_snprintf() 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 introduces the mem_snprintf() function, which writes the string representation of a MEM to buf. --- src/box/sql/func.c | 6 +- src/box/sql/mem.c | 98 +++++++++++++++++++++----------- src/box/sql/mem.h | 15 +++++ src/box/sql/printf.c | 15 +---- test/sql-tap/sql-errors.test.lua | 5 +- test/sql/types.result | 2 +- 6 files changed, 89 insertions(+), 52 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 5abaf490d..26ccebf83 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -869,9 +869,11 @@ func_printf(struct sql_context *ctx, int argc, const 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) + char *str = mem_strdup(&argv[0]); + if (str == NULL) ctx->is_aborted = true; + else + mem_set_str0_allocated(ctx->pOut, str); return; } struct PrintfArguments pargs; diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index f67742618..234a00d57 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -116,30 +116,76 @@ mem_is_field_compatible(const struct Mem *mem, enum field_type type) return field_mp_plain_type_is_compatible(type, mp_type, true); } -const char * -mem_str(const struct Mem *mem) +int +mem_snprintf(char *buf, uint32_t size, const struct Mem *mem) { - char buf[STR_VALUE_MAX_LEN]; - const char *type = mem_type_to_str(mem); + int res = -1; switch (mem->type) { case MEM_TYPE_NULL: - return "NULL"; + res = snprintf(buf, size, "NULL"); + break; case MEM_TYPE_STR: + case MEM_TYPE_BIN: + res = snprintf(buf, size, "%.*s", mem->n, mem->z); + break; + case MEM_TYPE_INT: + res = snprintf(buf, size, "%lld", mem->u.i); + break; + case MEM_TYPE_UINT: + res = snprintf(buf, size, "%llu", (unsigned long long)mem->u.u); + break; + case MEM_TYPE_DOUBLE: { + char str[BUF_SIZE]; + sql_snprintf(BUF_SIZE, str, "%!.15g", mem->u.r); + res = snprintf(buf, size, "%s", str); + break; + } + case MEM_TYPE_DEC: + res = snprintf(buf, size, "%s", decimal_str(&mem->u.d)); + break; + case MEM_TYPE_MAP: + case MEM_TYPE_ARRAY: + res = mp_snprint(buf, size, mem->z); + break; + case MEM_TYPE_UUID: + res = snprintf(buf, size, "%s", tt_uuid_str(&mem->u.uuid)); + break; + case MEM_TYPE_BOOL: + res = snprintf(buf, size, mem->u.b ? "TRUE" : "FALSE"); + break; + default: + unreachable(); + } + assert(res >= 0); + return res; +} + +char * +mem_strdup(const struct Mem *mem) +{ + int size = mem_snprintf(NULL, 0, mem); + assert(size >= 0); + char *str = sqlDbMallocRawNN(sql_get(), size + 1); + if (str == NULL) + return NULL; + mem_snprintf(str, size + 1, mem); + return str; +} + +const char * +mem_str(const struct Mem *mem) +{ + if (mem->type == MEM_TYPE_NULL) + return "NULL"; + const char *type = mem_type_to_str(mem); + if (mem->type == MEM_TYPE_STR) { if (mem->n <= STR_VALUE_MAX_LEN) return tt_sprintf("%s('%.*s')", type, mem->n, mem->z); return tt_sprintf("%s('%.*s...)", type, STR_VALUE_MAX_LEN, mem->z); - case MEM_TYPE_INT: - return tt_sprintf("%s(%lld)", type, mem->u.i); - case MEM_TYPE_UINT: - return tt_sprintf("%s(%llu)", type, mem->u.u); - case MEM_TYPE_DOUBLE: - sql_snprintf(STR_VALUE_MAX_LEN, buf, "%!.15g", mem->u.r); - return tt_sprintf("%s(%s)", type, buf); - case MEM_TYPE_DEC: - decimal_to_string(&mem->u.d, buf); - return tt_sprintf("%s(%s)", type, buf); - case MEM_TYPE_BIN: { + } + char buf[STR_VALUE_MAX_LEN]; + if (mem->type == MEM_TYPE_BIN) { int len = MIN(mem->n, STR_VALUE_MAX_LEN / 2); for (int i = 0; i < len; ++i) { int n = (mem->z[i] & 0xF0) >> 4; @@ -151,24 +197,10 @@ mem_str(const struct Mem *mem) return tt_sprintf("%s(x'%.*s...)", type, len * 2, buf); return tt_sprintf("%s(x'%.*s')", type, len * 2, buf); } - case MEM_TYPE_MAP: - case MEM_TYPE_ARRAY: { - const char *str = mp_str(mem->z); - uint32_t len = strlen(str); - uint32_t minlen = MIN(STR_VALUE_MAX_LEN, len); - memcpy(buf, str, minlen); - if (len <= STR_VALUE_MAX_LEN) - return tt_sprintf("%s(%.*s)", type, minlen, buf); - return tt_sprintf("%s(%.*s...)", type, minlen, buf); - } - case MEM_TYPE_UUID: - tt_uuid_to_string(&mem->u.uuid, buf); + int size = mem_snprintf(buf, STR_VALUE_MAX_LEN, mem); + if (size <= STR_VALUE_MAX_LEN) return tt_sprintf("%s(%s)", type, buf); - case MEM_TYPE_BOOL: - return tt_sprintf("%s(%s)", type, mem->u.b ? "TRUE" : "FALSE"); - default: - return "unknown"; - } + return tt_sprintf("%s(%.*s...)", type, STR_VALUE_MAX_LEN, buf); } static const char * diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 9d5245708..1a3478f9a 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -246,6 +246,21 @@ mem_is_any_null(const struct Mem *mem1, const struct Mem *mem2) bool mem_is_field_compatible(const struct Mem *mem, enum field_type type); +/** + * Write a NULL-terminated string representation of a MEM to buf. Returns the + * number of bytes required to write the value, excluding '\0'. If the return + * value is equal to or greater than size, then the value has been truncated. + */ +int +mem_snprintf(char *buf, uint32_t size, const struct Mem *mem); + +/** + * Returns a NULL-terminated string representation of a MEM. Memory for the + * result was allocated using sqlDbMallocRawNN() and should be freed. + */ +char * +mem_strdup(const struct Mem *mem); + /** * Return a string that contains description of type and value of MEM. String is * either allocated using static_alloc() of just a static variable. This diff --git a/src/box/sql/printf.c b/src/box/sql/printf.c index 8da7c9878..9caed7aa0 100644 --- a/src/box/sql/printf.c +++ b/src/box/sql/printf.c @@ -160,20 +160,7 @@ getTextArg(PrintfArguments * p) { if (p->nArg <= p->nUsed) return 0; - struct Mem mem; - mem_create(&mem); - mem_copy_as_ephemeral(&mem, &p->apArg[p->nUsed++]); - if (mem_to_str(&mem) != 0) { - mem_destroy(&mem); - return NULL; - } - char *str = sqlDbMallocRawNN(sql_get(), mem.n + 1); - if (str == NULL) - return NULL; - memcpy(str, mem.z, mem.n); - str[mem.n] = '\0'; - mem_destroy(&mem); - return str; + return mem_strdup(&p->apArg[p->nUsed++]); } /* diff --git a/test/sql-tap/sql-errors.test.lua b/test/sql-tap/sql-errors.test.lua index a9aa5acf7..6cecd7c6d 100755 --- a/test/sql-tap/sql-errors.test.lua +++ b/test/sql-tap/sql-errors.test.lua @@ -812,7 +812,8 @@ test:do_catchsql_test( "SELECT CAST(a AS UNSIGNED) from test;", { 1, 'Type mismatch: can not convert array(["aaaaaaaaaaaaaaaaaa'.. 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'.. - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...) to unsigned' + 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...) to '.. + 'unsigned' }) test:do_catchsql_test( @@ -820,7 +821,7 @@ test:do_catchsql_test( "SELECT CAST(m AS UNSIGNED) from test;", { 1, 'Type mismatch: can not convert map({"a": 1, "b": "aaaaaaa'.. 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'.. - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...) to unsigned' + 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...) to unsigned' }) test:execsql('DROP TABLE test;') diff --git a/test/sql/types.result b/test/sql/types.result index 947795b03..5a822fddf 100644 --- a/test/sql/types.result +++ b/test/sql/types.result @@ -1623,7 +1623,7 @@ box.execute('INSERT INTO t1(a) SELECT a FROM t2;') - null - 'Type mismatch: can not convert array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, ...) to scalar' + 34,...) to scalar' ... s:drop() --- -- 2.25.1