Commit04f0097

committed

[refer #PGPRO-1745] Check for existing file in fio_gzopen

1 parent3622aeb commit04f0097Copy full SHA for 04f0097

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1702,13 +1702,12 @@ fileEqualCRC(const char path1, const char path2, bool path2_is_compressed)`
`1702`	`1702`
`1703`	`1703`	`for (;;)`
`1704`	`1704`	`{`
`1705`		`-intread_len=0;`
`1706`		`-read_len=fio_gzread(gz_in,buf,sizeof(buf));`
	`1705`	`+intread_len=fio_gzread(gz_in,buf,sizeof(buf));`
`1707`	`1706`	`if (read_len <=0&& !fio_gzeof(gz_in))`
`1708`	`1707`	`/* An error occurred while reading the file */`
`1709`	`1708`	`elog(ERROR,`
`1710`		`-"Cannot compare WAL file \"%s\" with compressed \"%s\"",`
`1711`		`-path1,path2);`
	`1709`	`+"Cannot compare WAL file \"%s\" with compressed \"%s\": %d",`
	`1710`	`+path1,path2,read_len);`
`1712`	`1711`
`1713`	`1712`	`COMP_FILE_CRC32(true,crc2,buf,read_len);`
`1714`	`1713`	`if (fio_gzeof(gz_in)\|\|read_len==0)`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,14 @@ fio_gzopen(char const* path, char const* mode, int level, fio_location location)`
`768`	`768`	`if (rc==Z_OK)`
`769`	`769`	`{`
`770`	`770`	`gz->compress=1;`
`771`		`-gz->fd=fio_open(path,O_WRONLY\|O_CREAT\|O_TRUNC,location);`
	`771`	`+if (fio_access(path,F_OK,location)==0)`
	`772`	`+{`
	`773`	`+elog(LOG,"File %s exists",path);`
	`774`	`+free(gz);`
	`775`	`+errno=EEXIST;`
	`776`	`+returnNULL;`
	`777`	`+}`
	`778`	`+gz->fd=fio_open(path,O_WRONLY \|O_CREAT \|O_EXCL \|PG_BINARY,location);`
`772`	`779`	`}`
`773`	`780`	`}`
`774`	`781`	`else`
`@@ -780,7 +787,7 @@ fio_gzopen(char const* path, char const* mode, int level, fio_location location)`
`780`	`787`	`if (rc==Z_OK)`
`781`	`788`	`{`
`782`	`789`	`gz->compress=0;`
`783`		`-gz->fd=fio_open(path,O_RDONLY,location);`
	`790`	`+gz->fd=fio_open(path,O_RDONLY \|PG_BINARY,location);`
`784`	`791`	`}`
`785`	`792`	`}`
`786`	`793`	`if (rc!=Z_OK)`

Comments

(0)