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 5078D6EC55; Mon, 12 Jul 2021 11:56:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5078D6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626080171; bh=PfWzwhap5iFzPnSoAhEppqt/VZfwG0XJqL7Og9Mj0bg=; 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=PnPdlmu9PHUTks9fokaW88v+hHYK2B0SPiXBPoYPsjzYoGW7BnlDgU1Zn8YriBk4U 6nYTd6TRrHRWqbqr0+XAGRhSP/rbDDXjL7rsGGYqxNUtigvpnH3kNt4uVDtORdSB01 PbyONrqxTrtnAwJDX/ANh6hGlNCmBrdaVoZQ1Ffw= 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 F01716EC55 for ; Mon, 12 Jul 2021 11:56:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F01716EC55 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1m2rjV-00083P-8A; Mon, 12 Jul 2021 11:56:09 +0300 Date: Mon, 12 Jul 2021 11:56:08 +0300 To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210712085608.GB127980@tarantool.org> References: <73484ddc21ae698409d326804b105e748e3bbe12.1625498636.git.imeevma@gmail.com> <281c365c-afe9-0c36-526b-f9edb27452d2@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <281c365c-afe9-0c36-526b-f9edb27452d2@tarantool.org> X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FBBD367E85DD81335AB0D1C33BC341B12B182A05F538085040C082B7F13A684F5846C7B7C700AF69DD65F2BC2B860CFFFC59622F790712FE0A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F65C230EDDCD559EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373D58C44ED3182E498638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D817A8A0B77ECA6B1DACAC6977FAE98308117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A584A98EC56E57C83447F7F422561D80A8F02ADF3BE611B98ED59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA753753CEE10E4ED4A7410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3467D08F30473A5842A0793229DB60B463B38AE96B1695AB790CBBD4E927F3EC460EFDAC8ACBDBD8791D7E09C32AA3244C0270F23E4B0A566AE69016EE1A06E149A90944CA99CF22E3729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj/3sbGI30XhclsKsjO8Mrbw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DC58B3A884E1C079ED9A81700C378F72683D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 2/4] sql: properly show 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: Mergen Imeev via Tarantool-patches Reply-To: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thank you for the review! My answer below. On Thu, Jul 08, 2021 at 12:09:57AM +0200, Vladislav Shpilevoy wrote: > Thanks for the patch! > > > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > > index 630f1a135..728d3c9a7 100644 > > --- a/src/box/sql/mem.c > > +++ b/src/box/sql/mem.c > > @@ -80,9 +80,11 @@ mem_str(const struct Mem *mem) > > 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); > > + return tt_sprintf("'%s...", buf); > > Why didn't you put a second ' after ...? The error message > does not end here. There are more words after this string usually. > The same below. > I belive that "'" is actually part of value. This way we will get inconsistent value in case only part of it was printed. This is similar for what we do with array - in case it is too long we will not close it using "]". Same for varbinary. > > @@ -102,7 +115,8 @@ mem_str(const struct Mem *mem) > > return tt_sprintf("%s...", buf); > > } > > case MEM_TYPE_UUID: > > - return tt_uuid_str(&mem->u.uuid); > > + tt_uuid_to_string(&mem->u.uuid, buf); > > + return tt_sprintf("'%s'", buf); > > case MEM_TYPE_BOOL: > > return mem->u.b ? "TRUE" : "FALSE"; > > default: