diff options
Diffstat (limited to 'src/backend/storage/buffer/localbuf.c')
| -rw-r--r-- | src/backend/storage/buffer/localbuf.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index e71f95ac1ff..41a08076b31 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -68,7 +68,7 @@ PrefetchLocalBuffer(SMgrRelation smgr, ForkNumber forkNum, BufferTag newTag; /* identity of requested block */ LocalBufferLookupEnt *hresult; - INIT_BUFFERTAG(newTag, smgr->smgr_rnode.node, forkNum, blockNum); + INIT_BUFFERTAG(newTag, smgr->smgr_rlocator.locator, forkNum, blockNum); /* Initialize local buffers if first request in this session */ if (LocalBufHash == NULL) @@ -117,7 +117,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, bool found; uint32 buf_state; - INIT_BUFFERTAG(newTag, smgr->smgr_rnode.node, forkNum, blockNum); + INIT_BUFFERTAG(newTag, smgr->smgr_rlocator.locator, forkNum, blockNum); /* Initialize local buffers if first request in this session */ if (LocalBufHash == NULL) @@ -134,7 +134,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, Assert(BUFFERTAGS_EQUAL(bufHdr->tag, newTag)); #ifdef LBDEBUG fprintf(stderr, "LB ALLOC (%u,%d,%d) %d\n", - smgr->smgr_rnode.node.relNode, forkNum, blockNum, -b - 1); + smgr->smgr_rlocator.locator.relNumber, forkNum, blockNum, -b - 1); #endif buf_state = pg_atomic_read_u32(&bufHdr->state); @@ -162,7 +162,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, #ifdef LBDEBUG fprintf(stderr, "LB ALLOC (%u,%d,%d) %d\n", - smgr->smgr_rnode.node.relNode, forkNum, blockNum, + smgr->smgr_rlocator.locator.relNumber, forkNum, blockNum, -nextFreeLocalBuf - 1); #endif @@ -215,7 +215,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, Page localpage = (char *) LocalBufHdrGetBlock(bufHdr); /* Find smgr relation for buffer */ - oreln = smgropen(bufHdr->tag.rnode, MyBackendId); + oreln = smgropen(bufHdr->tag.rlocator, MyBackendId); PageSetChecksumInplace(localpage, bufHdr->tag.blockNum); @@ -312,7 +312,7 @@ MarkLocalBufferDirty(Buffer buffer) } /* - * DropRelFileNodeLocalBuffers + * DropRelFileLocatorLocalBuffers * This function removes from the buffer pool all the pages of the * specified relation that have block numbers >= firstDelBlock. * (In particular, with firstDelBlock = 0, all pages are removed.) @@ -320,11 +320,11 @@ MarkLocalBufferDirty(Buffer buffer) * out first. Therefore, this is NOT rollback-able, and so should be * used only with extreme caution! * - * See DropRelFileNodeBuffers in bufmgr.c for more notes. + * See DropRelFileLocatorBuffers in bufmgr.c for more notes. */ void -DropRelFileNodeLocalBuffers(RelFileNode rnode, ForkNumber forkNum, - BlockNumber firstDelBlock) +DropRelFileLocatorLocalBuffers(RelFileLocator rlocator, ForkNumber forkNum, + BlockNumber firstDelBlock) { int i; @@ -337,14 +337,14 @@ DropRelFileNodeLocalBuffers(RelFileNode rnode, ForkNumber forkNum, buf_state = pg_atomic_read_u32(&bufHdr->state); if ((buf_state & BM_TAG_VALID) && - RelFileNodeEquals(bufHdr->tag.rnode, rnode) && + RelFileLocatorEquals(bufHdr->tag.rlocator, rlocator) && bufHdr->tag.forkNum == forkNum && bufHdr->tag.blockNum >= firstDelBlock) { if (LocalRefCount[i] != 0) elog(ERROR, "block %u of %s is still referenced (local %u)", bufHdr->tag.blockNum, - relpathbackend(bufHdr->tag.rnode, MyBackendId, + relpathbackend(bufHdr->tag.rlocator, MyBackendId, bufHdr->tag.forkNum), LocalRefCount[i]); /* Remove entry from hashtable */ @@ -363,14 +363,14 @@ DropRelFileNodeLocalBuffers(RelFileNode rnode, ForkNumber forkNum, } /* - * DropRelFileNodeAllLocalBuffers + * DropRelFileLocatorAllLocalBuffers * This function removes from the buffer pool all pages of all forks * of the specified relation. * - * See DropRelFileNodesAllBuffers in bufmgr.c for more notes. + * See DropRelFileLocatorsAllBuffers in bufmgr.c for more notes. */ void -DropRelFileNodeAllLocalBuffers(RelFileNode rnode) +DropRelFileLocatorAllLocalBuffers(RelFileLocator rlocator) { int i; @@ -383,12 +383,12 @@ DropRelFileNodeAllLocalBuffers(RelFileNode rnode) buf_state = pg_atomic_read_u32(&bufHdr->state); if ((buf_state & BM_TAG_VALID) && - RelFileNodeEquals(bufHdr->tag.rnode, rnode)) + RelFileLocatorEquals(bufHdr->tag.rlocator, rlocator)) { if (LocalRefCount[i] != 0) elog(ERROR, "block %u of %s is still referenced (local %u)", bufHdr->tag.blockNum, - relpathbackend(bufHdr->tag.rnode, MyBackendId, + relpathbackend(bufHdr->tag.rlocator, MyBackendId, bufHdr->tag.forkNum), LocalRefCount[i]); /* Remove entry from hashtable */ @@ -589,8 +589,8 @@ AtProcExit_LocalBuffers(void) { /* * We shouldn't be holding any remaining pins; if we are, and assertions - * aren't enabled, we'll fail later in DropRelFileNodeBuffers while trying - * to drop the temp rels. + * aren't enabled, we'll fail later in DropRelFileLocatorBuffers while + * trying to drop the temp rels. */ CheckForLocalBufferLeaks(); } |