diff options
Diffstat (limited to 'src/backend/executor')
-rw-r--r-- | src/backend/executor/execExpr.c | 2 | ||||
-rw-r--r-- | src/backend/executor/execTuples.c | 2 | ||||
-rw-r--r-- | src/backend/executor/execUtils.c | 2 | ||||
-rw-r--r-- | src/backend/executor/functions.c | 8 | ||||
-rw-r--r-- | src/backend/executor/nodeAgg.c | 4 | ||||
-rw-r--r-- | src/backend/executor/nodeHashjoin.c | 2 | ||||
-rw-r--r-- | src/backend/executor/nodeLockRows.c | 2 | ||||
-rw-r--r-- | src/backend/executor/nodeModifyTable.c | 2 | ||||
-rw-r--r-- | src/backend/executor/nodeSubplan.c | 8 | ||||
-rw-r--r-- | src/backend/executor/spi.c | 18 |
10 files changed, 25 insertions, 25 deletions
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c index 97ec8fb033b..15d693fac4d 100644 --- a/src/backend/executor/execExpr.c +++ b/src/backend/executor/execExpr.c @@ -322,7 +322,7 @@ ExecBuildProjectionInfo(List *targetList, /* Now compile each tlist column */ foreach(lc, targetList) { - TargetEntry *tle = castNode(TargetEntry, lfirst(lc)); + TargetEntry *tle = lfirst_node(TargetEntry, lc); Var *variable = NULL; AttrNumber attnum = 0; bool isSafeVar = false; diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index f002ee2561f..c4a955332f7 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -160,7 +160,7 @@ ExecResetTupleTable(List *tupleTable, /* tuple table */ foreach(lc, tupleTable) { - TupleTableSlot *slot = castNode(TupleTableSlot, lfirst(lc)); + TupleTableSlot *slot = lfirst_node(TupleTableSlot, lc); /* Always release resources and reset the slot to empty */ ExecClearTuple(slot); diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index ce7b0642172..df3d6503d14 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -978,7 +978,7 @@ ExecCleanTargetListLength(List *targetlist) foreach(tl, targetlist) { - TargetEntry *curTle = castNode(TargetEntry, lfirst(tl)); + TargetEntry *curTle = lfirst_node(TargetEntry, tl); if (!curTle->resjunk) len++; 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; diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 0109aee1fd8..c2b861828d3 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -2866,7 +2866,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) if (phaseidx > 0) { - aggnode = castNode(Agg, list_nth(node->chain, phaseidx - 1)); + aggnode = list_nth_node(Agg, node->chain, phaseidx - 1); sortnode = castNode(Sort, aggnode->plan.lefttree); } else @@ -3360,7 +3360,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) */ foreach(arg, pertrans->aggref->args) { - TargetEntry *source_tle = castNode(TargetEntry, lfirst(arg)); + TargetEntry *source_tle = lfirst_node(TargetEntry, arg); TargetEntry *tle; tle = flatCopyTargetEntry(source_tle); diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 40419c88914..f9ab0d60353 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -517,7 +517,7 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags) hoperators = NIL; foreach(l, node->hashclauses) { - OpExpr *hclause = castNode(OpExpr, lfirst(l)); + OpExpr *hclause = lfirst_node(OpExpr, l); lclauses = lappend(lclauses, ExecInitExpr(linitial(hclause->args), (PlanState *) hjstate)); diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c index b0980343377..5630eae53d8 100644 --- a/src/backend/executor/nodeLockRows.c +++ b/src/backend/executor/nodeLockRows.c @@ -401,7 +401,7 @@ ExecInitLockRows(LockRows *node, EState *estate, int eflags) epq_arowmarks = NIL; foreach(lc, node->rowMarks) { - PlanRowMark *rc = castNode(PlanRowMark, lfirst(lc)); + PlanRowMark *rc = lfirst_node(PlanRowMark, lc); ExecRowMark *erm; ExecAuxRowMark *aerm; diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index 00b736c22c4..71e3b8ec2d6 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -1968,7 +1968,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) */ foreach(l, node->rowMarks) { - PlanRowMark *rc = castNode(PlanRowMark, lfirst(l)); + PlanRowMark *rc = lfirst_node(PlanRowMark, l); ExecRowMark *erm; /* ignore "parent" rowmarks; they are irrelevant at runtime */ diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index b3a025879a1..e8fa4c8547c 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -817,7 +817,7 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) i = 1; foreach(l, oplist) { - OpExpr *opexpr = castNode(OpExpr, lfirst(l)); + OpExpr *opexpr = lfirst_node(OpExpr, l); Expr *expr; TargetEntry *tle; Oid rhs_eq_oper; @@ -1148,7 +1148,7 @@ ExecInitAlternativeSubPlan(AlternativeSubPlan *asplan, PlanState *parent) */ foreach(lc, asplan->subplans) { - SubPlan *sp = castNode(SubPlan, lfirst(lc)); + SubPlan *sp = lfirst_node(SubPlan, lc); SubPlanState *sps = ExecInitSubPlan(sp, parent); asstate->subplans = lappend(asstate->subplans, sps); @@ -1197,8 +1197,8 @@ ExecAlternativeSubPlan(AlternativeSubPlanState *node, bool *isNull) { /* Just pass control to the active subplan */ - SubPlanState *activesp = castNode(SubPlanState, - list_nth(node->subplans, node->active)); + SubPlanState *activesp = list_nth_node(SubPlanState, + node->subplans, node->active); return ExecSubPlan(activesp, econtext, isNull); } diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index ca547dc6d9b..a4a6e5bae43 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -1233,9 +1233,9 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan, if (!(portal->cursorOptions & (CURSOR_OPT_SCROLL | CURSOR_OPT_NO_SCROLL))) { if (list_length(stmt_list) == 1 && - castNode(PlannedStmt, linitial(stmt_list))->commandType != CMD_UTILITY && - castNode(PlannedStmt, linitial(stmt_list))->rowMarks == NIL && - ExecSupportsBackwardScan(castNode(PlannedStmt, linitial(stmt_list))->planTree)) + linitial_node(PlannedStmt, stmt_list)->commandType != CMD_UTILITY && + linitial_node(PlannedStmt, stmt_list)->rowMarks == NIL && + ExecSupportsBackwardScan(linitial_node(PlannedStmt, stmt_list)->planTree)) portal->cursorOptions |= CURSOR_OPT_SCROLL; else portal->cursorOptions |= CURSOR_OPT_NO_SCROLL; @@ -1249,8 +1249,8 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan, if (portal->cursorOptions & CURSOR_OPT_SCROLL) { if (list_length(stmt_list) == 1 && - castNode(PlannedStmt, linitial(stmt_list))->commandType != CMD_UTILITY && - castNode(PlannedStmt, linitial(stmt_list))->rowMarks != NIL) + linitial_node(PlannedStmt, stmt_list)->commandType != CMD_UTILITY && + linitial_node(PlannedStmt, stmt_list)->rowMarks != NIL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"), @@ -1274,7 +1274,7 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan, foreach(lc, stmt_list) { - PlannedStmt *pstmt = castNode(PlannedStmt, lfirst(lc)); + PlannedStmt *pstmt = lfirst_node(PlannedStmt, lc); if (!CommandIsReadOnly(pstmt)) { @@ -1770,7 +1770,7 @@ _SPI_prepare_plan(const char *src, SPIPlanPtr plan) foreach(list_item, raw_parsetree_list) { - RawStmt *parsetree = castNode(RawStmt, lfirst(list_item)); + RawStmt *parsetree = lfirst_node(RawStmt, list_item); List *stmt_list; CachedPlanSource *plansource; @@ -1874,7 +1874,7 @@ _SPI_prepare_oneshot_plan(const char *src, SPIPlanPtr plan) foreach(list_item, raw_parsetree_list) { - RawStmt *parsetree = castNode(RawStmt, lfirst(list_item)); + RawStmt *parsetree = lfirst_node(RawStmt, list_item); CachedPlanSource *plansource; plansource = CreateOneShotCachedPlan(parsetree, @@ -2035,7 +2035,7 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI, foreach(lc2, stmt_list) { - PlannedStmt *stmt = castNode(PlannedStmt, lfirst(lc2)); + PlannedStmt *stmt = lfirst_node(PlannedStmt, lc2); bool canSetTag = stmt->canSetTag; DestReceiver *dest; |