Minor patch on pgbench

bmomjian · bmomjian · commit 6152de97d3c3 · 2008-08-22T17:57:34.000Z
1. -i option should run vacuum analyze only on pgbench tables, not *all*
tables in database.

2. pre-run cleanup step was DELETE FROM HISTORY then VACUUM HISTORY.
This is just a slow version of TRUNCATE HISTORY.

Simon Riggs
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -4,7 +4,7 @@
  * A simple benchmark program for PostgreSQL
  * Originally written by Tatsuo Ishii and enhanced by many contributors.
  *
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.80 2008/05/09 15:53:07 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.81 2008/08/22 17:57:34 momjian Exp $
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -1080,7 +1080,10 @@ init(void)
 
 	/* vacuum */
 	fprintf(stderr, "vacuum...");
-	executeStatement(con, "vacuum analyze");
+	executeStatement(con, "vacuum analyze branches");
+	executeStatement(con, "vacuum analyze tellers");
+	executeStatement(con, "vacuum analyze accounts");
+	executeStatement(con, "vacuum analyze history");
 
 	fprintf(stderr, "done.\n");
 	PQfinish(con);
@@ -1757,8 +1760,7 @@ main(int argc, char **argv)
 		fprintf(stderr, "starting vacuum...");
 		executeStatement(con, "vacuum branches");
 		executeStatement(con, "vacuum tellers");
-		executeStatement(con, "delete from history");
-		executeStatement(con, "vacuum history");
+		executeStatement(con, "truncate history");
 		fprintf(stderr, "end.\n");
 
 		if (do_vacuum_accounts)
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.145 2008/07/12 00:44:37 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.146 2008/08/22 17:57:34 momjian Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2008, PostgreSQL Global Development Group
@@ -3197,9 +3197,7 @@ do_to_timestamp(text *date_txt, text *fmt,
 		 * ISO week (Monday).
 		 */
 		if (tmfc.d)
-		{
 			isoweekdate2date(tmfc.iw, tmfc.d, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
-		}
 		else
 			isoweek2date(tmfc.iw, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* -----------------------------------------------------------------------`
`2`	`2`	`* formatting.c`
`3`	`3`	`*`
`4`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.145 2008/07/12 00:44:37 tgl Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.146 2008/08/22 17:57:34 momjian Exp $`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1999-2008, PostgreSQL Global Development Group`
`@@ -3197,9 +3197,7 @@ do_to_timestamp(text date_txt, text fmt,`
`3197`	`3197`	`* ISO week (Monday).`
`3198`	`3198`	`*/`
`3199`	`3199`	`if (tmfc.d)`
`3200`		`- {`
`3201`	`3200`	`isoweekdate2date(tmfc.iw, tmfc.d, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);`
`3202`		`- }`
`3203`	`3201`	`else`
`3204`	`3202`	`isoweek2date(tmfc.iw, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);`
`3205`	`3203`	`}`