Fix PathNameOpenFile

knizhnik · knizhnik · commit 9a58e00a2246 · 2017-06-20T15:58:23.000+03:00
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1341,8 +1341,8 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 
 	if (fileFlags & PG_COMPRESSION)
 	{
-		char* mapFileName = psprintf("%s.cfm", vfdP->fileName);
-		vfdP->md = BasicOpenFile(mapFileName, vfdP->fileFlags & ~PG_COMPRESSION, vfdP->fileMode);
+		char* mapFileName = psprintf("%s.cfm", fileName);
+		vfdP->md = BasicOpenFile(mapFileName, fileFlags, fileMode);
 		pfree(mapFileName);
 		if (vfdP->md < 0)
 		{
@@ -1362,8 +1362,7 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 		vfdP->generation = vfdP->map->generation;
 		pg_read_barrier();
 
-		vfdP->fd = BasicOpenFile(vfdP->fileName, vfdP->fileFlags,
-								 vfdP->fileMode);
+		vfdP->fd = BasicOpenFile(fileName, fileFlags, fileMode);
 		if (vfdP->fd < 0)
 		{
 			save_errno = errno;

Original file line number	Diff line number	Diff line change
`@@ -1341,8 +1341,8 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)`
`1341`	`1341`
`1342`	`1342`	`if (fileFlags & PG_COMPRESSION)`
`1343`	`1343`	`{`
`1344`		`- char* mapFileName = psprintf("%s.cfm", vfdP->fileName);`
`1345`		`- vfdP->md = BasicOpenFile(mapFileName, vfdP->fileFlags & ~PG_COMPRESSION, vfdP->fileMode);`
	`1344`	`+ char* mapFileName = psprintf("%s.cfm", fileName);`
	`1345`	`+ vfdP->md = BasicOpenFile(mapFileName, fileFlags, fileMode);`
`1346`	`1346`	`pfree(mapFileName);`
`1347`	`1347`	`if (vfdP->md < 0)`
`1348`	`1348`	`{`
`@@ -1362,8 +1362,7 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)`
`1362`	`1362`	`vfdP->generation = vfdP->map->generation;`
`1363`	`1363`	`pg_read_barrier();`
`1364`	`1364`
`1365`		`- vfdP->fd = BasicOpenFile(vfdP->fileName, vfdP->fileFlags,`
`1366`		`- vfdP->fileMode);`
	`1365`	`+ vfdP->fd = BasicOpenFile(fileName, fileFlags, fileMode);`
`1367`	`1366`	`if (vfdP->fd < 0)`
`1368`	`1367`	`{`
`1369`	`1368`	`save_errno = errno;`