Refactoring of restore and validate options.

Collect them into pgRestoreParams structure

Author: alubennikova

src/pg_probackup.c

@@ -89,6 +89,7 @@ static char		   *target_name = NULL;
 static char		   *target_action = NULL;
 
 static pgRecoveryTarget *recovery_target_options = NULL;
+static pgRestoreParams *restore_params = NULL;
 
 bool restore_as_replica = false;
 bool no_validate = false;
@@ -598,7 +599,32 @@ main(int argc, char *argv[])
 				target_inclusive, target_tli, target_lsn,
 				(target_stop != NULL) ? target_stop :
 					(target_immediate) ? "immediate" : NULL,
-				target_name, target_action, no_validate);
+				target_name, target_action);
+
+		/* keep all params in one structure */
+		restore_params = pgut_new(pgRestoreParams);
+		restore_params->is_restore = (backup_subcmd == RESTORE_CMD);
+		restore_params->no_validate = no_validate;
+		restore_params->restore_as_replica = restore_as_replica;
+		restore_params->skip_block_validation = skip_block_validation;
+		restore_params->skip_external_dirs = skip_external_dirs;
+
+		/* handle partial restore parameters */
+		if (datname_exclude_list && datname_include_list)
+			elog(ERROR, "You cannot specify '--db-include' and '--db-exclude' together");
+
+		if (datname_exclude_list)
+		{
+			restore_params->is_include_list = false;
+			restore_params->partial_db_list = datname_exclude_list;
+		}
+		else if (datname_include_list)
+		{
+			restore_params->is_include_list = true;
+			restore_params->partial_db_list = datname_include_list;
+		}
+		
+
 	}
 
 	if (num_threads < 1)
@@ -633,37 +659,16 @@ main(int argc, char *argv[])
 				return do_backup(start_time, no_validate);
 			}
 		case RESTORE_CMD:
-			{
-				parray *datname_list = NULL;
-				/* true for 'include', false for 'exclude' */
-				bool partial_restore_type = false;
-
-				if (datname_exclude_list && datname_include_list)
-					elog(ERROR, "You cannot specify '--db-include' and '--db-exclude' together");
-
-				if (datname_exclude_list)
-					datname_list = datname_exclude_list;
-
-				if (datname_include_list)
-				{
-					partial_restore_type = true;
-					datname_list = datname_include_list;
-				}
-				return do_restore_or_validate(current.backup_id,
+			return do_restore_or_validate(current.backup_id,
 							  recovery_target_options,
-							  true,
-							  datname_list,
-							  partial_restore_type);
-			}
+							 restore_params);
 		case VALIDATE_CMD:
 			if (current.backup_id == 0 && target_time == 0 && target_xid == 0)
 				return do_validate_all();
 			else
 				return do_restore_or_validate(current.backup_id,
 						  recovery_target_options,
-						  false,
-						  NULL,
-						  false);
+						  restore_params);
 		case SHOW_CMD:
 			return do_show(current.backup_id);
 		case DELETE_CMD:

src/pg_probackup.h

@@ -336,9 +336,22 @@ typedef struct pgRecoveryTarget
 	const char	   *target_stop;
 	const char	   *target_name;
 	const char	   *target_action;
-	bool			no_validate;
 } pgRecoveryTarget;
 
+/* Options needed for restore and validate commands */
+typedef struct pgRestoreParams
+{
+	bool	is_restore;
+	bool	no_validate;
+	bool	restore_as_replica;
+	bool	skip_external_dirs;
+	bool	skip_block_validation;
+
+	/* options for partial restore */
+	bool is_include_list;
+	parray *partial_db_list;
+} pgRestoreParams;
+
 typedef struct
 {
 	const char *from_root;
@@ -444,11 +457,6 @@ extern char* remote_agent;
 extern bool is_ptrack_support;
 extern bool exclusive_backup;
 
-/* restore options */
-extern bool restore_as_replica;
-extern bool skip_block_validation;
-extern bool skip_external_dirs;
-
 /* delete options */
 extern bool		delete_wal;
 extern bool		delete_expired;
@@ -467,6 +475,7 @@ extern ShowFormat show_format;
 
 /* checkdb options */
 extern bool heapallindexed;
+extern bool skip_block_validation;
 
 /* current settings */
 extern pgBackup current;
@@ -494,17 +503,15 @@ extern char *pg_ptrack_get_block(ConnectionArgs *arguments,
 /* in restore.c */
 extern int do_restore_or_validate(time_t target_backup_id,
 					  pgRecoveryTarget *rt,
-					  bool is_restore,
-					  parray * datname_list,
-					  bool partial_restore_type);
+					  pgRestoreParams *params);
 extern bool satisfy_timeline(const parray *timelines, const pgBackup *backup);
 extern bool satisfy_recovery_target(const pgBackup *backup,
 									const pgRecoveryTarget *rt);
 extern pgRecoveryTarget *parseRecoveryTargetOptions(
 	const char *target_time, const char *target_xid,
 	const char *target_inclusive, TimeLineID target_tli, const char* target_lsn,
 	const char *target_stop, const char *target_name,
-	const char *target_action, bool no_validate);
+	const char *target_action);
 
 /* in merge.c */
 extern void do_merge(time_t backup_id);