Simplify code for recovery target identification

Michael Paquier · Michael Paquier · commit 96cfb3eb13be · 2013-12-15T23:50:04.000+09:00
Some unnecessary comments are removed and cleaned as well at the same
time.
diff --git a/backup.c b/backup.c
@@ -175,11 +175,8 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)
 		prev_backup = catalog_get_last_data_backup(backup_list);
 		if (prev_backup == NULL || prev_backup->tli != current.tli)
 		{
-			elog(ERROR_SYSTEM, _("There is indeed a full backup but it is not validated."
-						"So I can't take any incremental backup."
-						"Please validate it and retry."));
-///			elog(INFO, _("no previous full backup, performing a full backup instead"));
-///			current.backup_mode = BACKUP_MODE_FULL;
+			elog(ERROR_SYSTEM, _("Full backup detected  but it is not "
+								 "validated so incremental backup cannot be taken"));
 		}
 		else
 		{
diff --git a/restore.c b/restore.c
@@ -205,8 +205,8 @@ do_restore(const char *target_time,
 			continue;
 
 		/* is the backup is necessary for restore to target timeline ? */
-		//if (!satisfy_timeline(timelines, backup) && !satisfy_recovery_target(backup, rt))
-		if (!satisfy_timeline(timelines, backup) || !satisfy_recovery_target(backup, rt))
+		if (!satisfy_timeline(timelines, backup) ||
+			!satisfy_recovery_target(backup, rt))
 			continue;
 
 		if (verbose)
@@ -850,23 +850,13 @@ readTimeLineHistory(TimeLineID targetTLI)
 static bool
 satisfy_recovery_target(const pgBackup *backup, const pgRecoveryTarget *rt)
 {
-	if(rt->xid_specified){
-//		elog(INFO, "in satisfy_recovery_target:xid::%u:%u", backup->recovery_xid, rt->recovery_target_xid);
-		if(backup->recovery_xid <= rt->recovery_target_xid)
-			return true;
-		else
-			return false;
-	}
-	if(rt->time_specified){
-//		elog(INFO, "in satisfy_recovery_target:time_t::%ld:%ld", backup->recovery_time, rt->recovery_target_time);
-		if(backup->recovery_time <= rt->recovery_target_time)
-			return true;
-		else
-			return false;
-	}
-	else{
+	if(rt->xid_specified)
+		return backup->recovery_xid <= rt->recovery_target_xid);
+
+	if (rt->time_specified)
+		return backup->recovery_time <= rt->recovery_target_time);
+	else
 		return true;
-	}
 }
 
 static bool
@@ -1049,7 +1039,7 @@ checkIfCreateRecoveryConf(const char *target_time,
 	bool		dummy_bool;
 	pgRecoveryTarget *rt;
 
-	// init pgRecoveryTarget
+	/* Initialize pgRecoveryTarget */
 	rt = pgut_new(pgRecoveryTarget);
 	rt->time_specified = false;
 	rt->xid_specified = false;

Original file line number	Diff line number	Diff line change
`@@ -175,11 +175,8 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`175`	`175`	`prev_backup = catalog_get_last_data_backup(backup_list);`
`176`	`176`	`if (prev_backup == NULL \|\| prev_backup->tli != current.tli)`
`177`	`177`	`{`
`178`		`- elog(ERROR_SYSTEM, _("There is indeed a full backup but it is not validated."`
`179`		`- "So I can't take any incremental backup."`
`180`		`- "Please validate it and retry."));`
`181`		`-/// elog(INFO, _("no previous full backup, performing a full backup instead"));`
`182`		`-/// current.backup_mode = BACKUP_MODE_FULL;`
	`178`	`+ elog(ERROR_SYSTEM, _("Full backup detected but it is not "`
	`179`	`+ "validated so incremental backup cannot be taken"));`
`183`	`180`	`}`
`184`	`181`	`else`
`185`	`182`	`{`