Commita0ddcbe

Daniel Shelepanov

committed

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

This will help if and when fsm and vm files will be comressable.

1 parentc0ee9af commita0ddcbeCopy full SHA for a0ddcbe

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,6 @@ ptrack_mark_file(Oid dbOid, Oid tablespaceOid,`
`579`	`579`	`intoidchars;`
`580`	`580`	`charoidbuf[OIDCHARS+1];`
`581`	`581`	`#ifdefPGPRO_EE`
`582`		`-FileTypefile_type;`
`583`	`582`	`off_trel_size;`
`584`	`583`	`#endif`
`585`	`584`
`@@ -601,10 +600,10 @@ ptrack_mark_file(Oid dbOid, Oid tablespaceOid,`
`601`	`600`	`nodeRel(nodeOf(rnode))=atooid(oidbuf);`
`602`	`601`
`603`	`602`	`#ifdefPGPRO_EE`
`604`		`-file_type=file_type_from_path(filepath);`
`605`		`-`
`606`		`-if(is_cfs&& (file_type==FileTypeMain`
`607`		`-\|\|file_type==FileTypeMainMulti)) {`
	`603`	`+// if current tablespace is cfs-compressed and md_get_compressor_internal`
	`604`	`+// returns the type of the compressing algorithm for filepath, then it`
	`605`	`+// needs to be de-compressed to obtain its size`
	`606`	`+if(is_cfs&&md_get_compressor_internal(rnode.node,rnode.backend,forknum)!=0) {`
`608`	`607`	`rel_size=get_cfs_relation_file_decompressed_size(rnode,filepath,forknum);`
`609`	`608`
`610`	`609`	`if(rel_size== (off_t)-1) {`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,8 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`353`	`353`	`pfl->segno=0;`
`354`	`354`
`355`	`355`	`#ifdefPGPRO_EE`
`356`		`-pfl->is_cfs_compressed=is_cfs&&pfl->forknum==MAIN_FORKNUM;`
	`356`	`+pfl->is_cfs_compressed=is_cfs`
	`357`	`+&&md_get_compressor_internal(pfl->relnode,InvalidBackendId,pfl->forknum)!=0;`
`357`	`358`	`#endif`
`358`	`359`	`memcpy(oidbuf,de->d_name,oidchars);`
`359`	`360`	`oidbuf[oidchars]='\0';`

Comments

(0)