From 9ba8a9ce4548bb34b7136b7463a61b2c499979a3 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 26 Jan 2017 16:47:03 -0800 Subject: Use the new castNode() macro in a number of places. This is far from a pervasive conversion, but it's a good starting point. Author: Peter Eisentraut, with some minor changes by me Reviewed-By: Tom Lane Discussion: https://postgr.es/m/c5d387d9-3440-f5e0-f9d4-71d53b9fbe52@2ndquadrant.com --- contrib/postgres_fdw/postgres_fdw.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'contrib/postgres_fdw/postgres_fdw.c') diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index ce1f443d555..f396a227f7e 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -1159,9 +1159,7 @@ postgresGetForeignPlan(PlannerInfo *root, */ foreach(lc, scan_clauses) { - RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc); - - Assert(IsA(rinfo, RestrictInfo)); + RestrictInfo *rinfo = castNode(RestrictInfo, lfirst(lc)); /* Ignore any pseudoconstants, they're dealt with elsewhere */ if (rinfo->pseudoconstant) @@ -4958,14 +4956,12 @@ conversion_error_callback(void *arg) { /* error occurred in a scan against a foreign join */ ForeignScanState *fsstate = errpos->fsstate; - ForeignScan *fsplan = (ForeignScan *) fsstate->ss.ps.plan; + ForeignScan *fsplan = castNode(ForeignScan, fsstate->ss.ps.plan); EState *estate = fsstate->ss.ps.state; TargetEntry *tle; - Assert(IsA(fsplan, ForeignScan)); - tle = (TargetEntry *) list_nth(fsplan->fdw_scan_tlist, - errpos->cur_attno - 1); - Assert(IsA(tle, TargetEntry)); + tle = castNode(TargetEntry, list_nth(fsplan->fdw_scan_tlist, + errpos->cur_attno - 1)); /* * Target list can have Vars and expressions. For Vars, we can get -- cgit v1.2.3