NotificationsYou must be signed in to change notification settings
Fork16
Star52

Commit9c94e90

Daniel Shelepanov

committed

[PBCKP-563] lstat optimized

in case DT_REG is defined and the PG_VERSION_NUM is less than 13 it ispossible to replace lstat call with DT_REG check (readdir call isrequired) and state that it is either a regular file or a directory.Symlinks to tablespaces assumed to be dirs.

1 parentf4c24d6 commit9c94e90Copy full SHA for 9c94e90

File tree

3 files changed

+46

-3

lines changed

3 files changed

+46

-3

lines changed

`‎engine.c‎`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,10 @@ ptrack_walkdir(const char *path, Oid tablespaceOid, Oid dbOid)`
`641`	`641`	`{`
`642`	`642`	`charsubpath[MAXPGPATH*2];`
`643`	`643`	`structstatfst;`
`644`		`-intsret;`
	`644`	`+intsret=0;`
	`645`	`+#ifSIMPLE_STAT`
	`646`	`+boolassumeDir= false;`
	`647`	`+#endif`
`645`	`648`
`646`	`649`	`CHECK_FOR_INTERRUPTS();`
`647`	`650`
`@@ -651,7 +654,14 @@ ptrack_walkdir(const char *path, Oid tablespaceOid, Oid dbOid)`
`651`	`654`
`652`	`655`	`snprintf(subpath,sizeof(subpath),"%s/%s",path,de->d_name);`
`653`	`656`
	`657`	`+#ifSIMPLE_STAT`
	`658`	`+if (de->d_type==DT_REG)`
	`659`	`+sret=stat(subpath,&fst);`
	`660`	`+else`
	`661`	`+assumeDir= true;`
	`662`	`+#else`
`654`	`663`	`sret=lstat(subpath,&fst);`
	`664`	`+#endif`
`655`	`665`
`656`	`666`	`if (sret<0)`
`657`	`667`	`{`
`@@ -661,7 +671,11 @@ ptrack_walkdir(const char *path, Oid tablespaceOid, Oid dbOid)`
`661`	`671`	`continue;`
`662`	`672`	`}`
`663`	`673`
	`674`	`+#ifSIMPLE_STAT`
	`675`	`+if (!assumeDir)`
	`676`	`+#else`
`664`	`677`	`if (S_ISREG(fst.st_mode))`
	`678`	`+#endif`
`665`	`679`	`#ifCFS_SUPPORT`
`666`	`680`	`ptrack_mark_file(dbOid,tablespaceOid,subpath,de->d_name,is_cfs);`
`667`	`681`	`#else`

`‎engine.h‎`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,11 @@`
`49`	`49`	`#defineCFS_SUPPORT 1`
`50`	`50`	`#endif`
`51`	`51`
	`52`	`+/* lstat optimization */`
	`53`	`+#if defined(DT_REG)&&PG_VERSION_NUM<130000`
	`54`	`+#defineSIMPLE_STAT 1`
	`55`	`+#endif`
	`56`	`+`
`52`	`57`	`/*`
`53`	`58`	`* Header of ptrack map.`
`54`	`59`	`*/`

`‎ptrack.c‎`

Lines changed: 26 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,10 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`306`	`306`	`{`
`307`	`307`	`charsubpath[MAXPGPATH*2];`
`308`	`308`	`structstatfst;`
`309`		`-intsret;`
	`309`	`+intsret=0;`
	`310`	`+#ifSIMPLE_STAT`
	`311`	`+boolassumeDir= false;`
	`312`	`+#endif`
`310`	`313`
`311`	`314`	`CHECK_FOR_INTERRUPTS();`
`312`	`315`
`@@ -317,8 +320,15 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`317`	`320`	`continue;`
`318`	`321`
`319`	`322`	`snprintf(subpath,sizeof(subpath),"%s/%s",path,de->d_name);`
`320`		`-`
	`323`	`+#ifSIMPLE_STAT`
	`324`	`+if (de->d_type==DT_REG)`
	`325`	`+sret=stat(subpath,&fst);`
	`326`	`+else`
	`327`	`+assumeDir= true;`
	`328`	`+#else`
`321`	`329`	`sret=lstat(subpath,&fst);`
	`330`	`+#endif`
	`331`	`+`
`322`	`332`
`323`	`333`	`if (sret<0)`
`324`	`334`	`{`
`@@ -328,7 +338,11 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`328`	`338`	`continue;`
`329`	`339`	`}`
`330`	`340`
	`341`	`+#ifSIMPLE_STAT`
	`342`	`+if (!assumeDir)`
	`343`	`+#else`
`331`	`344`	`if (S_ISREG(fst.st_mode))`
	`345`	`+#endif`
`332`	`346`	`{`
`333`	`347`	`if (fst.st_size==0)`
`334`	`348`	`{`
`@@ -375,7 +389,12 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`375`	`389`	`pfl->path,nodeRel(pfl->relnode));`
`376`	`390`	`}`
`377`	`391`	`}`
	`392`	`+#ifSIMPLE_STAT`
	`393`	`+else`
	`394`	`+{`
	`395`	`+#else`
`378`	`396`	`elseif (S_ISDIR(fst.st_mode))`
	`397`	`+#endif`
`379`	`398`	`{`
`380`	`399`	`if (strspn(de->d_name+1,"0123456789")==strlen(de->d_name+1)`
`381`	`400`	`&&dbOid==InvalidOid)`
`@@ -384,10 +403,12 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`384`	`403`	`ptrack_gather_filelist(filelist,subpath,spcOid,InvalidOid);`
`385`	`404`	`}`
`386`	`405`	`/* TODO: is it enough to properly check symlink support? */`
	`406`	`+#if !SIMPLE_STAT`
`387`	`407`	`#if !defined(WIN32)\|\| (PG_VERSION_NUM >=160000)`
`388`	`408`	`elseif (S_ISLNK(fst.st_mode))`
`389`	`409`	`#else`
`390`	`410`	`elseif (pgwin32_is_junction(subpath))`
	`411`	`+#endif`
`391`	`412`	`#endif`
`392`	`413`	`{`
`393`	`414`	`/*`
`@@ -397,6 +418,9 @@ ptrack_gather_filelist(List *filelist, char path, Oid spcOid, Oid dbOid)`
`397`	`418`	`if (strspn(de->d_name+1,"0123456789")==strlen(de->d_name+1))`
`398`	`419`	`ptrack_gather_filelist(filelist,subpath,atooid(de->d_name),InvalidOid);`
`399`	`420`	`}`
	`421`	`+#ifSIMPLE_STAT`
	`422`	`+}`
	`423`	`+#endif`
`400`	`424`	`}`
`401`	`425`
`402`	`426`	`FreeDir(dir);/* we ignore any error here */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9c94e90

File tree

3 files changed

3 files changed

`‎engine.c‎`

`‎engine.h‎`

`‎ptrack.c‎`

0 commit comments