NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite0c4ec0

committed

Replace uses of heap_open et al with the corresponding table_* function.

Author: Andres FreundDiscussion:https://postgr.es/m/20190111000539.xbv7s6w7ilcvm7dp@alap3.anarazel.de

1 parent111944c commite0c4ec0Copy full SHA for e0c4ec0

File tree

114 files changed

+1259

-1259

lines changed

contrib
- amcheck
  - verify_nbtree.c
- dblink
  - dblink.c
- file_fdw
  - file_fdw.c
- pgrowlocks
  - pgrowlocks.c
- postgres_fdw
  - deparse.c
  - postgres_fdw.c
- sepgsql
src/backend
- access
  - brin
    - brin.c
  - heap
    - heapam.c
    - tuptoaster.c
  - nbtree
    - nbtsort.c
- bootstrap
  - bootstrap.c
- catalog
- commands
- executor
- optimizer
  - plan
    - planner.c
  - prep
    - preptlist.c
  - util
    - inherit.c
    - plancat.c
- parser
- partitioning
  - partbounds.c
- postmaster
  - autovacuum.c
  - pgstat.c
- replication/logical
- rewrite
- statistics
  - extended_stats.c
- storage/large_object
  - inv_api.c
- utils
  - adt
  - cache
  - init
    - postinit.c
  - misc
    - queryenvironment.c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1259

-1259

lines changed

`‎contrib/amcheck/verify_nbtree.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ bt_index_check_internal(Oid indrelid, bool parentcheck, bool heapallindexed)`
`219`	`219`	`*/`
`220`	`220`	`heapid=IndexGetRelation(indrelid, true);`
`221`	`221`	`if (OidIsValid(heapid))`
`222`		`-heaprel=heap_open(heapid,lockmode);`
	`222`	`+heaprel=table_open(heapid,lockmode);`
`223`	`223`	`else`
`224`	`224`	`heaprel=NULL;`
`225`	`225`
`@@ -261,7 +261,7 @@ bt_index_check_internal(Oid indrelid, bool parentcheck, bool heapallindexed)`
`261`	`261`	`*/`
`262`	`262`	`index_close(indrel,lockmode);`
`263`	`263`	`if (heaprel)`
`264`		`-heap_close(heaprel,lockmode);`
	`264`	`+table_close(heaprel,lockmode);`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`/*`

`‎contrib/dblink/dblink.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2050,7 +2050,7 @@ get_pkey_attnames(Relation rel, int16 *indnkeyatts)`
`2050`	`2050`	`tupdesc=rel->rd_att;`
`2051`	`2051`
`2052`	`2052`	`/* Prepare to scan pg_index for entries having indrelid = this rel. */`
`2053`		`-indexRelation=heap_open(IndexRelationId,AccessShareLock);`
	`2053`	`+indexRelation=table_open(IndexRelationId,AccessShareLock);`
`2054`	`2054`	`ScanKeyInit(&skey,`
`2055`	`2055`	`Anum_pg_index_indrelid,`
`2056`	`2056`	`BTEqualStrategyNumber,F_OIDEQ,`
`@@ -2079,7 +2079,7 @@ get_pkey_attnames(Relation rel, int16 *indnkeyatts)`
`2079`	`2079`	`}`
`2080`	`2080`
`2081`	`2081`	`systable_endscan(scan);`
`2082`		`-heap_close(indexRelation,AccessShareLock);`
	`2082`	`+table_close(indexRelation,AccessShareLock);`
`2083`	`2083`
`2084`	`2084`	`returnresult;`
`2085`	`2085`	`}`
`@@ -2503,7 +2503,7 @@ get_rel_from_relname(text *relname_text, LOCKMODE lockmode, AclMode aclmode)`
`2503`	`2503`	`AclResultaclresult;`
`2504`	`2504`
`2505`	`2505`	`relvar=makeRangeVarFromNameList(textToQualifiedNameList(relname_text));`
`2506`		`-rel=heap_openrv(relvar,lockmode);`
	`2506`	`+rel=table_openrv(relvar,lockmode);`
`2507`	`2507`
`2508`	`2508`	`aclresult=pg_class_aclcheck(RelationGetRelid(rel),GetUserId(),`
`2509`	`2509`	`aclmode);`

`‎contrib/file_fdw/file_fdw.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ get_file_fdw_attribute_options(Oid relid)`
`439`	`439`
`440`	`440`	`List*options=NIL;`
`441`	`441`
`442`		`-rel=heap_open(relid,AccessShareLock);`
	`442`	`+rel=table_open(relid,AccessShareLock);`
