Fix miscalculation of remaining free space during tuple chain moving.

tglsfdc · tglsfdc · commit 8a45a2e9b6c3 · 2002-10-31T19:25:29.000Z
Only affects machines where MAXALIGN &gt; 4, and is a boundary-condition
case even there, but still surprising that it's not been identified
before.  Also reduce tuple chain move give-up messages from WARNING
to DEBUG1, since they are not unexpected conditions.
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.243 2002/10/21 22:06:19 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.244 2002/10/31 19:25:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1079,7 +1079,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 				 relname, blkno);
 			PageInit(page, BufferGetPageSize(buf), 0);
 			vacpage->free = ((PageHeader) page)->pd_upper - ((PageHeader) page)->pd_lower;
-			free_size += (vacpage->free - sizeof(ItemIdData));
+			free_size += vacpage->free;
 			new_pages++;
 			empty_end_pages++;
 			vacpagecopy = copy_vac_page(vacpage);
@@ -1092,7 +1092,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 		if (PageIsEmpty(page))
 		{
 			vacpage->free = ((PageHeader) page)->pd_upper - ((PageHeader) page)->pd_lower;
-			free_size += (vacpage->free - sizeof(ItemIdData));
+			free_size += vacpage->free;
 			empty_pages++;
 			empty_end_pages++;
 			vacpagecopy = copy_vac_page(vacpage);
@@ -1667,7 +1667,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 				/* Quick exit if we have no vtlinks to search in */
 				if (vacrelstats->vtlinks == NULL)
 				{
-					elog(WARNING, "Parent item in update-chain not found - can't continue repair_frag");
+					elog(DEBUG1, "Parent item in update-chain not found - can't continue repair_frag");
 					break;		/* out of walk-along-page loop */
 				}
 
@@ -1704,7 +1704,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 						 * in scan_heap(), but it's not implemented at the
 						 * moment and so we just stop shrinking here.
 						 */
-						elog(WARNING, "Child itemid in update-chain marked as unused - can't continue repair_frag");
+						elog(DEBUG1, "Child itemid in update-chain marked as unused - can't continue repair_frag");
 						chain_move_failed = true;
 						break;	/* out of loop to move to chain end */
 					}
@@ -1753,7 +1753,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 					}
 					to_vacpage->free -= MAXALIGN(tlen);
 					if (to_vacpage->offsets_used >= to_vacpage->offsets_free)
-						to_vacpage->free -= MAXALIGN(sizeof(ItemIdData));
+						to_vacpage->free -= sizeof(ItemIdData);
 					(to_vacpage->offsets_used)++;
 					if (free_vtmove == 0)
 					{
@@ -1789,7 +1789,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 					if (vtlp == NULL)
 					{
 						/* see discussion above */
-						elog(WARNING, "Parent item in update-chain not found - can't continue repair_frag");
+						elog(DEBUG1, "Parent item in update-chain not found - can't continue repair_frag");
 						chain_move_failed = true;
 						break;	/* out of check-all-items loop */
 					}
@@ -1825,7 +1825,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 									 HeapTupleHeaderGetXmin(tp.t_data))))
 					{
 						ReleaseBuffer(Pbuf);
-						elog(WARNING, "Too old parent tuple found - can't continue repair_frag");
+						elog(DEBUG1, "Too old parent tuple found - can't continue repair_frag");
 						chain_move_failed = true;
 						break;	/* out of check-all-items loop */
 					}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.243 2002/10/21 22:06:19 tgl Exp $`
	`16`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.244 2002/10/31 19:25:29 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -1079,7 +1079,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`1079`	`1079`	`relname, blkno);`
`1080`	`1080`	`PageInit(page, BufferGetPageSize(buf), 0);`
`1081`	`1081`	`vacpage->free = ((PageHeader) page)->pd_upper - ((PageHeader) page)->pd_lower;`
`1082`		`- free_size += (vacpage->free - sizeof(ItemIdData));`
	`1082`	`+ free_size += vacpage->free;`
`1083`	`1083`	`new_pages++;`
`1084`	`1084`	`empty_end_pages++;`
`1085`	`1085`	`vacpagecopy = copy_vac_page(vacpage);`
`@@ -1092,7 +1092,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`1092`	`1092`	`if (PageIsEmpty(page))`
`1093`	`1093`	`{`
`1094`	`1094`	`vacpage->free = ((PageHeader) page)->pd_upper - ((PageHeader) page)->pd_lower;`
`1095`		`- free_size += (vacpage->free - sizeof(ItemIdData));`
	`1095`	`+ free_size += vacpage->free;`
