Put back fast-path for the case that there's no backup blocks in

hlinnaka · hlinnaka · commit 9187cedd7c9b · 2009-01-23T11:19:34.000Z
RestoreBkpBlocks. Went missing in my recent refactoring patch, as pointed
out by Simon's hot standby patch.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.328 2009/01/20 18:59:37 heikki Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.329 2009/01/23 11:19:34 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2938,6 +2938,9 @@ RestoreBkpBlocks(XLogRecPtr lsn, XLogRecord *record, bool cleanup)
 	char	   *blk;
 	int			i;
 
+	if (!(record->xl_info & XLR_BKP_BLOCK_MASK))
+		return;
+
 	blk = (char *) XLogRecGetData(record) + record->xl_len;
 	for (i = 0; i < XLR_MAX_BKP_BLOCKS; i++)
 	{

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.328 2009/01/20 18:59:37 heikki Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.329 2009/01/23 11:19:34 heikki Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -2938,6 +2938,9 @@ RestoreBkpBlocks(XLogRecPtr lsn, XLogRecord *record, bool cleanup)`
`2938`	`2938`	`char *blk;`
`2939`	`2939`	`int i;`
`2940`	`2940`
	`2941`	`+ if (!(record->xl_info & XLR_BKP_BLOCK_MASK))`
	`2942`	`+ return;`
	`2943`	`+`
`2941`	`2944`	`blk = (char *) XLogRecGetData(record) + record->xl_len;`
`2942`	`2945`	`for (i = 0; i < XLR_MAX_BKP_BLOCKS; i++)`
`2943`	`2946`	`{`