sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-12 00:01:58 -04:00
Code Issues Projects Releases Wiki Activity

Restore smgrtruncate() prototype in back-branches.

Browse Source 
It's possible that external code is calling smgrtruncate().  Any
external callers might like to consider the recent changes to
RelationTruncate(), but commit 38c579b0 should not have changed the
function prototype in the back-branches, per ABI stability policy.

Restore smgrtruncate()'s traditional argument list in the back-branches,
but make it a wrapper for a new function smgrtruncate2().  The three
callers in core can use smgrtruncate2() directly.  In master (18-to-be),
smgrtruncate2() is effectively renamed to smgrtruncate(), so this wart
is cleaned up.

Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/CA%2BhUKG%2BThae6x6%2BjmQiuALQBT2Ae1ChjMh1%3DkMvJ8y_SBJZrvA%40mail.gmail.com
This commit is contained in:
Thomas Munro 2025-01-08 07:50:30 +13:00
parent 20a344bce8
commit a1d17a8947
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pg_visibility/pg_visibility.c
View File

@ -429,7 +429,7 @@ pg_truncate_visibility_map(PG_FUNCTION_ARGS)
}
if (BlockNumberIsValid(block))
smgrtruncate(RelationGetSmgr(rel), &fork, 1, &old_block, &block);
smgrtruncate2(RelationGetSmgr(rel), &fork, 1, &old_block, &block);
END_CRIT_SECTION();
MyProc->delayChkpt = false;

4
src/backend/catalog/storage.c
View File

@ -409,7 +409,7 @@ RelationTruncate(Relation rel, BlockNumber nblocks)
* longer exist after truncation is complete, and then truncate the
* corresponding files on disk.
*/
smgrtruncate(RelationGetSmgr(rel), forks, nforks, old_blocks, blocks);
smgrtruncate2(RelationGetSmgr(rel), forks, nforks, old_blocks, blocks);
END_CRIT_SECTION();
@ -1070,7 +1070,7 @@ smgr_redo(XLogReaderState *record)
if (nforks > 0)
{
START_CRIT_SECTION();
smgrtruncate(reln, forks, nforks, old_blocks, blocks);
smgrtruncate2(reln, forks, nforks, old_blocks, blocks);
END_CRIT_SECTION();
}

24
src/backend/storage/smgr/smgr.c
View File

@ -544,6 +544,26 @@ smgrnblocks(SMgrRelation reln, ForkNumber forknum)
* smgrtruncate() -- Truncate the given forks of supplied relation to
* each specified numbers of blocks
*
* Backward-compatible version of smgrtruncate2() for the benefit of external
* callers. This version isn't used in PostgreSQL core code, and can't be
* used in a critical section.
*/
void
smgrtruncate(SMgrRelation reln, ForkNumber *forknum, int nforks,
BlockNumber *nblocks)
{
BlockNumber old_nblocks[MAX_FORKNUM + 1];
for (int i = 0; i < nforks; ++i)
old_nblocks[i] = smgrnblocks(reln, forknum[i]);
return smgrtruncate2(reln, forknum, nforks, old_nblocks, nblocks);
}
/*
* smgrtruncate2() -- Truncate the given forks of supplied relation to
* each specified numbers of blocks
*
* The truncation is done immediately, so this can't be rolled back.
*
* The caller must hold AccessExclusiveLock on the relation, to ensure that
@ -555,8 +575,8 @@ smgrnblocks(SMgrRelation reln, ForkNumber forknum)
* to this relation should be called in between.
*/
void
smgrtruncate(SMgrRelation reln, ForkNumber *forknum, int nforks,
BlockNumber *old_nblocks, BlockNumber *nblocks)
smgrtruncate2(SMgrRelation reln, ForkNumber *forknum, int nforks,
BlockNumber *old_nblocks, BlockNumber *nblocks)
{
int i;

4
src/include/storage/smgr.h
View File

@ -102,8 +102,10 @@ extern void smgrwriteback(SMgrRelation reln, ForkNumber forknum,
BlockNumber blocknum, BlockNumber nblocks);
extern BlockNumber smgrnblocks(SMgrRelation reln, ForkNumber forknum);
extern void smgrtruncate(SMgrRelation reln, ForkNumber *forknum, int nforks,
BlockNumber *old_nblocks,
BlockNumber *nblocks);
extern void smgrtruncate2(SMgrRelation reln, ForkNumber *forknum, int nforks,
BlockNumber *old_nblocks,
BlockNumber *nblocks);
extern void smgrimmedsync(SMgrRelation reln, ForkNumber forknum);
extern void AtEOXact_SMgr(void);