mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +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:
@ -67,7 +67,7 @@ sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum)
|
||||
* Compute a default security label of the new column underlying the
|
||||
* specified relation, and check permission to create it.
|
||||
*/
|
||||
rel = heap_open(AttributeRelationId, AccessShareLock);
|
||||
rel = table_open(AttributeRelationId, AccessShareLock);
|
||||
|
||||
ScanKeyInit(&skey[0],
|
||||
Anum_pg_attribute_attrelid,
|
||||
@ -120,7 +120,7 @@ sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum)
|
||||
SetSecurityLabel(&object, SEPGSQL_LABEL_TAG, ncontext);
|
||||
|
||||
systable_endscan(sscan);
|
||||
heap_close(rel, AccessShareLock);
|
||||
table_close(rel, AccessShareLock);
|
||||
|
||||
pfree(tcontext);
|
||||
pfree(ncontext);
|
||||
@ -259,7 +259,7 @@ sepgsql_relation_post_create(Oid relOid)
|
||||
* Fetch catalog record of the new relation. Because pg_class entry is not
|
||||
* visible right now, we need to scan the catalog using SnapshotSelf.
|
||||
*/
|
||||
rel = heap_open(RelationRelationId, AccessShareLock);
|
||||
rel = table_open(RelationRelationId, AccessShareLock);
|
||||
|
||||
ScanKeyInit(&skey,
|
||||
Anum_pg_class_oid,
|
||||
@ -358,7 +358,7 @@ sepgsql_relation_post_create(Oid relOid)
|
||||
HeapTuple atup;
|
||||
Form_pg_attribute attForm;
|
||||
|
||||
arel = heap_open(AttributeRelationId, AccessShareLock);
|
||||
arel = table_open(AttributeRelationId, AccessShareLock);
|
||||
|
||||
ScanKeyInit(&akey,
|
||||
Anum_pg_attribute_attrelid,
|
||||
@ -400,13 +400,13 @@ sepgsql_relation_post_create(Oid relOid)
|
||||
pfree(ccontext);
|
||||
}
|
||||
systable_endscan(ascan);
|
||||
heap_close(arel, AccessShareLock);
|
||||
table_close(arel, AccessShareLock);
|
||||
}
|
||||
pfree(rcontext);
|
||||
|
||||
out:
|
||||
systable_endscan(sscan);
|
||||
heap_close(rel, AccessShareLock);
|
||||
table_close(rel, AccessShareLock);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -611,7 +611,7 @@ sepgsql_relation_setattr(Oid relOid)
|
||||
/*
|
||||
* Fetch newer catalog
|
||||
*/
|
||||
rel = heap_open(RelationRelationId, AccessShareLock);
|
||||
rel = table_open(RelationRelationId, AccessShareLock);
|
||||
|
||||
ScanKeyInit(&skey,
|
||||
Anum_pg_class_oid,
|
||||
@ -667,7 +667,7 @@ sepgsql_relation_setattr(Oid relOid)
|
||||
|
||||
ReleaseSysCache(oldtup);
|
||||
systable_endscan(sscan);
|
||||
heap_close(rel, AccessShareLock);
|
||||
table_close(rel, AccessShareLock);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -723,7 +723,7 @@ sepgsql_relation_setattr_extra(Relation catalog,
|
||||
static void
|
||||
sepgsql_index_modify(Oid indexOid)
|
||||
{
|
||||
Relation catalog = heap_open(IndexRelationId, AccessShareLock);
|
||||
Relation catalog = table_open(IndexRelationId, AccessShareLock);
|
||||
|
||||
/* check db_table:{setattr} permission of the table being indexed */
|
||||
sepgsql_relation_setattr_extra(catalog,
|
||||
@ -731,5 +731,5 @@ sepgsql_index_modify(Oid indexOid)
|
||||
indexOid,
|
||||
Anum_pg_index_indrelid,
|
||||
Anum_pg_index_indexrelid);
|
||||
heap_close(catalog, AccessShareLock);
|
||||
table_close(catalog, AccessShareLock);
|
||||
}
|
||||
|
Reference in New Issue
Block a user