Back-patch a low-risk fix for the 'HEAP_MOVED_IN was not expected' bug:

tglsfdc · tglsfdc · commit 2513765e7b1e · 2000-01-10T04:16:10.000Z
just dike out the code that tries to remove pages from fraged_pages.
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.110.2.4 2000/01/04 17:27:26 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.110.2.5 2000/01/10 04:16:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1253,6 +1253,7 @@ vc_rpfheap(VRelStats *vacrelstats, Relation onerel,
 				{
 					if (!vc_enough_space(to_vpd, tlen))
 					{
+#if 0							/* this code is broken */
 						if (to_vpd != last_fraged_page &&
 						 !vc_enough_space(to_vpd, vacrelstats->min_tlen))
 						{
@@ -1263,6 +1264,7 @@ vc_rpfheap(VRelStats *vacrelstats, Relation onerel,
 							num_fraged_pages--;
 							Assert(last_fraged_page == fraged_pages->vpl_pagedesc[num_fraged_pages - 1]);
 						}
+#endif
 						for (i = 0; i < num_fraged_pages; i++)
 						{
 							if (vc_enough_space(fraged_pages->vpl_pagedesc[i], tlen))
@@ -1517,6 +1519,7 @@ moving chain: failed to add item with len = %u to page %u",
 					WriteBuffer(cur_buffer);
 					cur_buffer = InvalidBuffer;
 
+#if 0							/* this code is broken */
 					/*
 					 * If no one tuple can't be added to this page -
 					 * remove page from fraged_pages. - vadim 11/27/96
@@ -1534,6 +1537,7 @@ moving chain: failed to add item with len = %u to page %u",
 						num_fraged_pages--;
 						Assert(last_fraged_page == fraged_pages->vpl_pagedesc[num_fraged_pages - 1]);
 					}
+#endif
 				}
 				for (i = 0; i < num_fraged_pages; i++)
 				{

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.110.2.4 2000/01/04 17:27:26 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.110.2.5 2000/01/10 04:16:10 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1253,6 +1253,7 @@ vc_rpfheap(VRelStats *vacrelstats, Relation onerel,`
`1253`	`1253`	`{`
`1254`	`1254`	`if (!vc_enough_space(to_vpd, tlen))`
`1255`	`1255`	`{`
	`1256`	`+#if 0 /* this code is broken */`
`1256`	`1257`	`if (to_vpd != last_fraged_page &&`
`1257`	`1258`	`!vc_enough_space(to_vpd, vacrelstats->min_tlen))`
`1258`	`1259`	`{`
`@@ -1263,6 +1264,7 @@ vc_rpfheap(VRelStats *vacrelstats, Relation onerel,`
`1263`	`1264`	`num_fraged_pages--;`
`1264`	`1265`	`Assert(last_fraged_page == fraged_pages->vpl_pagedesc[num_fraged_pages - 1]);`
`1265`	`1266`	`}`
	`1267`	`+#endif`
`1266`	`1268`	`for (i = 0; i < num_fraged_pages; i++)`
`1267`	`1269`	`{`
`1268`	`1270`	`if (vc_enough_space(fraged_pages->vpl_pagedesc[i], tlen))`
`@@ -1517,6 +1519,7 @@ moving chain: failed to add item with len = %u to page %u",`
`1517`	`1519`	`WriteBuffer(cur_buffer);`
`1518`	`1520`	`cur_buffer = InvalidBuffer;`
`1519`	`1521`
	`1522`	`+#if 0 /* this code is broken */`
`1520`	`1523`	`/*`
`1521`	`1524`	`* If no one tuple can't be added to this page -`
`1522`	`1525`	`* remove page from fraged_pages. - vadim 11/27/96`
`@@ -1534,6 +1537,7 @@ moving chain: failed to add item with len = %u to page %u",`
`1534`	`1537`	`num_fraged_pages--;`
`1535`	`1538`	`Assert(last_fraged_page == fraged_pages->vpl_pagedesc[num_fraged_pages - 1]);`
`1536`	`1539`	`}`
	`1540`	`+#endif`
`1537`	`1541`	`}`
`1538`	`1542`	`for (i = 0; i < num_fraged_pages; i++)`
`1539`	`1543`	`{`