Commit6b16532

committed

Remove unnecessary 'restoredFromArchive' global variable.

It might've been useful for debugging purposes, but meh. There's'readSource' which does almost the same thing.Reviewed-by: Andres FreundDiscussion:https://www.postgresql.org/message-id/b3b71061-4919-e882-4857-27e370ab134a%40iki.fi

1 parente9f5a06 commit6b16532Copy full SHA for 6b16532

File tree

-9

lines changed

-9

lines changed

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -271,9 +271,6 @@ boolInArchiveRecovery = false;`
`271`	`271`	`staticboolstandby_signal_file_found= false;`
`272`	`272`	`staticboolrecovery_signal_file_found= false;`
`273`	`273`
`274`		`-/* Was the last xlog file restored from archive, or local? */`
`275`		`-staticboolrestoredFromArchive= false;`
`276`		`-`
`277`	`274`	`/* Buffers dedicated to consistency checks of size BLCKSZ */`
`278`	`275`	`staticchar*replay_image_masked=NULL;`
`279`	`276`	`staticchar*primary_image_masked=NULL;`
`@@ -3737,18 +3734,16 @@ XLogFileRead(XLogSegNo segno, int emode, TimeLineID tli,`
`3737`	`3734`	`xlogfname);`
`3738`	`3735`	`set_ps_display(activitymsg);`
`3739`	`3736`
`3740`		`-restoredFromArchive=RestoreArchivedFile(path,xlogfname,`
`3741`		`-"RECOVERYXLOG",`
`3742`		`-wal_segment_size,`
`3743`		`-InRedo);`
`3744`		`-if (!restoredFromArchive)`
	`3737`	`+if (!RestoreArchivedFile(path,xlogfname,`
	`3738`	`+"RECOVERYXLOG",`
	`3739`	`+wal_segment_size,`
	`3740`	`+InRedo))`
`3745`	`3741`	`return-1;`
`3746`	`3742`	`break;`
`3747`	`3743`
`3748`	`3744`	`caseXLOG_FROM_PG_WAL:`
`3749`	`3745`	`caseXLOG_FROM_STREAM:`
`3750`	`3746`	`XLogFilePath(path,tli,segno,wal_segment_size);`
`3751`		`-restoredFromArchive= false;`
`3752`	`3747`	`break;`
`3753`	`3748`
`3754`	`3749`	`default:`

Comments

(0)