Message in the other exit from acquire_sample_rows(), as per update

tglsfdc · tglsfdc · commit 8ff2005c6754 · 2003-09-11T23:12:31.000Z
from Mark Kirkwood.  Also show the sample size.
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.61 2003/09/11 22:59:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.62 2003/09/11 23:12:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -539,6 +539,12 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
 	if (!HeapTupleIsValid(tuple))
 	{
 		*totalrows = (double) numrows;
+
+		ereport(elevel,
+				(errmsg("\"%s\": %u pages, %d rows sampled, %.0f estimated total rows",
+						RelationGetRelationName(onerel),
+						onerel->rd_nblocks, numrows, *totalrows)));
+
 		return numrows;
 	}
 
@@ -691,9 +697,9 @@ pageloop:;
 	 * Emit some interesting relation info 
 	 */
 	ereport(elevel,
-			(errmsg("\"%s\": %u pages, %.1f average rows/page in sample, %.0f estimated rows",
+			(errmsg("\"%s\": %u pages, %d rows sampled, %.0f estimated total rows",
 					RelationGetRelationName(onerel),
-					onerel->rd_nblocks, tuplesperpage, *totalrows)));
+					onerel->rd_nblocks, numrows, *totalrows)));
 
 	return numrows;
 }

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/analyze.c,v 1.61 2003/09/11 22:59:28 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.62 2003/09/11 23:12:31 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -539,6 +539,12 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,`
`539`	`539`	`if (!HeapTupleIsValid(tuple))`
`540`	`540`	`{`
`541`	`541`	`*totalrows = (double) numrows;`
	`542`	`+`
	`543`	`+ ereport(elevel,`
	`544`	`+ (errmsg("\"%s\": %u pages, %d rows sampled, %.0f estimated total rows",`
	`545`	`+ RelationGetRelationName(onerel),`
	`546`	`+ onerel->rd_nblocks, numrows, *totalrows)));`
	`547`	`+`
`542`	`548`	`return numrows;`
`543`	`549`	`}`
`544`	`550`
`@@ -691,9 +697,9 @@ pageloop:;`
`691`	`697`	`* Emit some interesting relation info`
`692`	`698`	`*/`
`693`	`699`	`ereport(elevel,`
`694`		`- (errmsg("\"%s\": %u pages, %.1f average rows/page in sample, %.0f estimated rows",`
	`700`	`+ (errmsg("\"%s\": %u pages, %d rows sampled, %.0f estimated total rows",`
`695`	`701`	`RelationGetRelationName(onerel),`
`696`		`- onerel->rd_nblocks, tuplesperpage, *totalrows)));`
	`702`	`+ onerel->rd_nblocks, numrows, *totalrows)));`
`697`	`703`
`698`	`704`	`return numrows;`
`699`	`705`	`}`