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 83990290DE for ; Tue, 26 Mar 2019 15:21:37 -0400 (EDT) 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 y1BHh6e9rV5N for ; Tue, 26 Mar 2019 15:21:37 -0400 (EDT) Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 3F0DC25A2F for ; Tue, 26 Mar 2019 15:21:37 -0400 (EDT) Date: Tue, 26 Mar 2019 22:21:34 +0300 From: Mergen Imeev Subject: [tarantool-patches] Re: [PATCH v4 8/8] sql: remove sqlErrorMsg() Message-ID: <20190326192134.GB30904@tarantool.org> References: <99f4adc61352899a83a7097b965845bafaa968ef.1552494059.git.imeevma@gmail.com> <0D9B8996-D469-498B-8D6C-AFD90C6DD35E@tarantool.org> <20190325184737.GA18346@tarantool.org> <2E9AC693-B13A-4FFD-8F0D-A3FA7AA442A3@tarantool.org> <20190326175219.GA30438@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: 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" Cc: tarantool-patches@freelists.org On Tue, Mar 26, 2019 at 09:28:21PM +0300, n.pettik wrote: > > > diff --git a/src/box/sql/select.c b/src/box/sql/select.c > > index e217c19..778de2c 100644 > > --- a/src/box/sql/select.c > > +++ b/src/box/sql/select.c > > @@ -1466,25 +1466,25 @@ sql_expr_list_to_key_info(struct Parse *parse, struct ExprList *list, int start) > > /* > > * Name of the connection operator, used for error messages. > > */ > > -static const char * > > -selectOpName(int id) > > +const char * > > +select_op_name(int op_id) > > Add sql_ prefix. > Fixed. > > { > > - char *z; > > - switch (id) { > > + const char *op_name; > > IMHO don’t see much sense in this renaming: function is small and straight > enough to use old brief names. > Reverted these changes back. Diff: diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c index a12e7ad..dd51151 100644 --- a/src/box/sql/resolve.c +++ b/src/box/sql/resolve.c @@ -1460,7 +1460,8 @@ resolveSelectStep(Walker * pWalker, Select * p) "SELECTs to the left and right of %s "\ "do not have the same number of "\ "result columns"; - const char *op = select_op_name(p->pNext->op); + const char *op = + sql_select_op_name(p->pNext->op); diag_set(ClientError, ER_SQL_PARSER_GENERIC, tt_sprintf(err, op)); } diff --git a/src/box/sql/select.c b/src/box/sql/select.c index 778de2c..2ab4761 100644 --- a/src/box/sql/select.c +++ b/src/box/sql/select.c @@ -1463,28 +1463,25 @@ sql_expr_list_to_key_info(struct Parse *parse, struct ExprList *list, int start) return key_info; } -/* - * Name of the connection operator, used for error messages. - */ const char * -select_op_name(int op_id) +sql_select_op_name(int id) { - const char *op_name; - switch (op_id) { + char *z; + switch (id) { case TK_ALL: - op_name = "UNION ALL"; + z = "UNION ALL"; break; case TK_INTERSECT: - op_name = "INTERSECT"; + z = "INTERSECT"; break; case TK_EXCEPT: - op_name = "EXCEPT"; + z = "EXCEPT"; break; default: - op_name = "UNION"; + z = "UNION"; break; } - return op_name; + return z; } /* @@ -1542,7 +1539,7 @@ explainComposite(Parse * pParse, /* Parse context */ "COMPOUND SUBQUERIES %d AND %d %s(%s)", iSub1, iSub2, bUseTmp ? "USING TEMP B-TREE " : "", - select_op_name(op) + sql_select_op_name(op) ); sqlVdbeAddOp4(v, OP_Explain, pParse->iSelectId, 0, 0, zMsg, P4_DYNAMIC); @@ -2614,7 +2611,7 @@ multiSelect(Parse * pParse, /* Parsing context */ if (pPrior->pOrderBy) { const char *err_msg = tt_sprintf("ORDER BY clause should come after %s not "\ - "before", select_op_name(p->op)); + "before", sql_select_op_name(p->op)); diag_set(ClientError, ER_SQL_PARSER_GENERIC, err_msg); pParse->is_aborted = true; rc = 1; @@ -2623,7 +2620,7 @@ multiSelect(Parse * pParse, /* Parsing context */ if (pPrior->pLimit) { const char *err_msg = tt_sprintf("LIMIT clause should come after %s not "\ - "before", select_op_name(p->op)); + "before", sql_select_op_name(p->op)); diag_set(ClientError, ER_SQL_PARSER_GENERIC, err_msg); pParse->is_aborted = true; rc = 1; diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 50fc812..b32c3d3 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -4429,11 +4429,11 @@ void sqlSelectPrep(Parse *, Select *, NameContext *); /** * Returns name of the connection operator. * - * @param op_id ID of the connection operator. + * @param id ID of the connection operator. * @retval Name of the connection operator. */ const char * -select_op_name(int op_id); +sql_select_op_name(int id); int sqlMatchSpanName(const char *, const char *, const char *); int sqlResolveExprNames(NameContext *, Expr *);