From f77779f9f937099956f8b61c045d933e4d2b7960 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 22 Aug 2008 17:57:34 +0000 Subject: [PATCH] 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 --- contrib/pgbench/pgbench.c | 8 +++++--- src/backend/utils/adt/formatting.c | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index e23d531ebc..6ea45ea7ad 100644 --- 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 8b35694e91..e6fac500a7 100644 --- 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); } -- 2.39.5