Minor patch on pgbench

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
index e23d531ebc6cf1015b0114d2afed85869eb010c3..6ea45ea7adad8a5e9f598203887abf054dcaf15b 100644 (file)
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -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
index 8b35694e9195314000dcdbe0fb96782bed019c52..e6fac500a7181509913e49904f36d3236f2ba495 100644 (file)
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -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);
        }