diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-04-29 22:28:24 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-04-29 22:28:24 +0000 |
| commit | 3a694bb0a16fea1662f1ffd31506a72effdd4a93 (patch) | |
| tree | 50bbf16b3117aada49b2709f524b3bdcf1a36815 /src/backend/access/heap/hio.c | |
| parent | 32d3b47e6f05c7137debddb68730a25fe1bb0cd6 (diff) | |
| download | postgresql-3a694bb0a16fea1662f1ffd31506a72effdd4a93.tar.gz postgresql-3a694bb0a16fea1662f1ffd31506a72effdd4a93.zip | |
Restructure LOCKTAG as per discussions of a couple months ago.
Essentially, we shoehorn in a lockable-object-type field by taking
a byte away from the lockmethodid, which can surely fit in one byte
instead of two. This allows less artificial definitions of all the
other fields of LOCKTAG; we can get rid of the special pg_xactlock
pseudo-relation, and also support locks on individual tuples and
general database objects (including shared objects). None of those
possibilities are actually exploited just yet, however.
I removed pg_xactlock from pg_class, but did not force initdb for
that change. At this point, relkind 's' (SPECIAL) is unused and
could be removed entirely.
Diffstat (limited to 'src/backend/access/heap/hio.c')
| -rw-r--r-- | src/backend/access/heap/hio.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index 27af323ed11..db0bda6699b 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/hio.c,v 1.54 2004/12/31 21:59:16 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/hio.c,v 1.55 2005/04/29 22:28:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -79,11 +79,6 @@ RelationPutHeapTuple(Relation relation, * happen if space is freed in that page after heap_update finds there's not * enough there). In that case, the page will be pinned and locked only once. * - * Note that we use LockPage(rel, 0) to lock relation for extension. - * We can do this as long as in all other places we use page-level locking - * for indices only. Alternatively, we could define pseudo-table as - * we do for transactions with XactLockTable. - * * ereport(ERROR) is allowed here, so this routine *must* be called * before any (unlogged) changes are made in buffer pool. */ @@ -235,7 +230,7 @@ RelationGetBufferForTuple(Relation relation, Size len, needLock = !RELATION_IS_LOCAL(relation); if (needLock) - LockPage(relation, 0, ExclusiveLock); + LockRelationForExtension(relation, ExclusiveLock); /* * XXX This does an lseek - rather expensive - but at the moment it is @@ -251,7 +246,7 @@ RelationGetBufferForTuple(Relation relation, Size len, * extend the relation some more. */ if (needLock) - UnlockPage(relation, 0, ExclusiveLock); + UnlockRelationForExtension(relation, ExclusiveLock); /* * We can be certain that locking the otherBuffer first is OK, since |