`443`	`443`	`tupleDesc=RelationGetDescr(rel);`
`444`	`444`	`natts=tupleDesc->natts;`
`445`	`445`
`@@ -481,7 +481,7 @@ get_file_fdw_attribute_options(Oid relid)`
`481`	`481`	`}`
`482`	`482`	`}`
`483`	`483`
`484`		`-heap_close(rel,AccessShareLock);`
	`484`	`+table_close(rel,AccessShareLock);`
`485`	`485`
`486`	`486`	`/*`
`487`	`487`	`* Return DefElem only when some column(s) have force_not_null /`
`@@ -892,7 +892,7 @@ check_selective_binary_conversion(RelOptInfo *baserel,`
`892`	`892`	`}`
`893`	`893`
`894`	`894`	`/* Convert attribute numbers to column names. */`
`895`		`-rel=heap_open(foreigntableid,AccessShareLock);`
	`895`	`+rel=table_open(foreigntableid,AccessShareLock);`
`896`	`896`	`tupleDesc=RelationGetDescr(rel);`
`897`	`897`
`898`	`898`	`while ((attnum=bms_first_member(attrs_used)) >=0)`
`@@ -934,7 +934,7 @@ check_selective_binary_conversion(RelOptInfo *baserel,`
`934`	`934`	`numattrs++;`
`935`	`935`	`}`
`936`	`936`
`937`		`-heap_close(rel,AccessShareLock);`
	`937`	`+table_close(rel,AccessShareLock);`
`938`	`938`
`939`	`939`	`/* If there's a whole-row reference, fail: we need all the columns. */`
`940`	`940`	`if (has_wholerow)`

`‎contrib/pgrowlocks/pgrowlocks.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ pgrowlocks(PG_FUNCTION_ARGS)`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`heap_endscan(scan);`
`310`		`-heap_close(mydata->rel,AccessShareLock);`
	`310`	`+table_close(mydata->rel,AccessShareLock);`
`311`	`311`
`312`	`312`	`SRF_RETURN_DONE(funcctx);`
`313`	`313`	`}`

`‎contrib/postgres_fdw/deparse.c`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1048,11 +1048,11 @@ deparseSelectSql(List tlist, bool is_subquery, List *retrieved_attrs,`
`1048`	`1048`	`* Core code already has some lock on each rel being planned, so we`
`1049`	`1049`	`* can use NoLock here.`
`1050`	`1050`	`*/`
`1051`		`-Relationrel=heap_open(rte->relid,NoLock);`
	`1051`	`+Relationrel=table_open(rte->relid,NoLock);`
`1052`	`1052`
`1053`	`1053`	`deparseTargetList(buf,rte,foreignrel->relid,rel, false,`
`1054`	`1054`	`fpinfo->attrs_used, false,retrieved_attrs);`
`1055`		`-heap_close(rel,NoLock);`
	`1055`	`+table_close(rel,NoLock);`
`1056`	`1056`	`}`
`1057`	`1057`	`}`
`1058`	`1058`
`@@ -1543,7 +1543,7 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo root, RelOptInfo foreignrel,`
`1543`	`1543`	`* Core code already has some lock on each rel being planned, so we`
`1544`	`1544`	`* can use NoLock here.`
`1545`	`1545`	`*/`
`1546`		`-Relationrel=heap_open(rte->relid,NoLock);`
	`1546`	`+Relationrel=table_open(rte->relid,NoLock);`
`1547`	`1547`
`1548`	`1548`	`deparseRelation(buf,rel);`
`1549`	`1549`
`@@ -1555,7 +1555,7 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo root, RelOptInfo foreignrel,`
`1555`	`1555`	`if (use_alias)`
`1556`	`1556`	`appendStringInfo(buf," %s%d",REL_ALIAS_PREFIX,foreignrel->relid);`
`1557`	`1557`
`1558`		`-heap_close(rel,NoLock);`
	`1558`	`+table_close(rel,NoLock);`
`1559`	`1559`	`}`
`1560`	`1560`	`}`
`1561`	`1561`
`@@ -2097,7 +2097,7 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, RangeTblEntry *rte,`
`2097`	`2097`	`* The lock on the relation will be held by upper callers, so it's`
`2098`	`2098`	`* fine to open it with no lock here.`
`2099`	`2099`	`*/`
`2100`		`-rel=heap_open(rte->relid,NoLock);`
	`2100`	`+rel=table_open(rte->relid,NoLock);`
