From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 0B44A2847F for ; Fri, 22 Feb 2019 08:51:51 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WxZSx6Kr_JDz for ; Fri, 22 Feb 2019 08:51:50 -0500 (EST) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id BA79B2847A for ; Fri, 22 Feb 2019 08:51:50 -0500 (EST) Subject: [tarantool-patches] Re: [PATCH 2/2] sql: compute resulting collation for concatenation References: <652a9e6a4514a03ef93133961b09c2f5d45721d8.1547644180.git.korablev@tarantool.org> <0c99e4e0-972a-2013-45b1-5c60747ee2ef@tarantool.org> <5AD6A399-D158-44CF-9180-F57185F2C376@tarantool.org> <57ca444c-96d3-bd85-9137-26d408200d1b@tarantool.org> From: Vladislav Shpilevoy Message-ID: Date: Fri, 22 Feb 2019 16:51:47 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: "n.pettik" , tarantool-patches@freelists.org, Kirill Yukhin On 22/02/2019 16:40, n.pettik wrote: > >>>>> + bool is_rhs_forced; >>>>> + uint32_t rhs_coll_id; >>>>> + if (sql_expr_coll(parse, p->pRight, &is_rhs_forced, >>>>> + &rhs_coll_id) != 0) >>>>> + return -1; >>>>> + if (is_lhs_forced && is_rhs_forced) { >>>>> + if (lhs_coll_id != rhs_coll_id) >>>>> + return -1; >>>> >>>> 5. Did you miss diag_set? >>> No, I did it on purpose. Firstly, this function is recursive, >>> so in case error occurred on bottom levels of recursion, >>> diag would be reseted on each level above (and parser’s >>> counter of errors would be incremented several times as >>> well). No terrible consequences would take place in this case, >>> but it looks like a bad pattern. Anyway, fixed it according to >>> your suggestion. >> >> Each ClientError is accounted in a global errors counter. It >> means, that the same error should be set multiple times, otherwise >> the statistics would be wrong. Instead of resetting diag each time >> check if parser->nErr > 0, and if it is, then do nothing. >> diag_is_empty() can not be used, because it happens sometimes, that >> there are no errors, but diag is not cleared from a previous error. > > Hmm, Mergen is trying to remove nErr, if I’m not mistaken. > So, soon I guess we will be able to use diag_is_empty(). > Now I’ve implemented your suggestion. Diff: Yes, after Mergen did, we can remove nErr from there. Now your patch does not increase nErr usage, so it is ok. The whole patchset LGTM.