[PGPRO-6148] Rename RelFileNode references due to b0a55e43.

antamel · antamel · commit 9cbf6a519489 · 2022-08-16T02:19:42.000+03:00
Tags: ptrack
diff --git a/datapagemap.h b/datapagemap.h
@@ -9,7 +9,7 @@
 #ifndef DATAPAGEMAP_H
 #define DATAPAGEMAP_H
 
-#include "storage/relfilenode.h"
+#include "storage/relfilelocator.h"
 #include "storage/block.h"
 
 struct datapagemap
diff --git a/engine.c b/engine.c
@@ -501,7 +501,7 @@ static void
 ptrack_mark_file(Oid dbOid, Oid tablespaceOid,
 				 const char *filepath, const char *filename)
 {
-	RelFileNodeBackend rnode;
+	RelFileLocatorBackend rnode;
 	ForkNumber	forknum;
 	BlockNumber blkno,
 				nblocks = 0;
@@ -516,22 +516,22 @@ ptrack_mark_file(Oid dbOid, Oid tablespaceOid,
 	/* Mark of non-temporary relation */
 	rnode.backend = InvalidBackendId;
 
-	rnode.node.dbNode = dbOid;
-	rnode.node.spcNode = tablespaceOid;
+	rnode.locator.dbOid = dbOid;
+	rnode.locator.spcOid = tablespaceOid;
 
 	if (!parse_filename_for_nontemp_relation(filename, &oidchars, &forknum))
 		return;
 
 	memcpy(oidbuf, filename, oidchars);
 	oidbuf[oidchars] = '\0';
-	rnode.node.relNode = atooid(oidbuf);
+	rnode.locator.relNumber = atooid(oidbuf);
 
 	/* Compute number of blocks based on file size */
 	if (stat(filepath, &stat_buf) == 0)
 		nblocks = stat_buf.st_size / BLCKSZ;
 
 	elog(DEBUG1, "ptrack_mark_file %s, nblocks %u rnode db %u spc %u rel %u, forknum %d",
-		 filepath, nblocks, rnode.node.dbNode, rnode.node.spcNode, rnode.node.relNode, forknum);
+		 filepath, nblocks, rnode.locator.dbOid, rnode.locator.spcOid, rnode.locator.relNumber, forknum);
 
 	for (blkno = 0; blkno < nblocks; blkno++)
 		ptrack_mark_block(rnode, forknum, blkno);
@@ -591,7 +591,7 @@ ptrack_walkdir(const char *path, Oid tablespaceOid, Oid dbOid)
  * Mark modified block in ptrack_map.
  */
 void
-ptrack_mark_block(RelFileNodeBackend smgr_rnode,
+ptrack_mark_block(RelFileLocatorBackend smgr_rnode,
 				  ForkNumber forknum, BlockNumber blocknum)
 {
 	PtBlockId	bid;
@@ -612,7 +612,7 @@ ptrack_mark_block(RelFileNodeBackend smgr_rnode,
 													* relations */
 		return;
 
-	bid.relnode = smgr_rnode.node;
+	bid.relnode = smgr_rnode.locator;
 	bid.forknum = forknum;
 	bid.blocknum = blocknum;
 
diff --git a/engine.h b/engine.h
@@ -19,7 +19,7 @@
 /*  #include "port/atomics.h" */
 /*  #include "storage/block.h" */
 /*  #include "storage/buf.h" */
-/*  #include "storage/relfilenode.h" */
+/*  #include "storage/relfilelocator.h" */
 /*  #include "storage/smgr.h" */
 /*  #include "utils/relcache.h" */
 #include "access/hash.h"
@@ -108,7 +108,7 @@ extern void ptrackCleanFiles(void);
 extern void assign_ptrack_map_size(int newval, void *extra);
 
 extern void ptrack_walkdir(const char *path, Oid tablespaceOid, Oid dbOid);
-extern void ptrack_mark_block(RelFileNodeBackend smgr_rnode,
+extern void ptrack_mark_block(RelFileLocatorBackend smgr_rnode,
 							  ForkNumber forkno, BlockNumber blkno);
 
 #endif							/* PTRACK_ENGINE_H */
diff --git a/ptrack.c b/ptrack.c
@@ -73,9 +73,9 @@ void		_PG_fini(void);
 
 static void ptrack_shmem_startup_hook(void);
 static void ptrack_copydir_hook(const char *path);
-static void ptrack_mdwrite_hook(RelFileNodeBackend smgr_rnode,
+static void ptrack_mdwrite_hook(RelFileLocatorBackend smgr_rnode,
 								ForkNumber forkno, BlockNumber blkno);
-static void ptrack_mdextend_hook(RelFileNodeBackend smgr_rnode,
+static void ptrack_mdextend_hook(RelFileLocatorBackend smgr_rnode,
 								 ForkNumber forkno, BlockNumber blkno);
 static void ptrack_ProcessSyncRequests_hook(void);
 
@@ -265,7 +265,7 @@ ptrack_copydir_hook(const char *path)
 }
 
 static void
-ptrack_mdwrite_hook(RelFileNodeBackend smgr_rnode,
+ptrack_mdwrite_hook(RelFileLocatorBackend smgr_rnode,
 					ForkNumber forknum, BlockNumber blocknum)
 {
 	ptrack_mark_block(smgr_rnode, forknum, blocknum);
@@ -275,7 +275,7 @@ ptrack_mdwrite_hook(RelFileNodeBackend smgr_rnode,
 }
 
 static void
-ptrack_mdextend_hook(RelFileNodeBackend smgr_rnode,
+ptrack_mdextend_hook(RelFileLocatorBackend smgr_rnode,
 					 ForkNumber forknum, BlockNumber blocknum)
 {
 	ptrack_mark_block(smgr_rnode, forknum, blocknum);
@@ -356,16 +356,16 @@ ptrack_gather_filelist(List **filelist, char *path, Oid spcOid, Oid dbOid)
 
 				memcpy(oidbuf, de->d_name, oidchars);
 				oidbuf[oidchars] = '\0';
-				pfl->relnode.relNode = atooid(oidbuf);
-				pfl->relnode.dbNode = dbOid;
-				pfl->relnode.spcNode = spcOid == InvalidOid ? DEFAULTTABLESPACE_OID : spcOid;
-				pfl->path = GetRelationPath(dbOid, pfl->relnode.spcNode,
-											pfl->relnode.relNode, InvalidBackendId, pfl->forknum);
+				pfl->relnode.relNumber = atooid(oidbuf);
+				pfl->relnode.dbOid = dbOid;
+				pfl->relnode.spcOid = spcOid == InvalidOid ? DEFAULTTABLESPACE_OID : spcOid;
+				pfl->path = GetRelationPath(dbOid, pfl->relnode.spcOid,
+											pfl->relnode.relNumber, InvalidBackendId, pfl->forknum);
 
 				*filelist = lappend(*filelist, pfl);
 
 				elog(DEBUG3, "ptrack: added file %s of rel %u to file list",
-					 pfl->path, pfl->relnode.relNode);
+					 pfl->path, pfl->relnode.relNumber);
 			}
 		}
 		else if (S_ISDIR(fst.st_mode))
@@ -426,9 +426,9 @@ ptrack_filelist_getnext(PtScanCtx * ctx)
 		ctx->relpath = pfl->path;
 	}
 
-	ctx->bid.relnode.spcNode = pfl->relnode.spcNode;
-	ctx->bid.relnode.dbNode = pfl->relnode.dbNode;
-	ctx->bid.relnode.relNode = pfl->relnode.relNode;
+	ctx->bid.relnode.spcOid = pfl->relnode.spcOid;
+	ctx->bid.relnode.dbOid = pfl->relnode.dbOid;
+	ctx->bid.relnode.relNumber = pfl->relnode.relNumber;
 	ctx->bid.forknum = pfl->forknum;
 	ctx->bid.blocknum = 0;
 
diff --git a/ptrack.h b/ptrack.h
@@ -18,7 +18,7 @@
 #include "access/xlogdefs.h"
 #include "storage/block.h"
 #include "storage/buf.h"
-#include "storage/relfilenode.h"
+#include "storage/relfilelocator.h"
 #include "storage/smgr.h"
 #include "utils/relcache.h"
 
@@ -34,7 +34,7 @@
  */
 typedef struct PtBlockId
 {
-	RelFileNode relnode;
+	RelFileLocator relnode;
 	ForkNumber	forknum;
 	BlockNumber blocknum;
 }			PtBlockId;
@@ -56,7 +56,7 @@ typedef struct PtScanCtx
  */
 typedef struct PtrackFileList_i
 {
-	RelFileNode relnode;
+	RelFileLocator relnode;
 	ForkNumber	forknum;
 	int			segno;
 	char	   *path;
