From e0c4ec07284db817e1f8d9adfb3fffc952252db0 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 21 Jan 2019 10:32:19 -0800 Subject: Replace uses of heap_open et al with the corresponding table_* function. Author: Andres Freund Discussion: https://postgr.es/m/20190111000539.xbv7s6w7ilcvm7dp@alap3.anarazel.de --- contrib/postgres_fdw/deparse.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'contrib/postgres_fdw/deparse.c') diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c index 20982daef68..f368d4b31fb 100644 --- a/contrib/postgres_fdw/deparse.c +++ b/contrib/postgres_fdw/deparse.c @@ -1048,11 +1048,11 @@ deparseSelectSql(List *tlist, bool is_subquery, List **retrieved_attrs, * Core code already has some lock on each rel being planned, so we * can use NoLock here. */ - Relation rel = heap_open(rte->relid, NoLock); + Relation rel = table_open(rte->relid, NoLock); deparseTargetList(buf, rte, foreignrel->relid, rel, false, fpinfo->attrs_used, false, retrieved_attrs); - heap_close(rel, NoLock); + table_close(rel, NoLock); } } @@ -1543,7 +1543,7 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel, * Core code already has some lock on each rel being planned, so we * can use NoLock here. */ - Relation rel = heap_open(rte->relid, NoLock); + Relation rel = table_open(rte->relid, NoLock); deparseRelation(buf, rel); @@ -1555,7 +1555,7 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel, if (use_alias) appendStringInfo(buf, " %s%d", REL_ALIAS_PREFIX, foreignrel->relid); - heap_close(rel, NoLock); + table_close(rel, NoLock); } } @@ -2097,7 +2097,7 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, RangeTblEntry *rte, * The lock on the relation will be held by upper callers, so it's * fine to open it with no lock here. */ - rel = heap_open(rte->relid, NoLock); + rel = table_open(rte->relid, NoLock); /* * The local name of the foreign table can not be recognized by the @@ -2132,7 +2132,7 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, RangeTblEntry *rte, if (qualify_col) appendStringInfoString(buf, " END"); - heap_close(rel, NoLock); + table_close(rel, NoLock); bms_free(attrs_used); } else -- cgit v1.2.3