Fix CFS for new pg_upgrade copyFile and linkFile syntax

vbwagner · vbwagner · commit 71d2c40301e8 · 2016-10-24T17:56:30.000+03:00
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
@@ -145,21 +145,15 @@ static void transfer_compression_files(FileNameMap *map)
 		{
 			pg_log(PG_VERBOSE, "copying \"%s\" to \"%s\"\n", old_file, new_file);
 
-			msg = copyFile(old_file, new_file);
+			copyFile(old_file, new_file, map->nspname, map->relname);
 
-			if (msg)
-				pg_fatal("error while copying tablespace (\"%s\" to \"%s\"): %s\n",
-						 old_file, new_file, msg);
 		}
 		else
 		{
 			pg_log(PG_VERBOSE, "linking \"%s\" to \"%s\"\n", old_file, new_file);
 
-			msg = linkFile(old_file, new_file);
+			linkFile(old_file, new_file, map->nspname, map->relname);
 
-			if (msg)
-				pg_fatal("error while creating link for tablespace (\"%s\" to \"%s\"): %s\n",
-						 old_file, new_file, msg);
 		}
 
 		transfer_relfile(map, ".cfm", false);

Original file line number	Diff line number	Diff line change
`@@ -145,21 +145,15 @@ static void transfer_compression_files(FileNameMap *map)`
`145`	`145`	`{`
`146`	`146`	`pg_log(PG_VERBOSE, "copying \"%s\" to \"%s\"\n", old_file, new_file);`
`147`	`147`
`148`		`- msg = copyFile(old_file, new_file);`
	`148`	`+ copyFile(old_file, new_file, map->nspname, map->relname);`
`149`	`149`
`150`		`- if (msg)`
`151`		`- pg_fatal("error while copying tablespace (\"%s\" to \"%s\"): %s\n",`
`152`		`- old_file, new_file, msg);`
`153`	`150`	`}`
`154`	`151`	`else`
`155`	`152`	`{`
`156`	`153`	`pg_log(PG_VERBOSE, "linking \"%s\" to \"%s\"\n", old_file, new_file);`
`157`	`154`
`158`		`- msg = linkFile(old_file, new_file);`
	`155`	`+ linkFile(old_file, new_file, map->nspname, map->relname);`
`159`	`156`
`160`		`- if (msg)`
`161`		`- pg_fatal("error while creating link for tablespace (\"%s\" to \"%s\"): %s\n",`
`162`		`- old_file, new_file, msg);`
`163`	`157`	`}`
`164`	`158`
`165`	`159`	`transfer_relfile(map, ".cfm", false);`