Commitebc2b68

committed

Fix pg_xlogdump's calculation of full-page image data.

The old formula was completely bogus with the new WAL record format.

1 parent9a94629 commitebc2b68Copy full SHA for ebc2b68

File tree

+18

-3

lines changed

+18

-3

lines changed

Lines changed: 18 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -351,14 +351,29 @@ XLogDumpCountRecord(XLogDumpConfig config, XLogDumpStats stats,`
`351`	`351`	`uint8recid;`
`352`	`352`	`uint32rec_len;`
`353`	`353`	`uint32fpi_len;`
	`354`	`+intblock_id;`
`354`	`355`
`355`	`356`	`stats->count++;`
`356`	`357`
`357`		`-/* Update per-rmgr statistics */`
`358`		`-`
`359`	`358`	`rmid=XLogRecGetRmid(record);`
`360`	`359`	`rec_len=XLogRecGetDataLen(record)+SizeOfXLogRecord;`
`361`		`-fpi_len=record->decoded_record->xl_tot_len-rec_len;`
	`360`	`+`
	`361`	`+/*`
	`362`	`+ * Calculate the amount of FPI data in the record. Each backup block`
	`363`	`+ * takes up BLCKSZ bytes, minus the "hole" length.`
	`364`	`+ *`
	`365`	`+ * XXX: We peek into xlogreader's private decoded backup blocks for the`
	`366`	`+ * hole_length. It doesn't seem worth it to add an accessor macro for`
	`367`	`+ * this.`
	`368`	`+ */`
	`369`	`+fpi_len=0;`
	`370`	`+for (block_id=0;block_id <=record->max_block_id;block_id++)`
	`371`	`+{`
	`372`	`+if (XLogRecHasBlockImage(record,block_id))`
	`373`	`+fpi_len+=BLCKSZ-record->blocks[block_id].hole_length;`
	`374`	`+}`
	`375`	`+`
	`376`	`+/* Update per-rmgr statistics */`
`362`	`377`
`363`	`378`	`stats->rmgr_stats[rmid].count++;`
`364`	`379`	`stats->rmgr_stats[rmid].rec_len+=rec_len;`

Comments

(0)