Bug fix. Do not sort links list within read_tablespace_map it sould do callers

za-arthur · za-arthur · commit 61cbf0c4596c · 2018-09-26T14:00:00.000+03:00
diff --git a/src/dir.c b/src/dir.c
@@ -918,6 +918,8 @@ create_data_directories(const char *data_dir, const char *backup_dir,
 	{
 		links = parray_new();
 		read_tablespace_map(links, backup_dir);
+		/* Sort links by a link name*/
+		parray_qsort(links, pgFileComparePath);
 	}
 
 	join_path_components(backup_database_dir, backup_dir, DATABASE_DIR);
@@ -1102,7 +1104,6 @@ read_tablespace_map(parray *files, const char *backup_dir)
 		parray_append(files, file);
 	}
 
-	parray_qsort(files, pgFileCompareLinked);
 	fclose(fp);
 }
 
@@ -1126,6 +1127,8 @@ check_tablespace_mapping(pgBackup *backup)
 
 	pgBackupGetPath(backup, this_backup_path, lengthof(this_backup_path), NULL);
 	read_tablespace_map(links, this_backup_path);
+	/* Sort links by the path of a linked file*/
+	parray_qsort(links, pgFileCompareLinked);
 
 	if (log_level_console <= LOG || log_level_file <= LOG)
 		elog(LOG, "check tablespace directories of backup %s",

Original file line number	Diff line number	Diff line change
`@@ -918,6 +918,8 @@ create_data_directories(const char data_dir, const char backup_dir,`
`918`	`918`	`{`
`919`	`919`	`links = parray_new();`
`920`	`920`	`read_tablespace_map(links, backup_dir);`
	`921`	`+ /* Sort links by a link name*/`
	`922`	`+ parray_qsort(links, pgFileComparePath);`
`921`	`923`	`}`
`922`	`924`
`923`	`925`	`join_path_components(backup_database_dir, backup_dir, DATABASE_DIR);`
`@@ -1102,7 +1104,6 @@ read_tablespace_map(parray files, const char backup_dir)`
`1102`	`1104`	`parray_append(files, file);`
`1103`	`1105`	`}`
`1104`	`1106`
`1105`		`- parray_qsort(files, pgFileCompareLinked);`
`1106`	`1107`	`fclose(fp);`
`1107`	`1108`	`}`
`1108`	`1109`
`@@ -1126,6 +1127,8 @@ check_tablespace_mapping(pgBackup *backup)`
`1126`	`1127`
`1127`	`1128`	`pgBackupGetPath(backup, this_backup_path, lengthof(this_backup_path), NULL);`
`1128`	`1129`	`read_tablespace_map(links, this_backup_path);`
	`1130`	`+ /* Sort links by the path of a linked file*/`
	`1131`	`+ parray_qsort(links, pgFileCompareLinked);`
`1129`	`1132`
`1130`	`1133`	`if (log_level_console <= LOG \|\| log_level_file <= LOG)`
`1131`	`1134`	`elog(LOG, "check tablespace directories of backup %s",`