Commit57faaf3

committed

Use truncate(2) where appropriate.

When truncating files by name, use truncate(2). Windows hasn't got it,so keep our previous coding based on ftruncate(2) as a fallback.Discussion:https://postgr.es/m/16663-fe97ccf9932fc800%40postgresql.org

1 parent9f35f94 commit57faaf3Copy full SHA for 57faaf3

File tree

+29

-12

lines changed

+29

-12

lines changed

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -622,6 +622,33 @@ pg_flush_data(int fd, off_t offset, off_t nbytes)`
`622`	`622`	`#endif`
`623`	`623`	`}`
`624`	`624`
	`625`	`+/*`
	`626`	`+ * Truncate a file to a given length by name.`
	`627`	`+ */`
	`628`	`+int`
	`629`	`+pg_truncate(constchar*path,off_tlength)`
	`630`	`+{`
	`631`	`+#ifdefWIN32`
	`632`	`+intsave_errno;`
	`633`	`+intret;`
	`634`	`+intfd;`
	`635`	`+`
	`636`	`+fd=OpenTransientFile(path,O_RDWR \|PG_BINARY);`
	`637`	`+if (fd >=0)`
	`638`	`+{`
	`639`	`+ret=ftruncate(fd,0);`
	`640`	`+save_errno=errno;`
	`641`	`+CloseTransientFile(fd);`
	`642`	`+errno=save_errno;`
	`643`	`+}`
	`644`	`+else`
	`645`	`+ret=-1;`
	`646`	`+`
	`647`	`+returnret;`
	`648`	`+#else`
	`649`	`+returntruncate(path,length);`
	`650`	`+#endif`
	`651`	`+}`
`625`	`652`
`626`	`653`	`/*`
`627`	`654`	`* fsync_fname -- fsync a file or directory, handling errors properly`

Lines changed: 1 addition & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -294,19 +294,8 @@ do_truncate(const char *path)`
`294`	`294`	`{`
`295`	`295`	`intsave_errno;`
`296`	`296`	`intret;`
`297`		`-intfd;`
`298`	`297`
`299`		`-/* truncate(2) would be easier here, but Windows hasn't got it */`
`300`		`-fd=OpenTransientFile(path,O_RDWR \|PG_BINARY);`
`301`		`-if (fd >=0)`
`302`		`-{`
`303`		`-ret=ftruncate(fd,0);`
`304`		`-save_errno=errno;`
`305`		`-CloseTransientFile(fd);`
`306`		`-errno=save_errno;`
`307`		`-}`
`308`		`-else`
`309`		`-ret=-1;`
	`298`	`+ret=pg_truncate(path,0);`
`310`	`299`
`311`	`300`	`/* Log a warning here to avoid repetition in callers. */`
`312`	`301`	`if (ret<0&&errno!=ENOENT)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ extern intpg_fsync_no_writethrough(int fd);`
`153`	`153`	`externintpg_fsync_writethrough(intfd);`
`154`	`154`	`externintpg_fdatasync(intfd);`
`155`	`155`	`externvoidpg_flush_data(intfd,off_toffset,off_tamount);`
	`156`	`+externintpg_truncate(constchar*path,off_tlength);`
`156`	`157`	`externvoidfsync_fname(constchar*fname,boolisdir);`
`157`	`158`	`externintfsync_fname_ext(constchar*fname,boolisdir,boolignore_perm,intelevel);`
`158`	`159`	`externintdurable_rename(constcharoldfile,constcharnewfile,intloglevel);`

Comments

(0)