Repair breakage of Wisconsin benchmark due to change of command line syntax

for standalone backends.

Although we probably ought to just remove this long-obsolete test case from
our code, it seems worthwhile to document the issue and fix in CVS first.

Jeff Janes

diff --git a/src/test/bench/create.sh b/src/test/bench/create.sh
index 48b2e32a8e68059522097b803665a925f67b8655..c358cdf965ed8632f1cd0eff9eaef88f170f8153 100755 (executable)
--- a/src/test/bench/create.sh
+++ b/src/test/bench/create.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $PostgreSQL: pgsql/src/test/bench/create.sh,v 1.6 2007/08/01 22:23:01 momjian Exp $
+# $PostgreSQL: pgsql/src/test/bench/create.sh,v 1.7 2009/08/14 18:49:34 tgl Exp $
 # 
 if [ ! -d $1 ]; then
    echo " you must specify a valid data directory " >&2
@@ -10,16 +10,16 @@ if [ -d ./obj ]; then
 fi
 
 echo =============== destroying old bench database... =================
-echo "drop database bench" | postgres -D"$1" postgres > /dev/null
+echo "drop database bench" | postgres --single -D"$1" postgres > /dev/null
 
 echo =============== creating new bench database... =================
-echo "create database bench" | postgres -D"$1" postgres > /dev/null
+echo "create database bench" | postgres --single -D"$1" postgres > /dev/null
 if [ $? -ne 0 ]; then
    echo createdb failed
    exit 1
 fi
 
-postgres -D${1} bench < create.sql > /dev/null
+postgres --single -D${1} bench < create.sql > /dev/null
 if [ $? -ne 0 ]; then
    echo initial database load failed
    exit 1

diff --git a/src/test/bench/runwisc.sh b/src/test/bench/runwisc.sh
index 0012958b481f9deafa87a6b9f09ffb9d9476ae84..d428ba64515c56deff2404f15e73c925b69ff6a6 100755 (executable)
--- a/src/test/bench/runwisc.sh
+++ b/src/test/bench/runwisc.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $PostgreSQL: pgsql/src/test/bench/runwisc.sh,v 1.10 2007/08/19 01:41:25 adunstan Exp $
+# $PostgreSQL: pgsql/src/test/bench/runwisc.sh,v 1.11 2009/08/14 18:49:34 tgl Exp $
 
 if [ ! -d $1 ]; then
         echo " you must specify a valid data directory " >&2
@@ -11,7 +11,7 @@ if [ -d ./obj ]; then
 fi
 
 echo =============== vacuuming benchmark database... ================= >&2
-echo "vacuum" | postgres -D"$1" bench > /dev/null
+echo "vacuum" | postgres --single -D"$1" bench > /dev/null
 
 echo =============== running benchmark... ================= >&2
-time postgres -D"$1" -texecutor -tplanner -c log_min_messages=log -c log_destination=stderr -c start_log_collector=off bench < bench.sql 2>&1
+time postgres --single -D"$1" -texecutor -tplanner -c log_min_messages=log -c log_destination=stderr -c logging_collector=off bench < bench.sql 2>&1