mirror of
https://github.com/postgres/postgres.git
synced 2025-10-27 00:12:01 +03:00
Change internal RelFileNode references to RelFileNumber or RelFileLocator.
We have been using the term RelFileNode to refer to either (1) the integer that is used to name the sequence of files for a certain relation within the directory set aside for that tablespace/database combination; or (2) that value plus the OIDs of the tablespace and database; or occasionally (3) the whole series of files created for a relation based on those values. Using the same name for more than one thing is confusing. Replace RelFileNode with RelFileNumber when we're talking about just the single number, i.e. (1) from above, and with RelFileLocator when we're talking about all the things that are needed to locate a relation's files on disk, i.e. (2) from above. In the places where we refer to (3) as a relfilenode, instead refer to "relation storage". Since there is a ton of SQL code in the world that knows about pg_class.relfilenode, don't change the name of that column, or of other SQL-facing things that derive their name from it. On the other hand, do adjust closely-related internal terminology. For example, the structure member names dbNode and spcNode appear to be derived from the fact that the structure itself was called RelFileNode, so change those to dbOid and spcOid. Likewise, various variables with names like rnode and relnode get renamed appropriately, according to how they're being used in context. Hopefully, this is clearer than before. It is also preparation for future patches that intend to widen the relfilenumber fields from its current width of 32 bits. Variables that store a relfilenumber are now declared as type RelFileNumber rather than type Oid; right now, these are the same, but that can now more easily be changed. Dilip Kumar, per an idea from me. Reviewed also by Andres Freund. I fixed some whitespace issues, changed a couple of words in a comment, and made one other minor correction. Discussion: http://postgr.es/m/CA+TgmoamOtXbVAQf9hWFzonUo6bhhjS6toZQd7HZ-pmojtAmag@mail.gmail.com Discussion: http://postgr.es/m/CA+Tgmobp7+7kmi4gkq7Y+4AM9fTvL+O1oQ4-5gFTT+6Ng-dQ=g@mail.gmail.com Discussion: http://postgr.es/m/CAFiTN-vTe79M8uDH1yprOU64MNFE+R3ODRuA+JWf27JbhY4hJw@mail.gmail.com
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
#include "storage/block.h"
|
||||
#include "storage/buf.h"
|
||||
#include "storage/bufpage.h"
|
||||
#include "storage/relfilenode.h"
|
||||
#include "storage/relfilelocator.h"
|
||||
#include "utils/relcache.h"
|
||||
#include "utils/snapmgr.h"
|
||||
|
||||
@@ -176,13 +176,13 @@ extern PrefetchBufferResult PrefetchSharedBuffer(struct SMgrRelationData *smgr_r
|
||||
BlockNumber blockNum);
|
||||
extern PrefetchBufferResult PrefetchBuffer(Relation reln, ForkNumber forkNum,
|
||||
BlockNumber blockNum);
|
||||
extern bool ReadRecentBuffer(RelFileNode rnode, ForkNumber forkNum,
|
||||
extern bool ReadRecentBuffer(RelFileLocator rlocator, ForkNumber forkNum,
|
||||
BlockNumber blockNum, Buffer recent_buffer);
|
||||
extern Buffer ReadBuffer(Relation reln, BlockNumber blockNum);
|
||||
extern Buffer ReadBufferExtended(Relation reln, ForkNumber forkNum,
|
||||
BlockNumber blockNum, ReadBufferMode mode,
|
||||
BufferAccessStrategy strategy);
|
||||
extern Buffer ReadBufferWithoutRelcache(RelFileNode rnode,
|
||||
extern Buffer ReadBufferWithoutRelcache(RelFileLocator rlocator,
|
||||
ForkNumber forkNum, BlockNumber blockNum,
|
||||
ReadBufferMode mode, BufferAccessStrategy strategy,
|
||||
bool permanent);
|
||||
@@ -204,13 +204,15 @@ extern BlockNumber RelationGetNumberOfBlocksInFork(Relation relation,
|
||||
extern void FlushOneBuffer(Buffer buffer);
|
||||
extern void FlushRelationBuffers(Relation rel);
|
||||
extern void FlushRelationsAllBuffers(struct SMgrRelationData **smgrs, int nrels);
|
||||
extern void CreateAndCopyRelationData(RelFileNode src_rnode,
|
||||
RelFileNode dst_rnode,
|
||||
extern void CreateAndCopyRelationData(RelFileLocator src_rlocator,
|
||||
RelFileLocator dst_rlocator,
|
||||
bool permanent);
|
||||
extern void FlushDatabaseBuffers(Oid dbid);
|
||||
extern void DropRelFileNodeBuffers(struct SMgrRelationData *smgr_reln, ForkNumber *forkNum,
|
||||
int nforks, BlockNumber *firstDelBlock);
|
||||
extern void DropRelFileNodesAllBuffers(struct SMgrRelationData **smgr_reln, int nnodes);
|
||||
extern void DropRelFileLocatorBuffers(struct SMgrRelationData *smgr_reln,
|
||||
ForkNumber *forkNum,
|
||||
int nforks, BlockNumber *firstDelBlock);
|
||||
extern void DropRelFileLocatorsAllBuffers(struct SMgrRelationData **smgr_reln,
|
||||
int nlocators);
|
||||
extern void DropDatabaseBuffers(Oid dbid);
|
||||
|
||||
#define RelationGetNumberOfBlocks(reln) \
|
||||
@@ -223,7 +225,7 @@ extern XLogRecPtr BufferGetLSNAtomic(Buffer buffer);
|
||||
extern void PrintPinnedBufs(void);
|
||||
#endif
|
||||
extern Size BufferShmemSize(void);
|
||||
extern void BufferGetTag(Buffer buffer, RelFileNode *rnode,
|
||||
extern void BufferGetTag(Buffer buffer, RelFileLocator *rlocator,
|
||||
ForkNumber *forknum, BlockNumber *blknum);
|
||||
|
||||
extern void MarkBufferDirtyHint(Buffer buffer, bool buffer_std);
|
||||
|
||||
Reference in New Issue
Block a user