`2101`	`2101`
`2102`	`2102`	`/*`
`2103`	`2103`	`* 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,`
`2132`	`2132`	`if (qualify_col)`
`2133`	`2133`	`appendStringInfoString(buf," END");`
`2134`	`2134`
`2135`		`-heap_close(rel,NoLock);`
	`2135`	`+table_close(rel,NoLock);`
`2136`	`2136`	`bms_free(attrs_used);`
`2137`	`2137`	`}`
`2138`	`2138`	`else`

`‎contrib/postgres_fdw/postgres_fdw.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1616,7 +1616,7 @@ postgresPlanForeignModify(PlannerInfo *root,`
`1616`	`1616`	`* Core code already has some lock on each rel being planned, so we can`
`1617`	`1617`	`* use NoLock here.`
`1618`	`1618`	`*/`
`1619`		`-rel=heap_open(rte->relid,NoLock);`
	`1619`	`+rel=table_open(rte->relid,NoLock);`
`1620`	`1620`
`1621`	`1621`	`/*`
`1622`	`1622`	`* In an INSERT, we transmit all columns that are defined in the foreign`
`@@ -1706,7 +1706,7 @@ postgresPlanForeignModify(PlannerInfo *root,`
`1706`	`1706`	`break;`
`1707`	`1707`	`}`
`1708`	`1708`
`1709`		`-heap_close(rel,NoLock);`
	`1709`	`+table_close(rel,NoLock);`
`1710`	`1710`
`1711`	`1711`	`/*`
`1712`	`1712`	`* Build the fdw_private list that will be available to the executor.`
`@@ -2121,7 +2121,7 @@ postgresPlanDirectModify(PlannerInfo *root,`
`2121`	`2121`	`* Core code already has some lock on each rel being planned, so we can`
`2122`	`2122`	`* use NoLock here.`
`2123`	`2123`	`*/`
`2124`		`-rel=heap_open(rte->relid,NoLock);`
	`2124`	`+rel=table_open(rte->relid,NoLock);`
`2125`	`2125`
`2126`	`2126`	`/*`
`2127`	`2127`	`* Recall the qual clauses that must be evaluated remotely. (These are`
`@@ -2207,7 +2207,7 @@ postgresPlanDirectModify(PlannerInfo *root,`
`2207`	`2207`	`rebuild_fdw_scan_tlist(fscan,returningList);`
`2208`	`2208`	`}`
`2209`	`2209`
`2210`		`-heap_close(rel,NoLock);`
	`2210`	`+table_close(rel,NoLock);`
`2211`	`2211`	`return true;`
`2212`	`2212`	`}`
`2213`	`2213`

`‎contrib/sepgsql/database.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ sepgsql_database_post_create(Oid databaseId, const char *dtemplate)`
`77`	`77`	`* XXX - uncoming version of libselinux supports to take object name to`
`78`	`78`	`* handle special treatment on default security label.`
`79`	`79`	`*/`
`80`		`-rel=heap_open(DatabaseRelationId,AccessShareLock);`
	`80`	`+rel=table_open(DatabaseRelationId,AccessShareLock);`
`81`	`81`
`82`	`82`	`ScanKeyInit(&skey,`
`83`	`83`	`Anum_pg_database_oid,`
`@@ -110,7 +110,7 @@ sepgsql_database_post_create(Oid databaseId, const char *dtemplate)`
`110`	`110`	`true);`
`111`	`111`
`112`	`112`	`systable_endscan(sscan);`
`113`		`-heap_close(rel,AccessShareLock);`
	`113`	`+table_close(rel,AccessShareLock);`
`114`	`114`
`115`	`115`	`/*`
`116`	`116`	`* Assign the default security label on the new database`

`‎contrib/sepgsql/label.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -727,7 +727,7 @@ exec_object_restorecon(struct selabel_handle *sehnd, Oid catalogId)`
`727`	`727`	`* Open the target catalog. We don't want to allow writable accesses by`
`728`	`728`	`* other session during initial labeling.`
`729`	`729`	`*/`
`730`		`-rel=heap_open(catalogId,AccessShareLock);`
	`730`	`+rel=table_open(catalogId,AccessShareLock);`
