From b1e00c96809479e5de09aa97509883ea96274b57 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 5 Jun 2001 04:05:33 +0300 Subject: Updated benchmarks and crash-me for postgreSQL 7.1.1 Fixed option for symlinks Docs/manual.texi: Updated symlink handling. sql-bench/Comments/postgres.benchmark: Updated benchmark text sql-bench/Makefile.am: Added graph-compare-results sql-bench/compare-results.sh: Don't reset the cmp option. sql-bench/crash-me.sh: Updated transaction testing. sql-bench/limits/mysql-3.23.cfg: Updated benchmark run sql-bench/limits/mysql.cfg: Updated benchmark run sql-bench/limits/pg.cfg: Updated benchmark run sql-bench/server-cfg.sh: Don't do vacuum too often. sql-bench/test-insert.sh: Don't do vacuum too often. sql/mysqld.cc: Changed skip-symlinks to skip-symlink --- sql-bench/server-cfg.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'sql-bench/server-cfg.sh') diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index 1983b2ce01b..86b891d8856 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -799,18 +799,27 @@ sub reconnect_on_errors sub vacuum { - my ($self,$full_vacuum,$dbh_ref)=@_; - my ($loop_time,$end_time,$dbh); + my ($self,$full_vacuum,$dbh_ref,@tables)=@_; + my ($loop_time,$end_time,$dbh,$table); if (defined($full_vacuum)) { $$dbh_ref->disconnect; $$dbh_ref= $self->connect(); } $dbh=$$dbh_ref; $loop_time=new Benchmark; - $dbh->do("vacuum") || die "Got error: $DBI::errstr when executing 'vacuum'\n"; - $dbh->do("vacuum pg_attributes") || die "Got error: $DBI::errstr when executing 'vacuum'\n"; - $dbh->do("vacuum pg_index") || die "Got error: $DBI::errstr when executing 'vacuum'\n"; - $dbh->do("vacuum analyze") || die "Got error: $DBI::errstr when executing 'vacuum'\n"; + if ($#tables >= 0) + { + foreach $table (@tables) + { + $dbh->do("vacuum $table") || die "Got error: $DBI::errstr when executing 'vacuum'\n"; + } + } + else + { +# $dbh->do("vacuum pg_attributes") || die "Got error: $DBI::errstr when executing 'vacuum'\n"; +# $dbh->do("vacuum pg_index") || die "Got error: $DBI::errstr when executing 'vacuum'\n"; + $dbh->do("vacuum") || die "Got error: $DBI::errstr when executing 'vacuum'\n"; + } $end_time=new Benchmark; print "Time for book-keeping (1): " . Benchmark::timestr(Benchmark::timediff($end_time, $loop_time),"all") . "\n\n"; -- cgit v1.2.1