Commitfb47544

committed

Minor fixes for WAL consistency checking.

1 parente28b115 commitfb47544Copy full SHA for fb47544

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* in a page which can be different when the WAL is generated`
`6`	`6`	`* and when the WAL is applied.`
`7`	`7`	`*`
`8`		`- * Portions Copyright (c) 2016, PostgreSQL Global Development Group`
	`8`	`+ * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group`
`9`	`9`	`*`
`10`	`10`	`* Contains common routines required for masking a page.`
`11`	`11`	`*`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9167,7 +9167,6 @@ heap_mask(char *pagedata, BlockNumber blkno)`
`9167`	`9167`
`9168`	`9168`	`if (ItemIdIsNormal(iid))`
`9169`	`9169`	`{`
`9170`		`-`
`9171`	`9170`	`HeapTupleHeaderpage_htup= (HeapTupleHeader)page_item;`
`9172`	`9171`
`9173`	`9172`	`/*`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1360,6 +1360,16 @@ checkXLogConsistency(XLogReaderState *record)`
`1360`	`1360`
`1361`	`1361`	`Assert(XLogRecHasBlockImage(record,block_id));`
`1362`	`1362`
	`1363`	`+if (XLogRecBlockImageApply(record,block_id))`
	`1364`	`+{`
	`1365`	`+/*`
	`1366`	`+ * WAL record has already applied the page, so bypass the`
	`1367`	`+ * consistency check as that would result in comparing the full`
	`1368`	`+ * page stored in the record with itself.`
	`1369`	`+ */`
	`1370`	`+continue;`
	`1371`	`+}`
	`1372`	`+`
`1363`	`1373`	`/*`
`1364`	`1374`	`* Read the contents from the current buffer and store it in a`
`1365`	`1375`	`* temporary page.`
`@@ -1390,7 +1400,7 @@ checkXLogConsistency(XLogReaderState *record)`
`1390`	`1400`
`1391`	`1401`	`/*`
`1392`	`1402`	`* Read the contents from the backup copy, stored in WAL record and`
`1393`		`- * store it in a temporary page. There isnot need to allocate a new`
	`1403`	`+ * store it in a temporary page. There isno need to allocate a new`
`1394`	`1404`	`* page here, a local buffer is fine to hold its contents and a mask`
`1395`	`1405`	`* can be directly applied on it.`
`1396`	`1406`	`*/`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* individual rmgr, but we make things easier by providing some`
`8`	`8`	`* common routines to handle cases which occur in multiple rmgrs.`
`9`	`9`	`*`
`10`		`- * Portions Copyright (c) 2016, PostgreSQL Global Development Group`
	`10`	`+ * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group`
`11`	`11`	`*`
`12`	`12`	`* src/include/access/bufmask.h`
`13`	`13`	`*`

Comments

(0)