`731`	`731`
`732`	`732`	`sscan=systable_beginscan(rel,InvalidOid, false,`
`733`	`733`	`NULL,0,NULL);`
`@@ -881,7 +881,7 @@ exec_object_restorecon(struct selabel_handle *sehnd, Oid catalogId)`
`881`	`881`	`}`
`882`	`882`	`systable_endscan(sscan);`
`883`	`883`
`884`		`-heap_close(rel,NoLock);`
	`884`	`+table_close(rel,NoLock);`
`885`	`885`	`}`
`886`	`886`
`887`	`887`	`/*`

`‎contrib/sepgsql/proc.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ sepgsql_proc_post_create(Oid functionId)`
`56`	`56`	`* Fetch namespace of the new procedure. Because pg_proc entry is not`
`57`	`57`	`* visible right now, we need to scan the catalog using SnapshotSelf.`
`58`	`58`	`*/`
`59`		`-rel=heap_open(ProcedureRelationId,AccessShareLock);`
	`59`	`+rel=table_open(ProcedureRelationId,AccessShareLock);`
`60`	`60`
`61`	`61`	`ScanKeyInit(&skey,`
`62`	`62`	`Anum_pg_proc_oid,`
`@@ -141,7 +141,7 @@ sepgsql_proc_post_create(Oid functionId)`
`141`	`141`	`* Cleanup`
`142`	`142`	`*/`
`143`	`143`	`systable_endscan(sscan);`
`144`		`-heap_close(rel,AccessShareLock);`
	`144`	`+table_close(rel,AccessShareLock);`
`145`	`145`
`146`	`146`	`pfree(audit_name.data);`
`147`	`147`	`pfree(tcontext);`
`@@ -250,7 +250,7 @@ sepgsql_proc_setattr(Oid functionId)`
`250`	`250`	`/*`
`251`	`251`	`* Fetch newer catalog`
`252`	`252`	`*/`
`253`		`-rel=heap_open(ProcedureRelationId,AccessShareLock);`
	`253`	`+rel=table_open(ProcedureRelationId,AccessShareLock);`
`254`	`254`
`255`	`255`	`ScanKeyInit(&skey,`
`256`	`256`	`Anum_pg_proc_oid,`
`@@ -305,7 +305,7 @@ sepgsql_proc_setattr(Oid functionId)`
`305`	`305`
`306`	`306`	`ReleaseSysCache(oldtup);`
`307`	`307`	`systable_endscan(sscan);`
`308`		`-heap_close(rel,AccessShareLock);`
	`308`	`+table_close(rel,AccessShareLock);`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`/*`

