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/rewrite/rewriteDefine.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/rewrite/rewriteDefine.c') diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 396c36f181..86d588bba5 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -171,7 +171,7 @@ InsertRule(char *rulname, if (event_qual != NULL) { /* Find query containing OLD/NEW rtable entries */ - Query *qry = castNode(Query, linitial(action)); + Query *qry = linitial_node(Query, action); qry = getInsertSelectQuery(qry, NULL); recordDependencyOnExpr(&myself, event_qual, qry->rtable, @@ -284,7 +284,7 @@ DefineQueryRewrite(char *rulename, */ foreach(l, action) { - query = castNode(Query, lfirst(l)); + query = lfirst_node(Query, l); if (query->resultRelation == 0) continue; /* Don't be fooled by INSERT/SELECT */ @@ -326,7 +326,7 @@ DefineQueryRewrite(char *rulename, /* * ... the one action must be a SELECT, ... */ - query = castNode(Query, linitial(action)); + query = linitial_node(Query, action); if (!is_instead || query->commandType != CMD_SELECT) ereport(ERROR, @@ -480,7 +480,7 @@ DefineQueryRewrite(char *rulename, foreach(l, action) { - query = castNode(Query, lfirst(l)); + query = lfirst_node(Query, l); if (!query->returningList) continue; -- cgit v1.2.1