Vacuum fix. Was modifying cache.

src/bin/initdb/initdb.sh

@@ -26,7 +26,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.46 1998/08/14 16:05:51 thomas Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.47 1998/08/19 19:59:45 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -317,7 +317,7 @@ fi
 BACKENDARGS="-boot -C -F -D$PGDATA $BACKEND_TALK_ARG"
 
 echo "$CMDNAME: creating template database in $PGDATA/base/template1"
-echo "Running: postgres $BACKENDARGS template1"
+[ "$debug" -ne 0 ] && echo "Running: postgres $BACKENDARGS template1"
 
 cat $TEMPLATE \
 | sed -e "s/postgres PGUID/$POSTGRES_SUPERUSERNAME $POSTGRES_SUPERUID/" \
@@ -345,7 +345,7 @@ pg_version $PGDATA/base/template1
 
 if [ $template_only -eq 0 ]; then
     echo "Creating global classes in $PG_DATA/base"
-    echo "Running: postgres $BACKENDARGS template1"
+    [ "$debug" -ne 0 ] && echo "Running: postgres $BACKENDARGS template1"
 
     cat $GLOBAL \
     | sed -e "s/postgres PGUID/$POSTGRES_SUPERUSERNAME $POSTGRES_SUPERUID/" \
@@ -382,7 +382,7 @@ if [ $template_only -eq 0 ]; then
     #echo "show" >> /tmp/create.$$
     echo "close pg_database" >> /tmp/create.$$
 
-    echo "Running: postgres $BACKENDARGS template1 < /tmp/create.$$"
+    [ "$debug" -ne 0 ] && echo "Running: postgres $BACKENDARGS template1 < /tmp/create.$$"
 
     postgres $BACKENDARGS template1 < /tmp/create.$$ 
 

src/include/catalog/pg_description.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_description.h,v 1.5 1998/02/26 04:40:53 momjian Exp $
+ * $Id: pg_description.h,v 1.6 1998/08/19 19:59:47 momjian Exp $
  *
  * NOTES
  *		the genbki.sh script reads this file and generates .bki
@@ -58,9 +58,10 @@ typedef FormData_pg_description *Form_pg_description;
  * ----------------
  */
 
-/* Because the contents of this table are taken from the other *.h files,
-   there is no initialization.	It is loaded from initdb using a COPY
-   statement.
-*/
+/*
+ *	Because the contents of this table are taken from the other *.h files,
+ *	there is no initialization.	It is loaded from initdb using a COPY
+ *	statement.
+ */
 
 #endif							/* PG_DESCRIPTION_H */

src/include/commands/vacuum.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: vacuum.h,v 1.13 1998/02/26 04:41:12 momjian Exp $
+ * $Id: vacuum.h,v 1.14 1998/08/19 19:59:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,18 +33,18 @@ typedef struct VPageDescrData
 {
 	BlockNumber vpd_blkno;		/* BlockNumber of this Page */
 	Size		vpd_free;		/* FreeSpace on this Page */
-	uint16		vpd_nusd;		/* Number of OffNums used by vacuum */
-	uint16		vpd_noff;		/* Number of OffNums free or to be free */
-	OffsetNumber vpd_voff[1];	/* Array of its OffNums */
+	uint16		vpd_offsets_used;	/* Number of OffNums used by vacuum */
+	uint16		vpd_offsets_free;	/* Number of OffNums free or to be free */
+	OffsetNumber vpd_offsets[1];	/* Array of its OffNums */
 } VPageDescrData;
 
 typedef VPageDescrData *VPageDescr;
 
 typedef struct VPageListData
 {
-	int			vpl_nemend;		/* Number of "empty" end-pages */
-	int			vpl_npages;		/* Number of pages in vpl_pgdesc */
-	VPageDescr *vpl_pgdesc;		/* Descriptions of pages */
+	int			vpl_empty_end_pages;	/* Number of "empty" end-pages */
+	int			vpl_num_pages;		/* Number of pages in vpl_pagedesc */
+	VPageDescr *vpl_pagedesc;	/* Descriptions of pages */
 } VPageListData;
 
 typedef VPageListData *VPageList;
@@ -96,8 +96,8 @@ typedef VRelListData *VRelList;
 typedef struct VRelStats
 {
 	Oid			relid;
-	int			ntups;
-	int			npages;
+	int			num_tuples;
+	int			num_pages;
 	Size		min_tlen;
 	Size		max_tlen;
 	bool		hasindex;