restore code cleanup

alubennikova · alubennikova · commit 7777afceb43c · 2017-05-03T15:55:11.000+03:00
diff --git a/data.c b/data.c
@@ -406,7 +406,7 @@ restore_file_partly(const char *from_root,const char *to_root, pgFile *file)
 	fclose(out);
 }
 
-static void
+void
 restore_compressed_file(const char *from_root,
 						const char *to_root,
 						pgFile *file)
@@ -436,20 +436,6 @@ restore_data_file(const char *from_root,
 	BackupPageHeader	header;
 	BlockNumber			blknum;
 
-	if (!file->is_datafile)
-	{
-		/*
-		 * If the file is not a datafile and not compressed file,
-		 * just copy it.
-		 */
-		if (file->generation == -1)
-			copy_file(from_root, to_root, file);
-		else
-			restore_compressed_file(from_root, to_root, file);
-
-		return;
-	}
-
 	/* open backup mode file for read */
 	in = fopen(file->path, "r");
 	if (in == NULL)
diff --git a/pg_probackup.h b/pg_probackup.h
@@ -344,6 +344,8 @@ extern bool backup_data_file(const char *from_root, const char *to_root,
 							 pgFile *file, XLogRecPtr prev_backup_start_lsn);
 extern void restore_data_file(const char *from_root, const char *to_root,
 							  pgFile *file, pgBackup *backup);
+extern void restore_compressed_file(const char *from_root,
+									const char *to_root, pgFile *file);
 extern bool is_compressed_data_file(pgFile *file);
 extern bool backup_compressed_file_partially(pgFile *file,
 											 void *arg,
diff --git a/restore.c b/restore.c
@@ -666,7 +666,15 @@ restore_files(void *arg)
 		}
 
 		/* restore file */
-		restore_data_file(from_root, pgdata, file, arguments->backup);
+		if (file->is_datafile)
+		{
+			if (is_compressed_data_file(file))
+				restore_compressed_file(from_root, pgdata, file);
+			else
+				restore_data_file(from_root, pgdata, file, arguments->backup);
+		}
+		else
+			copy_file(from_root, pgdata, file);
 
 		/* print size of restored file */
 		elog(LOG, "restored %lu\n", (unsigned long) file->write_size);
