From 5eafd098098b347144cee7454db4c44c3ca814ff Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sun, 9 Mar 2025 18:33:35 -0400 Subject: [PATCH v2.7 19/35] localbuf: Introduce FlushLocalBuffer() Previously we had two paths implementing writing out temporary table buffers. For shared buffers, the logic for that is centralized in FlushBuffer(). Introduce FlushLocalBuffer() to do the same for local buffers. Besides being a nice cleanup on its own, it also makes an upcoming change slightly easier. Reviewed-by: Melanie Plageman Discussion: https://postgr.es/m/CAAKRu_b9anbWzEs5AAF9WCvcEVmgz-1AkHSQ-CLLy-p7WHzvFw@mail.gmail.com --- src/include/storage/buf_internals.h | 1 + src/backend/storage/buffer/bufmgr.c | 22 +-------- src/backend/storage/buffer/localbuf.c | 64 +++++++++++++++------------ 3 files changed, 38 insertions(+), 49 deletions(-) diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 4611a60d3e0..90bc7e0db7b 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -473,6 +473,7 @@ extern BlockNumber ExtendBufferedRelLocal(BufferManagerRelation bmr, extern void MarkLocalBufferDirty(Buffer buffer); extern void TerminateLocalBufferIO(BufferDesc *bufHdr, bool clear_dirty, uint32 set_flag_bits); +extern void FlushLocalBuffer(BufferDesc *bufHdr, SMgrRelation reln); extern void DropRelationLocalBuffers(RelFileLocator rlocator, ForkNumber forkNum, BlockNumber firstDelBlock); diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index ead562249d3..5ead69b5e16 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -4516,7 +4516,6 @@ FlushRelationBuffers(Relation rel) for (i = 0; i < NLocBuffer; i++) { uint32 buf_state; - instr_time io_start; bufHdr = GetLocalBufferDescriptor(i); if (BufTagMatchesRelFileLocator(&bufHdr->tag, &rel->rd_locator) && @@ -4524,9 +4523,6 @@ FlushRelationBuffers(Relation rel) (BM_VALID | BM_DIRTY)) == (BM_VALID | BM_DIRTY)) { ErrorContextCallback errcallback; - Page localpage; - - localpage = (char *) LocalBufHdrGetBlock(bufHdr); /* Setup error traceback support for ereport() */ errcallback.callback = local_buffer_write_error_callback; @@ -4534,23 +4530,7 @@ FlushRelationBuffers(Relation rel) errcallback.previous = error_context_stack; error_context_stack = &errcallback; - PageSetChecksumInplace(localpage, bufHdr->tag.blockNum); - - io_start = pgstat_prepare_io_time(track_io_timing); - - smgrwrite(srel, - BufTagGetForkNum(&bufHdr->tag), - bufHdr->tag.blockNum, - localpage, - false); - - pgstat_count_io_op_time(IOOBJECT_TEMP_RELATION, - IOCONTEXT_NORMAL, IOOP_WRITE, - io_start, 1, BLCKSZ); - - TerminateLocalBufferIO(bufHdr, true, 0); - - pgBufferUsage.local_blks_written++; + FlushLocalBuffer(bufHdr, srel); /* Pop the error context stack */ error_context_stack = errcallback.previous; diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 6df51a3a754..251289c95fd 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -174,6 +174,41 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, return bufHdr; } +/* + * Like FlushBuffer(), just for local buffers. + */ +void +FlushLocalBuffer(BufferDesc *bufHdr, SMgrRelation reln) +{ + instr_time io_start; + Page localpage = (char *) LocalBufHdrGetBlock(bufHdr); + + /* Find smgr relation for buffer */ + if (reln == NULL) + reln = smgropen(BufTagGetRelFileLocator(&bufHdr->tag), + MyProcNumber); + + PageSetChecksumInplace(localpage, bufHdr->tag.blockNum); + + io_start = pgstat_prepare_io_time(track_io_timing); + + /* And write... */ + smgrwrite(reln, + BufTagGetForkNum(&bufHdr->tag), + bufHdr->tag.blockNum, + localpage, + false); + + /* Temporary table I/O does not use Buffer Access Strategies */ + pgstat_count_io_op_time(IOOBJECT_TEMP_RELATION, IOCONTEXT_NORMAL, + IOOP_WRITE, io_start, 1, BLCKSZ); + + /* Mark not-dirty */ + TerminateLocalBufferIO(bufHdr, true, 0); + + pgBufferUsage.local_blks_written++; +} + static Buffer GetLocalVictimBuffer(void) { @@ -234,34 +269,7 @@ GetLocalVictimBuffer(void) * the case, write it out before reusing it! */ if (pg_atomic_read_u32(&bufHdr->state) & BM_DIRTY) - { - instr_time io_start; - SMgrRelation oreln; - Page localpage = (char *) LocalBufHdrGetBlock(bufHdr); - - /* Find smgr relation for buffer */ - oreln = smgropen(BufTagGetRelFileLocator(&bufHdr->tag), MyProcNumber); - - PageSetChecksumInplace(localpage, bufHdr->tag.blockNum); - - io_start = pgstat_prepare_io_time(track_io_timing); - - /* And write... */ - smgrwrite(oreln, - BufTagGetForkNum(&bufHdr->tag), - bufHdr->tag.blockNum, - localpage, - false); - - /* Temporary table I/O does not use Buffer Access Strategies */ - pgstat_count_io_op_time(IOOBJECT_TEMP_RELATION, IOCONTEXT_NORMAL, - IOOP_WRITE, io_start, 1, BLCKSZ); - - /* Mark not-dirty now in case we error out below */ - TerminateLocalBufferIO(bufHdr, true, 0); - - pgBufferUsage.local_blks_written++; - } + FlushLocalBuffer(bufHdr, NULL); /* * Remove the victim buffer from the hashtable and mark as invalid. -- 2.48.1.76.g4e746b1a31.dirty