Even though I'd like to see full_page_writes go away before 8.1,

tglsfdc · tglsfdc · commit d7207cfc6bc0 · 2005-07-08T04:07:26.000Z
a minimum requirement is that it not completely break the system
meanwhile.  Put the test in the right place.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.207 2005/07/05 23:18:09 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.208 2005/07/08 04:07:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -595,9 +595,7 @@ begin:;
 				{
 					/* OK, put it in this slot */
 					dtbuf[i] = rdt->buffer;
-					/* If fsync is off, no need to backup pages. */
-					if (fullPageWrites &&
-						XLogCheckBuffer(rdt, &(dtbuf_lsn[i]), &(dtbuf_xlg[i])))
+					if (XLogCheckBuffer(rdt, &(dtbuf_lsn[i]), &(dtbuf_xlg[i])))
 					{
 						dtbuf_bkp[i] = true;
 						rdt->data = NULL;
@@ -947,7 +945,8 @@ XLogCheckBuffer(XLogRecData *rdata,
 	 */
 	*lsn = page->pd_lsn;
 
-	if (XLByteLE(page->pd_lsn, RedoRecPtr))
+	if (fullPageWrites &&
+		XLByteLE(page->pd_lsn, RedoRecPtr))
 	{
 		/*
 		 * The page needs to be backed up, so set up *bkpb

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2005, 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.207 2005/07/05 23:18:09 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.208 2005/07/08 04:07:26 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -595,9 +595,7 @@ begin:;`
`595`	`595`	`{`
`596`	`596`	`/* OK, put it in this slot */`
`597`	`597`	`dtbuf[i] = rdt->buffer;`
`598`		`- /* If fsync is off, no need to backup pages. */`
`599`		`- if (fullPageWrites &&`
`600`		`- XLogCheckBuffer(rdt, &(dtbuf_lsn[i]), &(dtbuf_xlg[i])))`
	`598`	`+ if (XLogCheckBuffer(rdt, &(dtbuf_lsn[i]), &(dtbuf_xlg[i])))`
`601`	`599`	`{`
`602`	`600`	`dtbuf_bkp[i] = true;`
`603`	`601`	`rdt->data = NULL;`
`@@ -947,7 +945,8 @@ XLogCheckBuffer(XLogRecData *rdata,`
`947`	`945`	`*/`
`948`	`946`	`*lsn = page->pd_lsn;`
`949`	`947`
`950`		`- if (XLByteLE(page->pd_lsn, RedoRecPtr))`
	`948`	`+ if (fullPageWrites &&`
	`949`	`+ XLByteLE(page->pd_lsn, RedoRecPtr))`
`951`	`950`	`{`
`952`	`951`	`/*`
`953`	`952`	`* The page needs to be backed up, so set up *bkpb`