Various pgbench enhancements. Patch contributed by ITAGAKI Takahiro.

tatsuo-ishii · tatsuo-ishii · commit 7e96269a82d0 · 2007-04-06T08:49:44.000Z
Also tweak README.pgbench/README.pgbench_jis:
  Remove history after pgbench was added to PostgreSQL contrib module.
  Those info was not only redundant since it has already been in CVS
  log, but also incomplete.
--------------------------------------------------------------------------
The attached is a patch to optimize contrib/pgbench using new 8.3 features.

- Use DROP IF EXISTS to suppress errors for initial loadings.
- Use a combination of TRUNCATE and COPY to reduce WAL on creating
  the accounts table.

Also, there are some cosmetic changes.

- Change the output of -v option from "starting full vacuum..."
  to "starting vacuum accounts..." in reflection of the fact.
- Shape duplicated error checks into executeStatement().


There is a big performance win in "COPY with no WAL" feature.
Thanks for the efforts!
--------------------------------------------------------------------------
diff --git a/contrib/pgbench/README.pgbench b/contrib/pgbench/README.pgbench
@@ -1,4 +1,6 @@
-pgbench README		2006/10/21 Tatsuo Ishii
+$PostgreSQL: pgsql/contrib/pgbench/README.pgbench,v 1.16 2007/04/06 08:49:44 ishii Exp $
+
+pgbench README
 
 o What is pgbench?
 
@@ -233,54 +235,7 @@ o License?
 
 Basically it is same as BSD license. See pgbench.c for more details.
 
-o History
-
-2006/10/21
-	* more fix with handling default scaling factor in the default
-          scenarios
-
-2006/09/14
-	* change "tps" to "scale" to avoid confusion
-
-	* fix bug with handling default scaling factor in the default
-          scenarios
-
-2006/07/26
-	* New features contributed by Tomoaki Sato.
-
-	* predefined variable "tps"
-	    The value of variable tps is taken from the scaling factor
-	    specified by -s option.
-        * -D option
-	   Variable values can be defined by -D option.
-	* \set command now allows arithmetic calculations.
-
-2005/09/29
-	* add -f option. contributed by Tomoaki Sato.
-
-[updation records were missing]
-
-2003/11/26
-	* create indexes after data insertion to reduce time.
-	  patch from Yutaka Tanida.
-
-2003/06/10
-	* fix uninitialized memory bug
-	* add support for PGHOST, PGPORT, PGUSER environment variables
-
-2002/07/20
-	* patch contributed by Neil Conway.
-	* code/document clean up and add -l option.
-
-2002/02/24
-	* do not CHECKPOINT anymore while initializing benchmark
-	* database. Add -N option.
-
-2001/10/24
-	* "time"->"mtime"
-
-2001/09/09
-	* Add -U, -P, -C options
+o History before contributed to PostgreSQL
 
 2000/1/15 pgbench-1.2 contributed to PostgreSQL
 	* Add -v option
diff --git a/contrib/pgbench/README.pgbench_jis b/contrib/pgbench/README.pgbench_jis
@@ -1,4 +1,6 @@
-pgbench README		2006/10/21 Tatsuo Ishii
+$PostgreSQL: pgsql/contrib/pgbench/README.pgbench_jis,v 1.17 2007/04/06 08:49:44 ishii Exp $
+
+pgbench README
 
 $B"#(Bpgbench $B$H$O!)(B
 
