Commit7777afc

committed

restore code cleanup

1 parent2b8da45 commit7777afcCopy full SHA for 7777afc

File tree

+12

-16

lines changed

+12

-16

lines changed

Lines changed: 1 addition & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ restore_file_partly(const char from_root,const char to_root, pgFile *file)`
`406`	`406`	`fclose(out);`
`407`	`407`	`}`
`408`	`408`
`409`		`-staticvoid`
	`409`	`+void`
`410`	`410`	`restore_compressed_file(constchar*from_root,`
`411`	`411`	`constchar*to_root,`
`412`	`412`	`pgFile*file)`
`@@ -436,20 +436,6 @@ restore_data_file(const char *from_root,`
`436`	`436`	`BackupPageHeaderheader;`
`437`	`437`	`BlockNumberblknum;`
`438`	`438`
`439`		`-if (!file->is_datafile)`
`440`		`-{`
`441`		`-/*`
`442`		`- * If the file is not a datafile and not compressed file,`
`443`		`- * just copy it.`
`444`		`- */`
`445`		`-if (file->generation==-1)`
`446`		`-copy_file(from_root,to_root,file);`
`447`		`-else`
`448`		`-restore_compressed_file(from_root,to_root,file);`
`449`		`-`
`450`		`-return;`
`451`		`-}`
`452`		`-`
`453`	`439`	`/* open backup mode file for read */`
`454`	`440`	`in=fopen(file->path,"r");`
`455`	`441`	`if (in==NULL)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,8 @@ extern bool backup_data_file(const char from_root, const char to_root,`
`344`	`344`	`pgFile*file,XLogRecPtrprev_backup_start_lsn);`
`345`	`345`	`externvoidrestore_data_file(constcharfrom_root,constcharto_root,`
`346`	`346`	`pgFilefile,pgBackupbackup);`
	`347`	`+externvoidrestore_compressed_file(constchar*from_root,`
	`348`	`+constcharto_root,pgFilefile);`
`347`	`349`	`externboolis_compressed_data_file(pgFile*file);`
`348`	`350`	`externboolbackup_compressed_file_partially(pgFile*file,`
`349`	`351`	`void*arg,`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,15 @@ restore_files(void *arg)`
`666`	`666`	`}`
`667`	`667`
`668`	`668`	`/* restore file */`
`669`		`-restore_data_file(from_root,pgdata,file,arguments->backup);`
	`669`	`+if (file->is_datafile)`
	`670`	`+{`
	`671`	`+if (is_compressed_data_file(file))`
	`672`	`+restore_compressed_file(from_root,pgdata,file);`
	`673`	`+else`
	`674`	`+restore_data_file(from_root,pgdata,file,arguments->backup);`
	`675`	`+}`
	`676`	`+else`
	`677`	`+copy_file(from_root,pgdata,file);`
`670`	`678`
`671`	`679`	`/* print size of restored file */`
`672`	`680`	`elog(LOG,"restored %lu\n", (unsigned long)file->write_size);`

Comments

(0)