mirror of
https://github.com/postgres/postgres.git
synced 2025-07-31 22:04:40 +03:00
Replace RelationOpenSmgr() with RelationGetSmgr().
The idea behind this patch is to design out bugs like the one fixed
by commit 9d523119f
. Previously, once one did RelationOpenSmgr(rel),
it was considered okay to access rel->rd_smgr directly for some
not-very-clear interval. But since that pointer will be cleared by
relcache flushes, we had bugs arising from overreliance on a previous
RelationOpenSmgr call still being effective.
Now, very little code except that in rel.h and relcache.c should ever
touch the rd_smgr field directly. The normal coding rule is to use
RelationGetSmgr(rel) and not expect the result to be valid for longer
than one smgr function call. There are a couple of places where using
the function every single time seemed like overkill, but they are now
annotated with large warning comments.
Amul Sul, after an idea of mine.
Discussion: https://postgr.es/m/CANiYTQsU7yMFpQYnv=BrcRVqK_3U3mtAzAsJCaqtzsDHfsUbdQ@mail.gmail.com
This commit is contained in:
@ -514,15 +514,13 @@ autoprewarm_database_main(Datum main_arg)
|
||||
old_blk->filenode != blk->filenode ||
|
||||
old_blk->forknum != blk->forknum)
|
||||
{
|
||||
RelationOpenSmgr(rel);
|
||||
|
||||
/*
|
||||
* smgrexists is not safe for illegal forknum, hence check whether
|
||||
* the passed forknum is valid before using it in smgrexists.
|
||||
*/
|
||||
if (blk->forknum > InvalidForkNumber &&
|
||||
blk->forknum <= MAX_FORKNUM &&
|
||||
smgrexists(rel->rd_smgr, blk->forknum))
|
||||
smgrexists(RelationGetSmgr(rel), blk->forknum))
|
||||
nblocks = RelationGetNumberOfBlocksInFork(rel, blk->forknum);
|
||||
else
|
||||
nblocks = 0;
|
||||
|
Reference in New Issue
Block a user