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 AC44A6EC40; Thu, 8 Jul 2021 01:09:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AC44A6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1625695756; bh=MJnAGIXi2QMBlJr0H/C9JPX1Q4svhw1vhRir4lbC9rA=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=pzWmztqt9QJw6ujWvu3fLkfyBUzrkDaW15krgIIxzMjNOv71d/WTmlSG1oy8hzF6H o84DCwGM3VQzH/fH3EP9in5QMHtsAXsdGfhBJYvPnCMYI6DSl/MiUreK7CKc9+AaZx ThZW7VAWeGWM4sR0I7+kgjb+lPqoiJ4tdAH3LIOw= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [94.100.177.149]) (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 8158B6EC40 for ; Thu, 8 Jul 2021 01:09:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8158B6EC40 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1m1FjF-0002hk-Sv; Thu, 08 Jul 2021 01:09:14 +0300 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: Message-ID: <23623e4a-eb22-03b0-7e5b-841f30e725a4@tarantool.org> Date: Thu, 8 Jul 2021 00:09:12 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FB2F1AA0EB8A504C8721532AB396CDCF09182A05F538085040E5BBB5F479EAAF30C6612C48CB15B06641FFDD81B642AE930B8A62745B49DDA1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7B9D6DADD6B53929DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B05885A782BE20C5EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F219B1296DAF3585E767414FEB805E5734CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F6B57BC7E64490618DEB871D839B7333395957E7521B51C2DFABB839C843B9C08941B15DA834481F8AA50765F7900637F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8BAEB924C2B054B06E75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A5F3F7230C3B4E04F5AD7164D6C11615F8E733B0CE6368275DD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA753753CEE10E4ED4A7410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3488E5CD2E691F5566E3CD7D5B958767EA2AB637484BA99E2F6097F07B9FED232D393820201CC1BE341D7E09C32AA3244C2678AF220632EECCEA258118EC5C444360759606DA2E136A729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojwWhFrYo6Pn2ak2EsY3u8LA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DFDF8624BAABFDE0C8C7175A2F96780443841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 1/4] sql: truncate values in type mismatch error 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the patch! See 2 comments below. > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 6f3bf52e5..630f1a135 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -71,26 +72,35 @@ mem_is_field_compatible(const struct Mem *mem, enum field_type type) > const char * > mem_str(const struct Mem *mem) > { > - char buf[BUF_SIZE]; > + char buf[STR_VALUE_MAX_LEN + 1]; > switch (mem->type) { > case MEM_TYPE_NULL: > return "NULL"; > case MEM_TYPE_STR: > - if ((mem->flags & MEM_Term) != 0) > - return mem->z; > + if (mem->n > STR_VALUE_MAX_LEN) { > + memcpy(buf, mem->z, STR_VALUE_MAX_LEN); > + buf[STR_VALUE_MAX_LEN] = '\0'; > + return tt_sprintf("%s...", buf); 1. Can be done simpler using %.*s in tt_sprintf() with the length limited by STR_VALUE_MAX_LEN. > + } > return tt_cstr(mem->z, mem->n); > case MEM_TYPE_INT: > return tt_sprintf("%lld", mem->u.i); > case MEM_TYPE_UINT: > return tt_sprintf("%llu", mem->u.u); > case MEM_TYPE_DOUBLE: > - sql_snprintf(BUF_SIZE, &buf[0], "%!.15g", mem->u.r); > + sql_snprintf(STR_VALUE_MAX_LEN + 1, buf, "%!.15g", mem->u.r); > return tt_sprintf("%s", buf); > case MEM_TYPE_BIN: > return "varbinary"; > case MEM_TYPE_MAP: > - case MEM_TYPE_ARRAY: > - return mp_str(mem->z); > + case MEM_TYPE_ARRAY: { > + const char *str = mp_str(mem->z); > + if (strlen(str) <= STR_VALUE_MAX_LEN) > + return str; > + memcpy(buf, str, STR_VALUE_MAX_LEN); > + buf[STR_VALUE_MAX_LEN] = '\0'; > + return tt_sprintf("%s...", buf); 2. Ditto.