1313 *
1414 *
1515 * 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 $
1717 *
1818 *-------------------------------------------------------------------------
1919 */
@@ -1079,7 +1079,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
10791079relname ,blkno );
10801080PageInit (page ,BufferGetPageSize (buf ),0 );
10811081vacpage -> free = ((PageHeader )page )-> pd_upper - ((PageHeader )page )-> pd_lower ;
1082- free_size += ( vacpage -> free - sizeof ( ItemIdData )) ;
1082+ free_size += vacpage -> free ;
10831083new_pages ++ ;
10841084empty_end_pages ++ ;
10851085vacpagecopy = copy_vac_page (vacpage );
@@ -1092,7 +1092,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
10921092if (PageIsEmpty (page ))
10931093{
10941094vacpage -> free = ((PageHeader )page )-> pd_upper - ((PageHeader )page )-> pd_lower ;
1095- free_size += ( vacpage -> free - sizeof ( ItemIdData )) ;
1095+ free_size += vacpage -> free ;
10961096empty_pages ++ ;
10971097empty_end_pages ++ ;
10981098vacpagecopy = copy_vac_page (vacpage );
@@ -1667,7 +1667,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
16671667/* Quick exit if we have no vtlinks to search in */
16681668if (vacrelstats -> vtlinks == NULL )
16691669{
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" );
16711671break ;/* out of walk-along-page loop */
16721672}
16731673
@@ -1704,7 +1704,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
17041704 * in scan_heap(), but it's not implemented at the
17051705 * moment and so we just stop shrinking here.
17061706 */
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" );
17081708chain_move_failed = true;
17091709break ;/* out of loop to move to chain end */
17101710}
@@ -1753,7 +1753,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
17531753}
17541754to_vacpage -> free -= MAXALIGN (tlen );
17551755if (to_vacpage -> offsets_used >=to_vacpage -> offsets_free )
1756- to_vacpage -> free -= MAXALIGN ( sizeof (ItemIdData ) );
1756+ to_vacpage -> free -= sizeof (ItemIdData );
17571757(to_vacpage -> offsets_used )++ ;
17581758if (free_vtmove == 0 )
17591759{
@@ -1789,7 +1789,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
17891789if (vtlp == NULL )
17901790{
17911791/* 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" );
17931793chain_move_failed = true;
17941794break ;/* out of check-all-items loop */
17951795}
@@ -1825,7 +1825,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
18251825HeapTupleHeaderGetXmin (tp .t_data ))))
18261826{
18271827ReleaseBuffer (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" );
18291829chain_move_failed = true;
18301830break ;/* out of check-all-items loop */
18311831}