diff options
| author | Tom Lane | 2017-04-10 17:51:29 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-04-10 17:51:53 +0000 |
| commit | 8f0530f58061b185dc385df42e62d78a18d4ae3e (patch) | |
| tree | 63d038ae4012dcdcff3b556dde4c654959f8448e /src/backend/rewrite/rewriteDefine.c | |
| parent | 56dd8e85c40fef3e3c2c10afa186ee30416ec507 (diff) | |
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
Diffstat (limited to 'src/backend/rewrite/rewriteDefine.c')
| -rw-r--r-- | src/backend/rewrite/rewriteDefine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 396c36f1814..86d588bba53 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; |