From 6229b9a946f31ffbe66f8f5eae4fc5561897c0fd Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Tue, 24 Oct 2023 17:13:20 +0200 Subject: [PATCH v7 3/3] Use new foreach_xyz macros in a few places This starts using each of the newly added for_each_xyz macros in at least one place. This shows how they improve readability by reducing the amount of boilerplate code. --- src/backend/executor/execExpr.c | 9 +++----- src/backend/executor/nodeSubplan.c | 23 ++++++--------------- src/backend/replication/logical/relation.c | 4 +--- src/backend/replication/logical/tablesync.c | 5 +---- src/backend/replication/pgoutput/pgoutput.c | 7 +++---- 5 files changed, 14 insertions(+), 34 deletions(-) diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c index 2c62b0c9c84..e06886a7334 100644 --- a/src/backend/executor/execExpr.c +++ b/src/backend/executor/execExpr.c @@ -216,7 +216,6 @@ ExecInitQual(List *qual, PlanState *parent) ExprState *state; ExprEvalStep scratch = {0}; List *adjust_jumps = NIL; - ListCell *lc; /* short-circuit (here and in ExecQual) for empty restriction list */ if (qual == NIL) @@ -250,10 +249,8 @@ ExecInitQual(List *qual, PlanState *parent) scratch.resvalue = &state->resvalue; scratch.resnull = &state->resnull; - foreach(lc, qual) + foreach_ptr(Expr, node, qual) { - Expr *node = (Expr *) lfirst(lc); - /* first evaluate expression */ ExecInitExprRec(node, state, &state->resvalue, &state->resnull); @@ -265,9 +262,9 @@ ExecInitQual(List *qual, PlanState *parent) } /* adjust jump targets */ - foreach(lc, adjust_jumps) + foreach_int(jump, adjust_jumps) { - ExprEvalStep *as = &state->steps[lfirst_int(lc)]; + ExprEvalStep *as = &state->steps[jump]; Assert(as->opcode == EEOP_QUAL); Assert(as->d.qualexpr.jumpdone == -1); diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index c136f75ac24..904c7a0a14d 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -307,7 +307,6 @@ ExecScanSubPlan(SubPlanState *node, Datum rowresult; bool rownull; int col; - ListCell *plst; if (subLinkType == EXISTS_SUBLINK) { @@ -367,9 +366,8 @@ ExecScanSubPlan(SubPlanState *node, * Now set all the setParam params from the columns of the tuple */ col = 1; - foreach(plst, subplan->setParam) + foreach_int(paramid, subplan->setParam) { - int paramid = lfirst_int(plst); ParamExecData *prmdata; prmdata = &(econtext->ecxt_param_exec_vals[paramid]); @@ -412,9 +410,8 @@ ExecScanSubPlan(SubPlanState *node, * combining expression. */ col = 1; - foreach(plst, subplan->paramIds) + foreach_int(paramid, subplan->paramIds) { - int paramid = lfirst_int(plst); ParamExecData *prmdata; prmdata = &(econtext->ecxt_param_exec_vals[paramid]); @@ -481,9 +478,8 @@ ExecScanSubPlan(SubPlanState *node, else if (subLinkType == MULTIEXPR_SUBLINK) { /* We don't care about function result, but set the setParams */ - foreach(l, subplan->setParam) + foreach_int(paramid, subplan->setParam) { - int paramid = lfirst_int(l); ParamExecData *prmdata; prmdata = &(econtext->ecxt_param_exec_vals[paramid]); @@ -604,16 +600,14 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext) slot = ExecProcNode(planstate)) { int col = 1; - ListCell *plst; bool isnew; /* * Load up the Params representing the raw sub-select outputs, then * form the projection tuple to store in the hashtable. */ - foreach(plst, subplan->paramIds) + foreach_int(paramid, subplan->paramIds) { - int paramid = lfirst_int(plst); ParamExecData *prmdata; prmdata = &(innerecontext->ecxt_param_exec_vals[paramid]); @@ -880,11 +874,8 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) if (subplan->setParam != NIL && subplan->parParam == NIL && subplan->subLinkType != CTE_SUBLINK) { - ListCell *lst; - - foreach(lst, subplan->setParam) + foreach_int(paramid, subplan->setParam) { - int paramid = lfirst_int(lst); ParamExecData *prm = &(estate->es_param_exec_vals[paramid]); prm->execPlan = sstate; @@ -906,7 +897,6 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) List *oplist, *lefttlist, *righttlist; - ListCell *l; /* We need a memory context to hold the hash table(s) */ sstate->hashtablecxt = @@ -966,9 +956,8 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) cross_eq_funcoids = (Oid *) palloc(ncols * sizeof(Oid)); i = 1; - foreach(l, oplist) + foreach_node(OpExpr, opexpr, oplist) { - OpExpr *opexpr = lfirst_node(OpExpr, l); Expr *expr; TargetEntry *tle; Oid rhs_eq_oper; diff --git a/src/backend/replication/logical/relation.c b/src/backend/replication/logical/relation.c index a581ac9a4d8..41834a25545 100644 --- a/src/backend/replication/logical/relation.c +++ b/src/backend/replication/logical/relation.c @@ -746,11 +746,9 @@ static Oid FindUsableIndexForReplicaIdentityFull(Relation localrel, AttrMap *attrmap) { List *idxlist = RelationGetIndexList(localrel); - ListCell *lc; - foreach(lc, idxlist) + foreach_oid(idxoid, idxlist) { - Oid idxoid = lfirst_oid(lc); bool isUsableIdx; Relation idxRel; IndexInfo *idxInfo; diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c index 4d056c16c8d..7de4551555d 100644 --- a/src/backend/replication/logical/tablesync.c +++ b/src/backend/replication/logical/tablesync.c @@ -416,7 +416,6 @@ process_syncing_tables_for_apply(XLogRecPtr current_lsn) TimestampTz last_start_time; }; static HTAB *last_start_times = NULL; - ListCell *lc; bool started_tx = false; bool should_exit = false; @@ -453,10 +452,8 @@ process_syncing_tables_for_apply(XLogRecPtr current_lsn) /* * Process all tables that are being synchronized. */ - foreach(lc, table_states_not_ready) + foreach_ptr(SubscriptionRelState, rstate, table_states_not_ready) { - SubscriptionRelState *rstate = (SubscriptionRelState *) lfirst(lc); - if (rstate->state == SUBREL_STATE_SYNCDONE) { /* diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c index f9ed1083df7..e806ed19780 100644 --- a/src/backend/replication/pgoutput/pgoutput.c +++ b/src/backend/replication/pgoutput/pgoutput.c @@ -2229,7 +2229,6 @@ cleanup_rel_sync_cache(TransactionId xid, bool is_commit) { HASH_SEQ_STATUS hash_seq; RelationSyncEntry *entry; - ListCell *lc; Assert(RelationSyncCache != NULL); @@ -2242,15 +2241,15 @@ cleanup_rel_sync_cache(TransactionId xid, bool is_commit) * corresponding schema and we don't need to send it unless there is * any invalidation for that relation. */ - foreach(lc, entry->streamed_txns) + foreach_xid(streamed_txn, entry->streamed_txns) { - if (xid == lfirst_xid(lc)) + if (xid == streamed_txn) { if (is_commit) entry->schema_sent = true; entry->streamed_txns = - foreach_delete_current(entry->streamed_txns, lc); + foreach_delete_current(entry->streamed_txns, streamed_txn); break; } } -- 2.34.1