[PBCKP-278] Full 16devel compatibility (so far)

Daniel Shelepanov · Daniel Shelepanov · commit 2810f4c10bc1 · 2022-12-02T21:29:03.000+03:00
diff --git a/engine.c b/engine.c
@@ -120,7 +120,7 @@ get_cfs_relation_file_decompressed_size(RelFileNodeBackend rnode, const char *fu
 	int      compressor;
 	off_t    size;
 
-	compressor = md_get_compressor_internal(rnode.node, rnode.backend, forknum);
+	compressor = md_get_compressor_internal(nodeOf(rnode), rnode.backend, forknum);
 	fd = PathNameOpenFile(fullpath, O_RDWR | PG_BINARY, compressor);
 
 	if(fd < 0)
@@ -580,7 +580,7 @@ ptrack_mark_file(Oid dbOid, Oid tablespaceOid,
 	// if current tablespace is cfs-compressed and md_get_compressor_internal
 	// returns the type of the compressing algorithm for filepath, then it
 	// needs to be de-compressed to obtain its size
-	if(is_cfs && md_get_compressor_internal(rnode.node, rnode.backend, forknum) != 0) {
+	if(is_cfs && md_get_compressor_internal(nodeOf(rnode), rnode.backend, forknum) != 0) {
 		rel_size = get_cfs_relation_file_decompressed_size(rnode, filepath, forknum);
 
 		if(rel_size == (off_t)-1) {
diff --git a/ptrack.c b/ptrack.c
@@ -456,7 +456,7 @@ ptrack_filelist_getnext(PtScanCtx * ctx)
 	}
 
 #if CFS_SUPPORT
-	rnodebackend.node = ctx->bid.relnode;
+	nodeOf(rnodebackend) = ctx->bid.relnode;
 	rnodebackend.backend = InvalidBackendId;
 
 	if(pfl->is_cfs_compressed) {

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ ptrack_filelist_getnext(PtScanCtx * ctx)`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`#if CFS_SUPPORT`
`459`		`- rnodebackend.node = ctx->bid.relnode;`
	`459`	`+ nodeOf(rnodebackend) = ctx->bid.relnode;`
`460`	`460`	`rnodebackend.backend = InvalidBackendId;`
`461`	`461`
`462`	`462`	`if(pfl->is_cfs_compressed) {`