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/tcop/postgres.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/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 41801f14391..75c2d9a61d0 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -850,7 +850,7 @@ pg_plan_queries(List *querytrees, int cursorOptions, ParamListInfo boundParams) foreach(query_list, querytrees) { - Query *query = castNode(Query, lfirst(query_list)); + Query *query = lfirst_node(Query, query_list); PlannedStmt *stmt; if (query->commandType == CMD_UTILITY) @@ -966,7 +966,7 @@ exec_simple_query(const char *query_string) */ foreach(parsetree_item, parsetree_list) { - RawStmt *parsetree = castNode(RawStmt, lfirst(parsetree_item)); + RawStmt *parsetree = lfirst_node(RawStmt, parsetree_item); bool snapshot_set = false; const char *commandTag; char completionTag[COMPLETION_TAG_BUFSIZE]; @@ -1291,7 +1291,7 @@ exec_parse_message(const char *query_string, /* string to execute */ bool snapshot_set = false; int i; - raw_parse_tree = castNode(RawStmt, linitial(parsetree_list)); + raw_parse_tree = linitial_node(RawStmt, parsetree_list); /* * Get the command name for possible use in status display. @@ -2154,7 +2154,7 @@ errdetail_execute(List *raw_parsetree_list) foreach(parsetree_item, raw_parsetree_list) { - RawStmt *parsetree = castNode(RawStmt, lfirst(parsetree_item)); + RawStmt *parsetree = lfirst_node(RawStmt, parsetree_item); if (IsA(parsetree->stmt, ExecuteStmt)) { @@ -2508,7 +2508,7 @@ IsTransactionExitStmtList(List *pstmts) { if (list_length(pstmts) == 1) { - PlannedStmt *pstmt = castNode(PlannedStmt, linitial(pstmts)); + PlannedStmt *pstmt = linitial_node(PlannedStmt, pstmts); if (pstmt->commandType == CMD_UTILITY && IsTransactionExitStmt(pstmt->utilityStmt)) @@ -2523,7 +2523,7 @@ IsTransactionStmtList(List *pstmts) { if (list_length(pstmts) == 1) { - PlannedStmt *pstmt = castNode(PlannedStmt, linitial(pstmts)); + PlannedStmt *pstmt = linitial_node(PlannedStmt, pstmts); if (pstmt->commandType == CMD_UTILITY && IsA(pstmt->utilityStmt, TransactionStmt)) |