Commit166c3dc

committed

Merge remote-tracking branch 'origin/ce'

2 parents89624b9 +8f5561f commit166c3dcCopy full SHA for 166c3dc

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,10 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`290`	`290`	`{`
`291`	`291`	`DIR*dir;`
`292`	`292`	`structdirent*de;`
	`293`	`+#ifPG_VERSION_NUM >=180000`
	`294`	`+RelPathStrstr;`
	`295`	`+#endif`
	`296`	`+`
`293`	`297`	`dir=AllocateDir(path);`
`294`	`298`
`295`	`299`	`while ((de=ReadDirExtended(dir,path,LOG))!=NULL)`
`@@ -364,8 +368,14 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`364`	`368`	`#endif`
`365`	`369`	`nodeDb(pfl->relnode)=dbOid;`
`366`	`370`	`nodeSpc(pfl->relnode)=spcOid==InvalidOid ?DEFAULTTABLESPACE_OID :spcOid;`
	`371`	`+#ifPG_VERSION_NUM >=180000`
	`372`	`+str=GetRelationPath(dbOid,nodeSpc(pfl->relnode),`
	`373`	`+nodeRel(pfl->relnode),InvalidBackendId,pfl->forknum);`
	`374`	`+pfl->path=pstrdup(str.str);`
	`375`	`+#else`
`367`	`376`	`pfl->path=GetRelationPath(dbOid,nodeSpc(pfl->relnode),`
`368`	`377`	`nodeRel(pfl->relnode),InvalidBackendId,pfl->forknum);`
	`378`	`+#endif`
`369`	`379`
`370`	`380`	`filelist=lappend(filelist,pfl);`
`371`	`381`

Comments

(0)