[PBCKP-278] md_get_compressor_internal is now used to determine whether the file is compressed

Daniel Shelepanov · Daniel Shelepanov · commit a0ddcbeb8898 · 2022-11-10T18:20:10.000+03:00
This will help if and when fsm and vm files will be comressable.
diff --git a/engine.c b/engine.c
@@ -579,7 +579,6 @@ ptrack_mark_file(Oid dbOid, Oid tablespaceOid,
 	int			oidchars;
 	char		oidbuf[OIDCHARS + 1];
 #ifdef PGPRO_EE
-	FileType    file_type;
 	off_t       rel_size;
 #endif
 
@@ -601,10 +600,10 @@ ptrack_mark_file(Oid dbOid, Oid tablespaceOid,
 	nodeRel(nodeOf(rnode)) = atooid(oidbuf);
 
 #ifdef PGPRO_EE
-	file_type = file_type_from_path(filepath);
-
-	if(is_cfs && (file_type == FileTypeMain 
-			|| file_type == FileTypeMainMulti)) {
+	// 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) {
 		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
@@ -353,7 +353,8 @@ ptrack_gather_filelist(List **filelist, char *path, Oid spcOid, Oid dbOid)
 					pfl->segno = 0;
 
 #ifdef PGPRO_EE
-				pfl->is_cfs_compressed = is_cfs && pfl->forknum == MAIN_FORKNUM;
+				pfl->is_cfs_compressed = is_cfs
+				&& md_get_compressor_internal(pfl->relnode, InvalidBackendId, pfl->forknum) != 0;
 #endif
 				memcpy(oidbuf, de->d_name, oidchars);
 				oidbuf[oidchars] = '\0';
