77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.83 1998/10/0717:12 :50 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.84 1998/10/0722:31 :50 momjian Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -306,26 +306,11 @@ vc_getrels(NameData *VacRelP)
306306d = heap_getattr (tuple ,Anum_pg_class_relname ,tupdesc ,& n );
307307rname = (char * )d ;
308308
309- /*
310- * don't vacuum large objects for now - something breaks when we
311- * do
312- */
313- if ((strlen (rname ) >=5 )&& rname [0 ]== 'x' &&
314- rname [1 ]== 'i' && rname [2 ]== 'n' &&
315- (rname [3 ]== 'v' || rname [3 ]== 'x' )&&
316- rname [4 ] >='0' && rname [4 ] <='9' )
317- {
318- elog (NOTICE ,"Rel %s: can't vacuum LargeObjects now" ,
319- rname );
320- continue ;
321- }
322-
323309d = heap_getattr (tuple ,Anum_pg_class_relkind ,tupdesc ,& n );
324310
325311rkind = DatumGetChar (d );
326312
327- /* skip system relations */
328- if (rkind != 'r' )
313+ if (rkind != RELKIND_RELATION )
329314{
330315elog (NOTICE ,"Vacuum: can not process index and certain system tables" );
331316continue ;
@@ -372,8 +357,6 @@ vc_getrels(NameData *VacRelP)
372357static void
373358vc_vacone (Oid relid ,bool analyze ,List * va_cols )
374359{
375- Relation rel ;
376- TupleDesc tupdesc ;
377360HeapTuple tuple ,
378361typetuple ;
379362Relation onerel ;
@@ -389,9 +372,6 @@ vc_vacone(Oid relid, bool analyze, List *va_cols)
389372
390373StartTransactionCommand ();
391374
392- rel = heap_openr (RelationRelationName );
393- tupdesc = RelationGetDescr (rel );
394-
395375/*
396376 * Race condition -- if the pg_class tuple has gone away since the
397377 * last time we saw it, we don't need to vacuum it.
@@ -401,7 +381,6 @@ vc_vacone(Oid relid, bool analyze, List *va_cols)
4013810 ,0 ,0 );
402382if (!HeapTupleIsValid (tuple ))
403383{
404- heap_close (rel );
405384CommitTransactionCommand ();
406385return ;
407386}
@@ -573,7 +552,6 @@ vc_vacone(Oid relid, bool analyze, List *va_cols)
573552
574553/* all done with this class */
575554heap_close (onerel );
576- heap_close (rel );
577555
578556/* update statistics in pg_class */
579557vc_updstats (vacrelstats -> relid ,vacrelstats -> num_pages ,
@@ -1744,6 +1722,7 @@ vc_updstats(Oid relid, int num_pages, int num_tuples, bool hasindex, VRelStats *
17441722sd ;
17451723HeapScanDesc scan ;
17461724HeapTuple rtup ,
1725+ ctup ,
17471726atup ,
17481727stup ;
17491728Form_pg_class pgcform ;
@@ -1754,18 +1733,19 @@ vc_updstats(Oid relid, int num_pages, int num_tuples, bool hasindex, VRelStats *
17541733/*
17551734 * update number of tuples and number of pages in pg_class
17561735 */
1757- rtup = SearchSysCacheTuple (RELOID ,
1736+ ctup = SearchSysCacheTupleCopy (RELOID ,
17581737ObjectIdGetDatum (relid ),
175917380 ,0 ,0 );
1760- if (!HeapTupleIsValid (rtup ))
1739+ if (!HeapTupleIsValid (ctup ))
17611740elog (ERROR ,"pg_class entry for relid %d vanished during vacuuming" ,
17621741relid );
17631742
17641743rd = heap_openr (RelationRelationName );
17651744
17661745/* get the buffer cache tuple */
1767- rtup = heap_fetch (rd ,SnapshotNow ,& rtup -> t_ctid ,& buffer );
1768-
1746+ rtup = heap_fetch (rd ,SnapshotNow ,& ctup -> t_ctid ,& buffer );
1747+ pfree (ctup );
1748+
17691749/* overwrite the existing statistics in the tuple */
17701750vc_setpagelock (rd ,ItemPointerGetBlockNumber (& rtup -> t_ctid ));
17711751pgcform = (Form_pg_class )GETSTRUCT (rtup );
@@ -2175,7 +2155,7 @@ vc_getindices(Oid relid, int *nindices, Relation **Irel)
21752155k ++ ;
21762156}
21772157else
2178- elog (NOTICE ,"CAN't OPEN INDEX %u - SKIP IT" ,ioid [i ]);
2158+ elog (NOTICE ,"CAN'T OPEN INDEX %u - SKIP IT" ,ioid [i ]);
21792159}
21802160* nindices = k ;
21812161pfree (ioid );