diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-04-10 13:51:29 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-04-10 13:51:53 -0400 |
commit | 8f0530f58061b185dc385df42e62d78a18d4ae3e (patch) | |
tree | 63d038ae4012dcdcff3b556dde4c654959f8448e /src/backend/executor/functions.c | |
parent | 56dd8e85c40fef3e3c2c10afa186ee30416ec507 (diff) | |
download | postgresql-8f0530f58061b185dc385df42e62d78a18d4ae3e.tar.gz postgresql-8f0530f58061b185dc385df42e62d78a18d4ae3e.zip |
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/executor/functions.c')
-rw-r--r-- | src/backend/executor/functions.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 3cadf953040..a35ba32e6dd 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -479,14 +479,14 @@ init_execution_state(List *queryTree_list, foreach(lc1, queryTree_list) { - List *qtlist = castNode(List, lfirst(lc1)); + List *qtlist = lfirst_node(List, lc1); execution_state *firstes = NULL; execution_state *preves = NULL; ListCell *lc2; foreach(lc2, qtlist) { - Query *queryTree = castNode(Query, lfirst(lc2)); + Query *queryTree = lfirst_node(Query, lc2); PlannedStmt *stmt; execution_state *newes; @@ -707,7 +707,7 @@ init_sql_fcache(FmgrInfo *finfo, Oid collation, bool lazyEvalOK) flat_query_list = NIL; foreach(lc, raw_parsetree_list) { - RawStmt *parsetree = castNode(RawStmt, lfirst(lc)); + RawStmt *parsetree = lfirst_node(RawStmt, lc); List *queryTree_sublist; queryTree_sublist = pg_analyze_and_rewrite_params(parsetree, @@ -1555,7 +1555,7 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList, parse = NULL; foreach(lc, queryTreeList) { - Query *q = castNode(Query, lfirst(lc)); + Query *q = lfirst_node(Query, lc); if (q->canSetTag) parse = q; |