|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.39 1998/07/13 16:34:49 momjian Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.40 1998/08/01 15:26:12 vadim Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -114,18 +114,18 @@ RelationGetBufferWithBuffer(Relation relation, |
114 | 114 | Bufferbuffer) |
115 | 115 | { |
116 | 116 | BufferDesc*bufHdr; |
117 | | -LockRelIdlrelId; |
118 | 117 |
|
119 | 118 | if (BufferIsValid(buffer)) |
120 | 119 | { |
121 | 120 | if (!BufferIsLocal(buffer)) |
122 | 121 | { |
| 122 | +LockRelId*lrelId=&(((LockInfo)(relation->lockInfo))->lockRelId); |
| 123 | + |
123 | 124 | bufHdr=&BufferDescriptors[buffer-1]; |
124 | | -lrelId=RelationGetLockRelId(relation); |
125 | 125 | SpinAcquire(BufMgrLock); |
126 | 126 | if (bufHdr->tag.blockNum==blockNumber&& |
127 | | -bufHdr->tag.relId.relId==lrelId.relId&& |
128 | | -bufHdr->tag.relId.dbId==lrelId.dbId) |
| 127 | +bufHdr->tag.relId.relId==lrelId->relId&& |
| 128 | +bufHdr->tag.relId.dbId==lrelId->dbId) |
129 | 129 | { |
130 | 130 | SpinRelease(BufMgrLock); |
131 | 131 | return (buffer); |
@@ -1282,7 +1282,7 @@ BufferGetRelation(Buffer buffer) |
1282 | 1282 | Assert(!BufferIsLocal(buffer));/* not supported for local buffers */ |
1283 | 1283 |
|
1284 | 1284 | /* XXX should be a critical section */ |
1285 | | -relid=LockRelIdGetRelationId(BufferDescriptors[buffer-1].tag.relId); |
| 1285 | +relid=BufferDescriptors[buffer-1].tag.relId.relId; |
1286 | 1286 | relation=RelationIdGetRelation(relid); |
1287 | 1287 |
|
1288 | 1288 | RelationDecrementReferenceCount(relation); |
|