Make analyze do vacuum/analyze in one step.

bmomjian · bmomjian · commit 84a30b4c41ef · 2000-05-29T17:07:57.000Z
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.156 2000/05/29 17:06:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.157 2000/05/29 17:07:57 momjian Exp $
  *
 
  *-------------------------------------------------------------------------
@@ -244,12 +244,12 @@ vac_vacuum(NameData *VacRelP, bool analyze, List *anal_cols2)
 
 	/* vacuum each heap relation */
 	for (cur = vrl; cur != (VRelList) NULL; cur = cur->vrl_next)
+	{
 		vacuum_rel(cur->vrl_relid, analyze);
-
-	/* analyze separately so locking is minimized */
-	if (analyze)
-		for (cur = vrl; cur != (VRelList) NULL; cur = cur->vrl_next)
+		/* analyze separately so locking is minimized */
+		if (analyze)
 			analyze_rel(cur->vrl_relid, anal_cols2);
+	}
 }
 
 static VRelList

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.156 2000/05/29 17:06:14 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.157 2000/05/29 17:07:57 momjian Exp $`
`12`	`12`	`*`
`13`	`13`
`14`	`14`	`*-------------------------------------------------------------------------`
`@@ -244,12 +244,12 @@ vac_vacuum(NameData VacRelP, bool analyze, List anal_cols2)`
`244`	`244`
`245`	`245`	`/* vacuum each heap relation */`
`246`	`246`	`for (cur = vrl; cur != (VRelList) NULL; cur = cur->vrl_next)`
	`247`	`+ {`
`247`	`248`	`vacuum_rel(cur->vrl_relid, analyze);`
`248`		`-`
`249`		`- /* analyze separately so locking is minimized */`
`250`		`- if (analyze)`
`251`		`- for (cur = vrl; cur != (VRelList) NULL; cur = cur->vrl_next)`
	`249`	`+ /* analyze separately so locking is minimized */`
	`250`	`+ if (analyze)`
`252`	`251`	`analyze_rel(cur->vrl_relid, anal_cols2);`
	`252`	`+ }`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`static VRelList`