Commit3938150

committed

Fix longstanding error in VACUUM: sometimes would examine a buffer page

after writing/unpinning it. An actual failure is unlikely, unless thesystem is tremendously short of buffers ... but a bug is a bug.

1 parent1d4ee0c commit3938150Copy full SHA for 3938150

File tree

-12

lines changed

-12

lines changed

Lines changed: 9 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.198 2001/06/27 23:31:38 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.199 2001/06/29 16:34:30 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -631,7 +631,6 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`631`	`631`	`maxoff;`
`632`	`632`	`boolpgchanged,`
`633`	`633`	`tupgone,`
`634`		`-dobufrel,`
`635`	`634`	`notup;`
`636`	`635`	`char*relname;`
`637`	`636`	`VacPagevacpage,`
`@@ -931,15 +930,6 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`931`	`930`	`}`
`932`	`931`	`}`
`933`	`932`
`934`		`-if (pgchanged)`
`935`		`-{`
`936`		`-WriteBuffer(buf);`
`937`		`-dobufrel= false;`
`938`		`-changed_pages++;`
`939`		`-}`
`940`		`-else`
`941`		`-dobufrel= true;`
`942`		`-`
`943`	`933`	`if (tempPage!= (Page)NULL)`
`944`	`934`	`{/* Some tuples are gone */`
`945`	`935`	`PageRepairFragmentation(tempPage,NULL);`
`@@ -955,8 +945,15 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`955`	`945`	`free_size+=vacpage->free;`
`956`	`946`	`reap_page(vacuum_pages,vacpage);`
`957`	`947`	`}`
`958`		`-if (dobufrel)`
	`948`	`+`
	`949`	`+if (pgchanged)`
	`950`	`+{`
	`951`	`+WriteBuffer(buf);`
	`952`	`+changed_pages++;`
	`953`	`+}`
	`954`	`+else`
`959`	`955`	`ReleaseBuffer(buf);`
	`956`	`+`
`960`	`957`	`if (notup)`
`961`	`958`	`empty_end_pages++;`
`962`	`959`	`else`

Comments

(0)