diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-01-10 20:02:24 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-01-10 20:02:24 +0000 |
| commit | 0ce4d56924982c04da226bc890033e377d1ef375 (patch) | |
| tree | 7bea17dae3daf0483526989590035a52af6db8bc /src/backend/storage/buffer/bufmgr.c | |
| parent | cc7cd8774a644bfb484ee31320e85764ba68d1e3 (diff) | |
| download | postgresql-0ce4d56924982c04da226bc890033e377d1ef375.tar.gz postgresql-0ce4d56924982c04da226bc890033e377d1ef375.zip | |
Phase 1 of fix for 'SMgrRelation hashtable corrupted' problem. This
is the minimum required fix. I want to look next at taking advantage of
it by simplifying the message semantics in the shared inval message queue,
but that part can be held over for 8.1 if it turns out too ugly.
Diffstat (limited to 'src/backend/storage/buffer/bufmgr.c')
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 5ec006ef581..457d23b0e02 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.184 2005/01/03 18:49:41 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.185 2005/01/10 20:02:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -131,8 +131,7 @@ ReadBufferInternal(Relation reln, BlockNumber blockNum, isLocalBuf = reln->rd_istemp; /* Open it at the smgr level if not already done */ - if (reln->rd_smgr == NULL) - reln->rd_smgr = smgropen(reln->rd_node); + RelationOpenSmgr(reln); /* Substitute proper block number if caller asked for P_NEW */ if (isExtend) @@ -1130,8 +1129,7 @@ BlockNumber RelationGetNumberOfBlocks(Relation relation) { /* Open it at the smgr level if not already done */ - if (relation->rd_smgr == NULL) - relation->rd_smgr = smgropen(relation->rd_node); + RelationOpenSmgr(relation); return smgrnblocks(relation->rd_smgr); } @@ -1147,8 +1145,7 @@ void RelationTruncate(Relation rel, BlockNumber nblocks) { /* Open it at the smgr level if not already done */ - if (rel->rd_smgr == NULL) - rel->rd_smgr = smgropen(rel->rd_node); + RelationOpenSmgr(rel); /* Make sure rd_targblock isn't pointing somewhere past end */ rel->rd_targblock = InvalidBlockNumber; @@ -1445,8 +1442,7 @@ FlushRelationBuffers(Relation rel, BlockNumber firstDelBlock) BufferDesc *bufHdr; /* Open rel at the smgr level if not already done */ - if (rel->rd_smgr == NULL) - rel->rd_smgr = smgropen(rel->rd_node); + RelationOpenSmgr(rel); if (rel->rd_istemp) { |