diff --git a/src/test/bench/create.sh b/src/test/bench/create.sh index 57563d8d4a5ec778a7682291a6b4346e9735d1b1..efdecb9403fc7bed04fec15c2b685b309c0b620b 100755 --- a/src/test/bench/create.sh +++ b/src/test/bench/create.sh @@ -1,21 +1,25 @@ #!/bin/sh -# $Header: /cvsroot/pgsql/src/test/bench/Attic/create.sh,v 1.1.1.1 1996/07/09 06:22:21 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/test/bench/Attic/create.sh,v 1.2 1997/04/17 13:48:49 scrappy Exp $ # +if [ ! -d $1 ]; then + echo " you must specify a valid data directory " + exit +fi if [ -d ./obj ]; then cd ./obj fi echo =============== destroying old bench database... ================= -echo "drop database bench" | postgres template1 > /dev/null +echo "drop database bench" | postgres -D${1} template1 > /dev/null echo =============== creating new bench database... ================= -echo "create database bench" | postgres template1 > /dev/null +echo "create database bench" | postgres -D${1} template1 > /dev/null if [ $? -ne 0 ]; then echo createdb failed exit 1 fi -postgres -Q bench < create.sql > /dev/null +postgres -D${1} -Q 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 0d5afa389e032a68b67af87226f6ccaead0170a2..50bf3532fa653b578b6b741fd79b6ec1a34f004b 100755 --- a/src/test/bench/runwisc.sh +++ b/src/test/bench/runwisc.sh @@ -1,17 +1,22 @@ #!/bin/sh -# $Header: /cvsroot/pgsql/src/test/bench/Attic/runwisc.sh,v 1.1.1.1 1996/07/09 06:22:23 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/test/bench/Attic/runwisc.sh,v 1.2 1997/04/17 13:48:52 scrappy Exp $ # # Note that in our published benchmark numbers, we executed the command in the # following fashion: # # time $POSTGRES -texecutor -tplanner -f hashjoin -Q bench # +if [ ! -d $1 ]; then + echo " you must specify a valid data directory " + exit +fi + if [ -d ./obj ]; then cd ./obj fi echo =============== vacuuming benchmark database... ================= -echo "vacuum" | postgres -Q bench > /dev/null +echo "vacuum" | postgres -D${1} -Q bench > /dev/null echo =============== running benchmark... ================= -time postgres -texecutor -tplanner -Q bench < bench.sql +time postgres -D${1} -texecutor -tplanner -Q bench < bench.sql