@@ -283,57 +285,7 @@ pgbench $B$O@P0f(B $BC#IW$K$h$C$F=q$+$l$^$7$?!%%i%$%;%s%9>r7o$O(B pgbench.c
 $BKAF,$K=q$$$F$"$j$^$9!%$3$N>r7o$r<i$k8B$jL5=~$GMxMQ$7!$$^$?<+M3$K:FG[IU(B
 $B$G$-$^$9!%(B
 
-$B"#2~DjMzNr(B
-
-2006/10/21
-	* $B99$K%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?$r(Bbranches$B$+$i<h$C$F$3$J(B
-          $B$$%P%0$r=$@5!%(B
-
-2006/09/13
-	* $BJQ?t(Btps$B$OJ6$i$o$7$$$N$G(Bscale$B$KJQ99!%%G%U%)%k%H%7%J%j%*$N;~$K!$(B
-	  $B%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?$r(Bbranches$B$+$i<h$C$F$3$J$$%P%0$r=$@5!%(B
-
-2006/07/26
-	* $B:4F#$5$s$N%Q%C%A$rE,MQ!%0J2<$N5!G=DI2C!%(BPostgreSQL 8.2$B$K<h$j(B
-	$B9~$^$l$^$9!%(B
-
-	$BJQ?t(B tps
-	    -s $B%*%W%7%g%s$G;XDj$7$?%9%1!<%j%s%0%U%!%/%?!<$r%U%!%$%kFb$GJQ?t$H$7(B
-	   $B$F;2>H$9$k5!G=(B
-        -D $B%*%W%7%g%s(B
-	   $B%3%^%s%I$N%*%W%7%g%s$H$7$FDj5A$7$?JQ?t$r%U%!%$%kFb$+$i;2>H$9$k5!G=(B
-	\set $B%3%^%s%I(B
-	   $B%U%!%$%kFb$G;MB'1i;;$r9T$$!"$=$N7k2L$rJQ?t$KBeF~$9$k5!G=(B
-
-2005/09/29
-	* $B:4F#$5$s$N%Q%C%A$rE,MQ!%(B-f $B%*%W%7%g%s$NDI2C!%(B
-
-[$B$3$N4V$$$m$$$mJQ99$,$"$C$?$h$&$@$,(BREADME$B$O%a%$%s%F%J%s%9$5$l$F$$$J$$(B]
-
-2003/11/26
-	* $BC+ED$5$s$N%Q%C%A$rE,MQ!%(Bpgbench -i$B$N:]$K!$8e$+$i<g%-!<$r:n@.(B
-	  $B$9$k$h$&$K$7$?!%$3$l$K$h$C$F=i4|2=$N<B9T;~4V$,BgI}$KC;=L$G$-(B
-	  $B$k(B($B$O$:(B)$B!%(B
-
-2003/06/10
-	* $B%a%b%j$,=i4|2=$5$l$F$$$J$$%P%0$r=$@5(B
-	* $B4D6-JQ?t(BPGHOST, PGPORT, PGUSER$B$rG'<1$9$k$h$&$K$7$?!%(B
-
-2002/07/20
-	* Nei Conway$B$5$s$N%Q%C%A$rE,MQ!%(B
-	* -l $B%*%W%7%g%s$NDI2C!%(B
-
-2002/02/24
-	* $B$3$3$+$i$O(B7.3$BMQ$NJQ99$G$9!%(B
-	* CHECKPOINT$B$NH/9T$r$d$a$^$7$?!%(B
-	* -N $B%*%W%7%g%s$rDI2C$7$^$7$?!%(B
-
-2001/10/24
-	* PostgreSQL 7.2$B$G!$(B"time"$B$,M=Ls8l$K$J$C$?$N$G!$(B"mtime"$B$KJQ99(B
-	$B$7$?!%(B
-
-2001/09/09
-	* PostgreSQL 7.2$BMQ$K!$(B-U, -P, -C $B%*%W%7%g%s$rDI2C$7$^$7$?!%(B
+$B"#(BPostgreSQL$B$N(Bcontrib$B%b%8%e!<%k$H$7$F<h$j9~$^$l$k$^$G$N2~DjMzNr(B
 
 2000/1/15 pgbench-1.2 $B$O(B PostgreSQL $B$K(B contribute $B$5$l$^$7$?!%(B
 	* -v $B%*%W%7%g%sDI2C(B
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c

-Original file line number
+Diff line change
@@ @@ -1,4 +1,6 @@ @@
 -pgbench README		2006/10/21 Tatsuo Ishii
 +$PostgreSQL: pgsql/contrib/pgbench/README.pgbench_jis,v 1.17 2007/04/06 08:49:44 ishii Exp $
++
 +pgbench README
 $B"#(Bpgbench $B$H$O!)(B
 $BKAF,$K=q$$$F$"$j$^$9!%$3$N>r7o$r<i$k8B$jL5=~$GMxMQ$7!$$^$?<+M3$K:FG[IU(B
 $B$G$-$^$9!%(B
 -$B"#2~DjMzNr(B
+-
 -2006/10/21
 -	* $B99$K%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?$r(Bbranches$B$+$i<h$C$F$3$J(B
 -          $B$$%P%0$r=$@5!%(B
+-
 -2006/09/13
 -	* $BJQ?t(Btps$B$OJ6$i$o$7$$$N$G(Bscale$B$KJQ99!%%G%U%)%k%H%7%J%j%*$N;~$K!$(B
 -	  $B%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?$r(Bbranches$B$+$i<h$C$F$3$J$$%P%0$r=$@5!%(B
+-
 -2006/07/26
 -	* $B:4F#$5$s$N%Q%C%A$rE,MQ!%0J2<$N5!G=DI2C!%(BPostgreSQL 8.2$B$K<h$j(B
 -	$B9~$^$l$^$9!%(B
+-
 -	$BJQ?t(B tps
 -	    -s $B%*%W%7%g%s$G;XDj$7$?%9%1!<%j%s%0%U%!%/%?!<$r%U%!%$%kFb$GJQ?t$H$7(B
 -	   $B$F;2>H$9$k5!G=(B
 -        -D $B%*%W%7%g%s(B
 -	   $B%3%^%s%I$N%*%W%7%g%s$H$7$FDj5A$7$?JQ?t$r%U%!%$%kFb$+$i;2>H$9$k5!G=(B
 -	\set $B%3%^%s%I(B
 -	   $B%U%!%$%kFb$G;MB'1i;;$r9T$$!"$=$N7k2L$rJQ?t$KBeF~$9$k5!G=(B
+-
 -2005/09/29
 -	* $B:4F#$5$s$N%Q%C%A$rE,MQ!%(B-f $B%*%W%7%g%s$NDI2C!%(B
+-
 -[$B$3$N4V$$$m$$$mJQ99$,$"$C$?$h$&$@$,(BREADME$B$O%a%$%s%F%J%s%9$5$l$F$$$J$$(B]
+-
 -2003/11/26
 -	* $BC+ED$5$s$N%Q%C%A$rE,MQ!%(Bpgbench -i$B$N:]$K!$8e$+$i<g%-!<$r:n@.(B
 -	  $B$9$k$h$&$K$7$?!%$3$l$K$h$C$F=i4|2=$N<B9T;~4V$,BgI}$KC;=L$G$-(B
 -	  $B$k(B($B$O$:(B)$B!%(B
+-
 -2003/06/10
 -	* $B%a%b%j$,=i4|2=$5$l$F$$$J$$%P%0$r=$@5(B
 -	* $B4D6-JQ?t(BPGHOST, PGPORT, PGUSER$B$rG'<1$9$k$h$&$K$7$?!%(B
+-
 -2002/07/20
 -	* Nei Conway$B$5$s$N%Q%C%A$rE,MQ!%(B
 -	* -l $B%*%W%7%g%s$NDI2C!%(B
+-
 -2002/02/24
 -	* $B$3$3$+$i$O(B7.3$BMQ$NJQ99$G$9!%(B
 -	* CHECKPOINT$B$NH/9T$r$d$a$^$7$?!%(B
 -	* -N $B%*%W%7%g%s$rDI2C$7$^$7$?!%(B
+-
 -2001/10/24
 -	* PostgreSQL 7.2$B$G!$(B"time"$B$,M=Ls8l$K$J$C$?$N$G!$(B"mtime"$B$KJQ99(B
 -	$B$7$?!%(B
+-
 -2001/09/09
 -	* PostgreSQL 7.2$BMQ$K!$(B-U, -P, -C $B%*%W%7%g%s$rDI2C$7$^$7$?!%(B
 +$B"#(BPostgreSQL$B$N(Bcontrib$B%b%8%e!<%k$H$7$F<h$j9~$^$l$k$^$G$N2~DjMzNr(B
 /1/15 pgbench-1.2 $B$O(B PostgreSQL $B$K(B contribute $B$5$l$^$7$?!%(B
 	* -v $B%*%W%7%g%sDI2C(B