mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
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
This commit is contained in:
@ -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
|
||||
|
@ -1616,7 +1616,7 @@ postgresPlanForeignModify(PlannerInfo *root,
|
||||
* Core code already has some lock on each rel being planned, so we can
|
||||
* use NoLock here.
|
||||
*/
|
||||
rel = heap_open(rte->relid, NoLock);
|
||||
rel = table_open(rte->relid, NoLock);
|
||||
|
||||
/*
|
||||
* In an INSERT, we transmit all columns that are defined in the foreign
|
||||
@ -1706,7 +1706,7 @@ postgresPlanForeignModify(PlannerInfo *root,
|
||||
break;
|
||||
}
|
||||
|
||||
heap_close(rel, NoLock);
|
||||
table_close(rel, NoLock);
|
||||
|
||||
/*
|
||||
* Build the fdw_private list that will be available to the executor.
|
||||
@ -2121,7 +2121,7 @@ postgresPlanDirectModify(PlannerInfo *root,
|
||||
* Core code already has some lock on each rel being planned, so we can
|
||||
* use NoLock here.
|
||||
*/
|
||||
rel = heap_open(rte->relid, NoLock);
|
||||
rel = table_open(rte->relid, NoLock);
|
||||
|
||||
/*
|
||||
* Recall the qual clauses that must be evaluated remotely. (These are
|
||||
@ -2207,7 +2207,7 @@ postgresPlanDirectModify(PlannerInfo *root,
|
||||
rebuild_fdw_scan_tlist(fscan, returningList);
|
||||
}
|
||||
|
||||
heap_close(rel, NoLock);
|
||||
table_close(rel, NoLock);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user