Fix PathNameOpenFile(

knizhnik · knizhnik · commit e2b625715f0a · 2017-06-20T19:14:59.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -873,7 +873,7 @@ static bool cfs_gc_file(char* map_path, bool background)
 		fd2 = -1;
 
 		/* Persist copy of map file */
-		if (!cfs_write_file(md2, &newMap, sizeof(FileMap)))
+		if (!cfs_write_file(md2, newMap, sizeof(FileMap)))
 		{
 			elog(WARNING, "CFS failed to write file %s: %m", map_bck_path);
 			goto Cleanup;
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1071,7 +1071,7 @@ LruInsert(File file)
 		if (vfdP->fileFlags & PG_COMPRESSION)
 		{
 			char* mapFileName = psprintf("%s.cfm", vfdP->fileName);
-			vfdP->md = BasicOpenFile(mapFileName, vfdP->fileFlags & ~PG_COMPRESSION, vfdP->fileMode);
+			vfdP->md = BasicOpenFile(mapFileName, vfdP->fileFlags, vfdP->fileMode);
 			pfree(mapFileName);
 			if (vfdP->md < 0)
 			{
@@ -1342,7 +1342,7 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 	if (fileFlags & PG_COMPRESSION)
 	{
 		char* mapFileName = psprintf("%s.cfm", fileName);
-		vfdP->md = BasicOpenFile(mapFileName, fileFlags, fileMode);
+		vfdP->md = BasicOpenFile(mapFileName, O_CREAT|O_RDWR|(fileFlags & ~O_EXCL), fileMode);
 		pfree(mapFileName);
 		if (vfdP->md < 0)
 		{

Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,7 @@ static bool cfs_gc_file(char* map_path, bool background)`
`873`	`873`	`fd2 = -1;`
`874`	`874`
`875`	`875`	`/* Persist copy of map file */`
`876`		`- if (!cfs_write_file(md2, &newMap, sizeof(FileMap)))`
	`876`	`+ if (!cfs_write_file(md2, newMap, sizeof(FileMap)))`
`877`	`877`	`{`
`878`	`878`	`elog(WARNING, "CFS failed to write file %s: %m", map_bck_path);`
`879`	`879`	`goto Cleanup;`
Original file line number	Diff line number	Diff line change
`@@ -1071,7 +1071,7 @@ LruInsert(File file)`
`1071`	`1071`	`if (vfdP->fileFlags & PG_COMPRESSION)`
`1072`	`1072`	`{`
`1073`	`1073`	`char* mapFileName = psprintf("%s.cfm", vfdP->fileName);`
`1074`		`- vfdP->md = BasicOpenFile(mapFileName, vfdP->fileFlags & ~PG_COMPRESSION, vfdP->fileMode);`
	`1074`	`+ vfdP->md = BasicOpenFile(mapFileName, vfdP->fileFlags, vfdP->fileMode);`
`1075`	`1075`	`pfree(mapFileName);`
`1076`	`1076`	`if (vfdP->md < 0)`
`1077`	`1077`	`{`
`@@ -1342,7 +1342,7 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)`
`1342`	`1342`	`if (fileFlags & PG_COMPRESSION)`
`1343`	`1343`	`{`
`1344`	`1344`	`char* mapFileName = psprintf("%s.cfm", fileName);`
`1345`		`- vfdP->md = BasicOpenFile(mapFileName, fileFlags, fileMode);`
	`1345`	`+ vfdP->md = BasicOpenFile(mapFileName, O_CREAT\|O_RDWR\|(fileFlags & ~O_EXCL), fileMode);`
`1346`	`1346`	`pfree(mapFileName);`
`1347`	`1347`	`if (vfdP->md < 0)`
`1348`	`1348`	`{`