Skip to content

Commit 9cbf6a5

Browse files
antamelantamel
committed
[PGPRO-6148] Rename RelFileNode references due to b0a55e43.
Tags: ptrack
1 parent 5714dd1 commit 9cbf6a5

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎datapagemap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef DATAPAGEMAP_H
1010
#define DATAPAGEMAP_H
1111

12-
#include "storage/relfilenode.h"
12+
#include "storage/relfilelocator.h"
1313
#include "storage/block.h"
1414

1515
struct datapagemap

‎engine.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ static void
501501
ptrack_mark_file(Oid dbOid, Oid tablespaceOid,
502502
const char *filepath, const char *filename)
503503
{
504-
RelFileNodeBackend rnode;
504+
RelFileLocatorBackend rnode;
505505
ForkNumber forknum;
506506
BlockNumber blkno,
507507
nblocks = 0;
@@ -516,22 +516,22 @@ ptrack_mark_file(Oid dbOid, Oid tablespaceOid,
516516
/* Mark of non-temporary relation */
517517
rnode.backend = InvalidBackendId;
518518

519-
rnode.node.dbNode = dbOid;
520-
rnode.node.spcNode = tablespaceOid;
519+
rnode.locator.dbOid = dbOid;
520+
rnode.locator.spcOid = tablespaceOid;
521521

522522
if (!parse_filename_for_nontemp_relation(filename, &oidchars, &forknum))
523523
return;
524524

525525
memcpy(oidbuf, filename, oidchars);
526526
oidbuf[oidchars] = '\0';
527-
rnode.node.relNode = atooid(oidbuf);
527+
rnode.locator.relNumber = atooid(oidbuf);
528528

529529
/* Compute number of blocks based on file size */
530530
if (stat(filepath, &stat_buf) == 0)
531531
nblocks = stat_buf.st_size / BLCKSZ;
532532

533533
elog(DEBUG1, "ptrack_mark_file %s, nblocks %u rnode db %u spc %u rel %u, forknum %d",
534-
filepath, nblocks, rnode.node.dbNode, rnode.node.spcNode, rnode.node.relNode, forknum);
534+
filepath, nblocks, rnode.locator.dbOid, rnode.locator.spcOid, rnode.locator.relNumber, forknum);
535535

536536
for (blkno = 0; blkno < nblocks; blkno++)
537537
ptrack_mark_block(rnode, forknum, blkno);
@@ -591,7 +591,7 @@ ptrack_walkdir(const char *path, Oid tablespaceOid, Oid dbOid)
591591
* Mark modified block in ptrack_map.
592592
*/
593593
void
594-
ptrack_mark_block(RelFileNodeBackend smgr_rnode,
594+
ptrack_mark_block(RelFileLocatorBackend smgr_rnode,
595595
ForkNumber forknum, BlockNumber blocknum)
596596
{
597597
PtBlockId bid;
@@ -612,7 +612,7 @@ ptrack_mark_block(RelFileNodeBackend smgr_rnode,
612612
* relations */
613613
return;
614614

615-
bid.relnode = smgr_rnode.node;
615+
bid.relnode = smgr_rnode.locator;
616616
bid.forknum = forknum;
617617
bid.blocknum = blocknum;
618618

‎engine.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/* #include "port/atomics.h" */
2020
/* #include "storage/block.h" */
2121
/* #include "storage/buf.h" */
22-
/* #include "storage/relfilenode.h" */
22+
/* #include "storage/relfilelocator.h" */
2323
/* #include "storage/smgr.h" */
2424
/* #include "utils/relcache.h" */
2525
#include "access/hash.h"
@@ -108,7 +108,7 @@ extern void ptrackCleanFiles(void);
108108
extern void assign_ptrack_map_size(int newval, void *extra);
109109

110110
extern void ptrack_walkdir(const char *path, Oid tablespaceOid, Oid dbOid);
111-
extern void ptrack_mark_block(RelFileNodeBackend smgr_rnode,
111+
extern void ptrack_mark_block(RelFileLocatorBackend smgr_rnode,
112112
ForkNumber forkno, BlockNumber blkno);
113113

114114
#endif /* PTRACK_ENGINE_H */

‎ptrack.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ void _PG_fini(void);
7373

7474
static void ptrack_shmem_startup_hook(void);
7575
static void ptrack_copydir_hook(const char *path);
76-
static void ptrack_mdwrite_hook(RelFileNodeBackend smgr_rnode,
76+
static void ptrack_mdwrite_hook(RelFileLocatorBackend smgr_rnode,
7777
ForkNumber forkno, BlockNumber blkno);
78-
static void ptrack_mdextend_hook(RelFileNodeBackend smgr_rnode,
78+
static void ptrack_mdextend_hook(RelFileLocatorBackend smgr_rnode,
7979
ForkNumber forkno, BlockNumber blkno);
8080
static void ptrack_ProcessSyncRequests_hook(void);
8181

@@ -265,7 +265,7 @@ ptrack_copydir_hook(const char *path)
265265
}
266266

267267
static void
268-
ptrack_mdwrite_hook(RelFileNodeBackend smgr_rnode,
268+
ptrack_mdwrite_hook(RelFileLocatorBackend smgr_rnode,
269269
ForkNumber forknum, BlockNumber blocknum)
270270
{
271271
ptrack_mark_block(smgr_rnode, forknum, blocknum);
@@ -275,7 +275,7 @@ ptrack_mdwrite_hook(RelFileNodeBackend smgr_rnode,
275275
}
276276

277277
static void
278-
ptrack_mdextend_hook(RelFileNodeBackend smgr_rnode,
278+
ptrack_mdextend_hook(RelFileLocatorBackend smgr_rnode,
279279
ForkNumber forknum, BlockNumber blocknum)
280280
{
281281
ptrack_mark_block(smgr_rnode, forknum, blocknum);
@@ -356,16 +356,16 @@ ptrack_gather_filelist(List **filelist, char *path, Oid spcOid, Oid dbOid)
356356

357357
memcpy(oidbuf, de->d_name, oidchars);
358358
oidbuf[oidchars] = '\0';
359-
pfl->relnode.relNode = atooid(oidbuf);
360-
pfl->relnode.dbNode = dbOid;
361-
pfl->relnode.spcNode = spcOid == InvalidOid ? DEFAULTTABLESPACE_OID : spcOid;
362-
pfl->path = GetRelationPath(dbOid, pfl->relnode.spcNode,
363-
pfl->relnode.relNode, InvalidBackendId, pfl->forknum);
359+
pfl->relnode.relNumber = atooid(oidbuf);
360+
pfl->relnode.dbOid = dbOid;
361+
pfl->relnode.spcOid = spcOid == InvalidOid ? DEFAULTTABLESPACE_OID : spcOid;
362+
pfl->path = GetRelationPath(dbOid, pfl->relnode.spcOid,
363+
pfl->relnode.relNumber, InvalidBackendId, pfl->forknum);
364364

365365
*filelist = lappend(*filelist, pfl);
366366

367367
elog(DEBUG3, "ptrack: added file %s of rel %u to file list",
368-
pfl->path, pfl->relnode.relNode);
368+
pfl->path, pfl->relnode.relNumber);
369369
}
370370
}
371371
else if (S_ISDIR(fst.st_mode))
@@ -426,9 +426,9 @@ ptrack_filelist_getnext(PtScanCtx * ctx)
426426
ctx->relpath = pfl->path;
427427
}
428428

429-
ctx->bid.relnode.spcNode = pfl->relnode.spcNode;
430-
ctx->bid.relnode.dbNode = pfl->relnode.dbNode;
431-
ctx->bid.relnode.relNode = pfl->relnode.relNode;
429+
ctx->bid.relnode.spcOid = pfl->relnode.spcOid;
430+
ctx->bid.relnode.dbOid = pfl->relnode.dbOid;
431+
ctx->bid.relnode.relNumber = pfl->relnode.relNumber;
432432
ctx->bid.forknum = pfl->forknum;
433433
ctx->bid.blocknum = 0;
434434

‎ptrack.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "access/xlogdefs.h"
1919
#include "storage/block.h"
2020
#include "storage/buf.h"
21-
#include "storage/relfilenode.h"
21+
#include "storage/relfilelocator.h"
2222
#include "storage/smgr.h"
2323
#include "utils/relcache.h"
2424

@@ -34,7 +34,7 @@
3434
*/
3535
typedef struct PtBlockId
3636
{
37-
RelFileNode relnode;
37+
RelFileLocator relnode;
3838
ForkNumber forknum;
3939
BlockNumber blocknum;
4040
} PtBlockId;
@@ -56,7 +56,7 @@ typedef struct PtScanCtx
5656
*/
5757
typedef struct PtrackFileList_i
5858
{
59-
RelFileNode relnode;
59+
RelFileLocator relnode;
6060
ForkNumber forknum;
6161
int segno;
6262
char *path;

0 commit comments

Comments
 (0)