`1096`	`1096`	`empty_pages++;`
`1097`	`1097`	`empty_end_pages++;`
`1098`	`1098`	`vacpagecopy = copy_vac_page(vacpage);`
`@@ -1667,7 +1667,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,`
`1667`	`1667`	`/* Quick exit if we have no vtlinks to search in */`
`1668`	`1668`	`if (vacrelstats->vtlinks == NULL)`
`1669`	`1669`	`{`
`1670`		`- elog(WARNING, "Parent item in update-chain not found - can't continue repair_frag");`
	`1670`	`+ elog(DEBUG1, "Parent item in update-chain not found - can't continue repair_frag");`
`1671`	`1671`	`break; /* out of walk-along-page loop */`
`1672`	`1672`	`}`
`1673`	`1673`
`@@ -1704,7 +1704,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,`
`1704`	`1704`	`* in scan_heap(), but it's not implemented at the`
`1705`	`1705`	`* moment and so we just stop shrinking here.`
`1706`	`1706`	`*/`
`1707`		`- elog(WARNING, "Child itemid in update-chain marked as unused - can't continue repair_frag");`
	`1707`	`+ elog(DEBUG1, "Child itemid in update-chain marked as unused - can't continue repair_frag");`
`1708`	`1708`	`chain_move_failed = true;`
`1709`	`1709`	`break; /* out of loop to move to chain end */`
`1710`	`1710`	`}`
`@@ -1753,7 +1753,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,`
`1753`	`1753`	`}`
`1754`	`1754`	`to_vacpage->free -= MAXALIGN(tlen);`
`1755`	`1755`	`if (to_vacpage->offsets_used >= to_vacpage->offsets_free)`
`1756`		`- to_vacpage->free -= MAXALIGN(sizeof(ItemIdData));`
	`1756`	`+ to_vacpage->free -= sizeof(ItemIdData);`
`1757`	`1757`	`(to_vacpage->offsets_used)++;`
`1758`	`1758`	`if (free_vtmove == 0)`
`1759`	`1759`	`{`
`@@ -1789,7 +1789,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,`
`1789`	`1789`	`if (vtlp == NULL)`
`1790`	`1790`	`{`
`1791`	`1791`	`/* see discussion above */`
`1792`		`- elog(WARNING, "Parent item in update-chain not found - can't continue repair_frag");`
	`1792`	`+ elog(DEBUG1, "Parent item in update-chain not found - can't continue repair_frag");`
`1793`	`1793`	`chain_move_failed = true;`
`1794`	`1794`	`break; /* out of check-all-items loop */`
`1795`	`1795`	`}`
`@@ -1825,7 +1825,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,`
`1825`	`1825`	`HeapTupleHeaderGetXmin(tp.t_data))))`
`1826`	`1826`	`{`
`1827`	`1827`	`ReleaseBuffer(Pbuf);`
`1828`		`- elog(WARNING, "Too old parent tuple found - can't continue repair_frag");`
	`1828`	`+ elog(DEBUG1, "Too old parent tuple found - can't continue repair_frag");`
`1829`	`1829`	`chain_move_failed = true;`
`1830`	`1830`	`break; /* out of check-all-items loop */`
`1831`	`1831`	`}`