`‎contrib/sepgsql/relation.c`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum)`
`67`	`67`	`* Compute a default security label of the new column underlying the`
`68`	`68`	`* specified relation, and check permission to create it.`
`69`	`69`	`*/`
`70`		`-rel=heap_open(AttributeRelationId,AccessShareLock);`
	`70`	`+rel=table_open(AttributeRelationId,AccessShareLock);`
`71`	`71`
`72`	`72`	`ScanKeyInit(&skey[0],`
`73`	`73`	`Anum_pg_attribute_attrelid,`
`@@ -120,7 +120,7 @@ sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum)`
`120`	`120`	`SetSecurityLabel(&object,SEPGSQL_LABEL_TAG,ncontext);`
`121`	`121`
`122`	`122`	`systable_endscan(sscan);`
`123`		`-heap_close(rel,AccessShareLock);`
	`123`	`+table_close(rel,AccessShareLock);`
`124`	`124`
`125`	`125`	`pfree(tcontext);`
`126`	`126`	`pfree(ncontext);`
`@@ -259,7 +259,7 @@ sepgsql_relation_post_create(Oid relOid)`
`259`	`259`	`* Fetch catalog record of the new relation. Because pg_class entry is not`
`260`	`260`	`* visible right now, we need to scan the catalog using SnapshotSelf.`
`261`	`261`	`*/`
`262`		`-rel=heap_open(RelationRelationId,AccessShareLock);`
	`262`	`+rel=table_open(RelationRelationId,AccessShareLock);`
`263`	`263`
`264`	`264`	`ScanKeyInit(&skey,`
`265`	`265`	`Anum_pg_class_oid,`
`@@ -358,7 +358,7 @@ sepgsql_relation_post_create(Oid relOid)`
`358`	`358`	`HeapTupleatup;`
`359`	`359`	`Form_pg_attributeattForm;`
`360`	`360`
`361`		`-arel=heap_open(AttributeRelationId,AccessShareLock);`
	`361`	`+arel=table_open(AttributeRelationId,AccessShareLock);`
`362`	`362`
`363`	`363`	`ScanKeyInit(&akey,`
`364`	`364`	`Anum_pg_attribute_attrelid,`
`@@ -400,13 +400,13 @@ sepgsql_relation_post_create(Oid relOid)`
`400`	`400`	`pfree(ccontext);`
`401`	`401`	`}`
`402`	`402`	`systable_endscan(ascan);`
`403`		`-heap_close(arel,AccessShareLock);`
	`403`	`+table_close(arel,AccessShareLock);`
`404`	`404`	`}`
`405`	`405`	`pfree(rcontext);`
`406`	`406`
`407`	`407`	`out:`
`408`	`408`	`systable_endscan(sscan);`
`409`		`-heap_close(rel,AccessShareLock);`
	`409`	`+table_close(rel,AccessShareLock);`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`/*`
`@@ -611,7 +611,7 @@ sepgsql_relation_setattr(Oid relOid)`
`611`	`611`	`/*`
`612`	`612`	`* Fetch newer catalog`
`613`	`613`	`*/`
`614`		`-rel=heap_open(RelationRelationId,AccessShareLock);`
	`614`	`+rel=table_open(RelationRelationId,AccessShareLock);`
`615`	`615`
`616`	`616`	`ScanKeyInit(&skey,`
`617`	`617`	`Anum_pg_class_oid,`
`@@ -667,7 +667,7 @@ sepgsql_relation_setattr(Oid relOid)`
`667`	`667`
`668`	`668`	`ReleaseSysCache(oldtup);`
`669`	`669`	`systable_endscan(sscan);`
`670`		`-heap_close(rel,AccessShareLock);`
	`670`	`+table_close(rel,AccessShareLock);`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`/*`
`@@ -723,13 +723,13 @@ sepgsql_relation_setattr_extra(Relation catalog,`
`723`	`723`	`staticvoid`
`724`	`724`	`sepgsql_index_modify(OidindexOid)`
`725`	`725`	`{`
`726`		`-Relationcatalog=heap_open(IndexRelationId,AccessShareLock);`
	`726`	`+Relationcatalog=table_open(IndexRelationId,AccessShareLock);`
`727`	`727`
`728`	`728`	`/* check db_table:{setattr} permission of the table being indexed */`
`729`	`729`	`sepgsql_relation_setattr_extra(catalog,`
`730`	`730`	`IndexRelidIndexId,`
`731`	`731`	`indexOid,`
`732`	`732`	`Anum_pg_index_indrelid,`
`733`	`733`	`Anum_pg_index_indexrelid);`
`734`		`-heap_close(catalog,AccessShareLock);`
	`734`	`+table_close(catalog,AccessShareLock);`
`735`	`735`	`}`

`‎contrib/sepgsql/schema.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ sepgsql_schema_post_create(Oid namespaceId)`
`56`	`56`	`* handle special treatment on default security label; such as special`
`57`	`57`	`* label on "pg_temp" schema.`
`58`	`58`	`*/`
`59`		`-rel=heap_open(NamespaceRelationId,AccessShareLock);`
	`59`	`+rel=table_open(NamespaceRelationId,AccessShareLock);`
`60`	`60`
`61`	`61`	`ScanKeyInit(&skey,`
`62`	`62`	`Anum_pg_namespace_oid,`
`@@ -93,7 +93,7 @@ sepgsql_schema_post_create(Oid namespaceId)`
`93`	`93`	`audit_name.data,`
`94`	`94`	`true);`
`95`	`95`	`systable_endscan(sscan);`
`96`		`-heap_close(rel,AccessShareLock);`
	`96`	`+table_close(rel,AccessShareLock);`
`97`	`97`
`98`	`98`	`/*`
`99`	`99`	`* Assign the default security label on a new procedure`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite0c4ec0

File tree

114 files changed

Some content is hidden

114 files changed

`‎contrib/amcheck/verify_nbtree.c`

`‎contrib/dblink/dblink.c`

`‎contrib/file_fdw/file_fdw.c`

`‎contrib/pgrowlocks/pgrowlocks.c`

`‎contrib/postgres_fdw/deparse.c`

`‎contrib/postgres_fdw/postgres_fdw.c`

`‎contrib/sepgsql/database.c`

`‎contrib/sepgsql/label.c`

`‎contrib/sepgsql/proc.c`

`‎contrib/sepgsql/relation.c`

`‎contrib/sepgsql/schema.c`

0 commit comments