From 8f0530f58061b185dc385df42e62d78a18d4ae3e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 10 Apr 2017 13:51:29 -0400 Subject: Improve castNode notation by introducing list-extraction-specific variants. This extends the castNode() notation introduced by commit 5bcab1114 to provide, in one step, extraction of a list cell's pointer and coercion to a concrete node type. For example, "lfirst_node(Foo, lc)" is the same as "castNode(Foo, lfirst(lc))". Almost half of the uses of castNode that have appeared so far include a list extraction call, so this is pretty widely useful, and it saves a few more keystrokes compared to the old way. As with the previous patch, back-patch the addition of these macros to pg_list.h, so that the notation will be available when back-patching. Patch by me, after an idea of Andrew Gierth's. Discussion: https://postgr.es/m/14197.1491841216@sss.pgh.pa.us --- src/backend/commands/explain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/backend/commands/explain.c') diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index e549f9d360a..9359d0a83ad 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -253,7 +253,7 @@ ExplainQuery(ParseState *pstate, ExplainStmt *stmt, const char *queryString, /* Explain every plan */ foreach(l, rewritten) { - ExplainOneQuery(castNode(Query, lfirst(l)), + ExplainOneQuery(lfirst_node(Query, l), CURSOR_OPT_PARALLEL_OK, NULL, es, queryString, params, queryEnv); @@ -408,7 +408,7 @@ ExplainOneUtility(Node *utilityStmt, IntoClause *into, ExplainState *es, rewritten = QueryRewrite(castNode(Query, copyObject(ctas->query))); Assert(list_length(rewritten) == 1); - ExplainOneQuery(castNode(Query, linitial(rewritten)), + ExplainOneQuery(linitial_node(Query, rewritten), 0, ctas->into, es, queryString, params, queryEnv); } @@ -427,7 +427,7 @@ ExplainOneUtility(Node *utilityStmt, IntoClause *into, ExplainState *es, rewritten = QueryRewrite(castNode(Query, copyObject(dcs->query))); Assert(list_length(rewritten) == 1); - ExplainOneQuery(castNode(Query, linitial(rewritten)), + ExplainOneQuery(linitial_node(Query, rewritten), dcs->options, NULL, es, queryString, params, queryEnv); } -- cgit v1.2.3