From e062a176a8fbbb61a4bd188b78c46e950adb8111 Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Fri, 16 Apr 1999 06:31:13 +0000 Subject: [PATCH] Overhaul Wisconsin Benchmark test suit - change temp -> temp_bench ("temp" is now a reserved word) - fix bugs in queries - add -B 256 option to run the postgres command (without this, postgres seems to fail with hashjoin) --- src/test/bench/query01 | 8 ++++---- src/test/bench/query02 | 8 ++++---- src/test/bench/query03 | 8 ++++---- src/test/bench/query04 | 8 ++++---- src/test/bench/query05 | 8 ++++---- src/test/bench/query06 | 8 ++++---- src/test/bench/query09 | 8 ++++---- src/test/bench/query10 | 8 ++++---- src/test/bench/query11 | 8 ++++---- src/test/bench/query12 | 8 ++++---- src/test/bench/query13 | 8 ++++---- src/test/bench/query14 | 8 ++++---- src/test/bench/query15 | 8 ++++---- src/test/bench/query16 | 8 ++++---- src/test/bench/query17 | 8 ++++---- src/test/bench/query18 | 8 ++++---- src/test/bench/query19 | 8 ++++---- src/test/bench/query20 | 8 ++++---- src/test/bench/query23 | 8 ++++---- src/test/bench/query26 | 4 ++-- src/test/bench/query29 | 4 ++-- src/test/bench/runwisc.sh | 4 ++-- 22 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/test/bench/query01 b/src/test/bench/query01 index 0ed3a7b1e5..07050b6cc7 100644 --- a/src/test/bench/query01 +++ b/src/test/bench/query01 @@ -1,4 +1,4 @@ -select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402); -drop table temp; -select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402); -drop table temp; +select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402); +drop table temp_bench; +select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402); +drop table temp_bench; diff --git a/src/test/bench/query02 b/src/test/bench/query02 index 2d253ac1ef..e7b4f38818 100644 --- a/src/test/bench/query02 +++ b/src/test/bench/query02 @@ -1,4 +1,4 @@ -select * into table temp from tenk1 where (unique1 > 647) and (unique1 < 1648); -drop table temp; -select * into table temp from tenk1 where (unique1 > 647) and (unique1 < 1648); -drop table temp; +select * into table temp_bench from tenk1 where (unique1 > 647) and (unique1 < 1648); +drop table temp_bench; +select * into table temp_bench from tenk1 where (unique1 > 647) and (unique1 < 1648); +drop table temp_bench; diff --git a/src/test/bench/query03 b/src/test/bench/query03 index 0ed3a7b1e5..07050b6cc7 100644 --- a/src/test/bench/query03 +++ b/src/test/bench/query03 @@ -1,4 +1,4 @@ -select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402); -drop table temp; -select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402); -drop table temp; +select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402); +drop table temp_bench; +select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402); +drop table temp_bench; diff --git a/src/test/bench/query04 b/src/test/bench/query04 index 2d253ac1ef..e7b4f38818 100644 --- a/src/test/bench/query04 +++ b/src/test/bench/query04 @@ -1,4 +1,4 @@ -select * into table temp from tenk1 where (unique1 > 647) and (unique1 < 1648); -drop table temp; -select * into table temp from tenk1 where (unique1 > 647) and (unique1 < 1648); -drop table temp; +select * into table temp_bench from tenk1 where (unique1 > 647) and (unique1 < 1648); +drop table temp_bench; +select * into table temp_bench from tenk1 where (unique1 > 647) and (unique1 < 1648); +drop table temp_bench; diff --git a/src/test/bench/query05 b/src/test/bench/query05 index 0ed3a7b1e5..07050b6cc7 100644 --- a/src/test/bench/query05 +++ b/src/test/bench/query05 @@ -1,4 +1,4 @@ -select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402); -drop table temp; -select * into table temp from tenk1 where (unique2 > 301) and (unique2 < 402); -drop table temp; +select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402); +drop table temp_bench; +select * into table temp_bench from tenk1 where (unique2 > 301) and (unique2 < 402); +drop table temp_bench; diff --git a/src/test/bench/query06 b/src/test/bench/query06 index 209c1321e6..01b382f0b8 100644 --- a/src/test/bench/query06 +++ b/src/test/bench/query06 @@ -1,4 +1,4 @@ -select * into table temp from tenk1 where (unique2 > 647) and (unique2 < 1648); -drop table temp; -select * into table temp from tenk1 where (unique2 > 647) and (unique2 < 1648); -drop table temp; +select * into table temp_bench from tenk1 where (unique2 > 647) and (unique2 < 1648); +drop table temp_bench; +select * into table temp_bench from tenk1 where (unique2 > 647) and (unique2 < 1648); +drop table temp_bench; diff --git a/src/test/bench/query09 b/src/test/bench/query09 index 66d33ca1ad..c33ce342b5 100644 --- a/src/test/bench/query09 +++ b/src/test/bench/query09 @@ -1,4 +1,4 @@ -select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand, t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk1 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000); -drop table temp; -select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand, t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk1 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000); -drop table temp; +select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand, t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk1 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000); +drop table temp_bench; +select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand, t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk1 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000); +drop table temp_bench; diff --git a/src/test/bench/query10 b/src/test/bench/query10 index de372aa647..c937a60b45 100644 --- a/src/test/bench/query10 +++ b/src/test/bench/query10 @@ -1,4 +1,4 @@ -select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique2 = B.unique2; -drop table temp; -select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique2 = B.unique2; -drop table temp; +select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique2 = B.unique2; +drop table temp_bench; +select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique2 = B.unique2; +drop table temp_bench; diff --git a/src/test/bench/query11 b/src/test/bench/query11 index abbce829a8..4f6013ebc1 100644 --- a/src/test/bench/query11 +++ b/src/test/bench/query11 @@ -1,4 +1,4 @@ -select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000); -drop table temp; -select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000); -drop table temp; +select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000); +drop table temp_bench; +select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000); +drop table temp_bench; diff --git a/src/test/bench/query12 b/src/test/bench/query12 index d1b4611fee..f601c24ddb 100644 --- a/src/test/bench/query12 +++ b/src/test/bench/query12 @@ -1,4 +1,4 @@ -select t1.*,t2.unique1 AS t2unique1,t2.unique2 AS t2unique2,t2.two AS t2two, t2.four AS t2four,t2.ten AS t2ten,t2.twenty AS t2twenty,t2.hundred AS t2hundred,t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous,t2.tenthous AS t2tenthous,t2.odd AS t2odd, t2.even AS t2even,t2.stringu1 AS t2stringu1,t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk2 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000); -drop table temp; -select t1.*,t2.unique1 AS t2unique1,t2.unique2 AS t2unique2,t2.two AS t2two, t2.four AS t2four,t2.ten AS t2ten,t2.twenty AS t2twenty,t2.hundred AS t2hundred,t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous,t2.tenthous AS t2tenthous,t2.odd AS t2odd, t2.even AS t2even,t2.stringu1 AS t2stringu1,t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk2 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000); -drop table temp; +select t1.*,t2.unique1 AS t2unique1,t2.unique2 AS t2unique2,t2.two AS t2two, t2.four AS t2four,t2.ten AS t2ten,t2.twenty AS t2twenty,t2.hundred AS t2hundred,t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous,t2.tenthous AS t2tenthous,t2.odd AS t2odd, t2.even AS t2even,t2.stringu1 AS t2stringu1,t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk2 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000); +drop table temp_bench; +select t1.*,t2.unique1 AS t2unique1,t2.unique2 AS t2unique2,t2.two AS t2two, t2.four AS t2four,t2.ten AS t2ten,t2.twenty AS t2twenty,t2.hundred AS t2hundred,t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous,t2.tenthous AS t2tenthous,t2.odd AS t2odd, t2.even AS t2even,t2.stringu1 AS t2stringu1,t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk2 t2 where (t1.unique2 = t2.unique2) and (t2.unique2 < 1000); +drop table temp_bench; diff --git a/src/test/bench/query13 b/src/test/bench/query13 index de372aa647..c937a60b45 100644 --- a/src/test/bench/query13 +++ b/src/test/bench/query13 @@ -1,4 +1,4 @@ -select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique2 = B.unique2; -drop table temp; -select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique2 = B.unique2; -drop table temp; +select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique2 = B.unique2; +drop table temp_bench; +select t.*,B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten,B.twenty AS Btwenty,B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand,B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd,B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique2 = B.unique2; +drop table temp_bench; diff --git a/src/test/bench/query14 b/src/test/bench/query14 index abbce829a8..4f6013ebc1 100644 --- a/src/test/bench/query14 +++ b/src/test/bench/query14 @@ -1,4 +1,4 @@ -select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000); -drop table temp; -select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000); -drop table temp; +select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000); +drop table temp_bench; +select t1.*,o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk1 t2 where (o.unique2 = t1.unique2) and (t1.unique2 = t2.unique2) and (t1.unique2 < 1000) and (t2.unique2 < 1000); +drop table temp_bench; diff --git a/src/test/bench/query15 b/src/test/bench/query15 index be5fb5b45f..78192121e5 100644 --- a/src/test/bench/query15 +++ b/src/test/bench/query15 @@ -1,4 +1,4 @@ -select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk2 t2 where (t1.unique1 = t2.unique1) and (t2.unique1 < 1000); -drop table temp; -select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp from tenk1 t1, tenk2 t2 where (t1.unique1 = t2.unique1) and (t2.unique1 < 1000); -drop table temp; +select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk2 t2 where (t1.unique1 = t2.unique1) and (t2.unique1 < 1000); +drop table temp_bench; +select t1.*, t2.unique1 AS t2unique1, t2.unique2 AS t2unique2, t2.two AS t2two, t2.four AS t2four, t2.ten AS t2ten, t2.twenty AS t2twenty, t2.hundred AS t2hundred, t2.thousand AS t2thousand,t2.twothousand AS t2twothousand, t2.fivethous AS t2fivethous, t2.tenthous AS t2tenthous, t2.odd AS t2odd, t2.even AS t2even, t2.stringu1 AS t2stringu1, t2.stringu2 AS t2stringu2, t2.string4 AS t2string4 into table temp_bench from tenk1 t1, tenk2 t2 where (t1.unique1 = t2.unique1) and (t2.unique1 < 1000); +drop table temp_bench; diff --git a/src/test/bench/query16 b/src/test/bench/query16 index 6e36649030..39e64895c6 100644 --- a/src/test/bench/query16 +++ b/src/test/bench/query16 @@ -1,4 +1,4 @@ -select t.*, B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten, B.twenty AS Btwenty, B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand, B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd, B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique1 = B.unique1; -drop table temp; -select t.*, B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten, B.twenty AS Btwenty, B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand, B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd, B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp from tenk1 t, Bprime B where t.unique1 = B.unique1; -drop table temp; +select t.*, B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten, B.twenty AS Btwenty, B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand, B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd, B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique1 = B.unique1; +drop table temp_bench; +select t.*, B.unique1 AS Bunique1,B.unique2 AS Bunique2,B.two AS Btwo,B.four AS Bfour,B.ten AS Bten, B.twenty AS Btwenty, B.hundred AS Bhundred,B.thousand AS Bthousand,B.twothousand AS Btwothousand, B.fivethous AS Bfivethous,B.tenthous AS Btenthous,B.odd AS Bodd, B.even AS Beven,B.stringu1 AS Bstringu1,B.stringu2 AS Bstringu2,B.string4 AS Bstring4 into table temp_bench from tenk1 t, Bprime B where t.unique1 = B.unique1; +drop table temp_bench; diff --git a/src/test/bench/query17 b/src/test/bench/query17 index e3b501ba3f..0b8e0a590c 100644 --- a/src/test/bench/query17 +++ b/src/test/bench/query17 @@ -1,4 +1,4 @@ -select t1.*, o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk2 t2 where (o.unique1 = t1.unique1) and (t1.unique1 = t2.unique1) and (t1.unique1 < 1000) and (t2.unique1 < 1000); -drop table temp; -select t1.*, o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp from onek o, tenk1 t1, tenk2 t2 where (o.unique1 = t1.unique1) and (t1.unique1 = t2.unique1) and (t1.unique1 < 1000) and (t2.unique1 < 1000); -drop table temp; +select t1.*, o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk2 t2 where (o.unique1 = t1.unique1) and (t1.unique1 = t2.unique1) and (t1.unique1 < 1000) and (t2.unique1 < 1000); +drop table temp_bench; +select t1.*, o.unique1 AS ounique1,o.unique2 AS ounique2,o.two AS otwo,o.four AS ofour,o.ten AS oten,o.twenty AS otwenty,o.hundred AS ohundred,o.thousand AS othousand,o.twothousand AS otwothousand,o.fivethous AS ofivethous,o.tenthous AS otenthous,o.odd AS oodd, o.even AS oeven,o.stringu1 AS ostringu1,o.stringu2 AS ostringu2,o.string4 AS ostring4 into table temp_bench from onek o, tenk1 t1, tenk2 t2 where (o.unique1 = t1.unique1) and (t1.unique1 = t2.unique1) and (t1.unique1 < 1000) and (t2.unique1 < 1000); +drop table temp_bench; diff --git a/src/test/bench/query18 b/src/test/bench/query18 index 92fe5f79b2..4a793a9291 100644 --- a/src/test/bench/query18 +++ b/src/test/bench/query18 @@ -1,4 +1,4 @@ -select two, four, ten, twenty, hundred, string4 into table temp from tenk1; -drop table temp; -select two, four, ten, twenty, hundred, string4 into table temp from tenk1; -drop table temp; +select two, four, ten, twenty, hundred, string4 into table temp_bench from tenk1; +drop table temp_bench; +select two, four, ten, twenty, hundred, string4 into table temp_bench from tenk1; +drop table temp_bench; diff --git a/src/test/bench/query19 b/src/test/bench/query19 index 1ed160d7ab..c75ab3fd46 100644 --- a/src/test/bench/query19 +++ b/src/test/bench/query19 @@ -1,4 +1,4 @@ -select * into table temp from onek; -drop table temp; -select * into table temp from onek; -drop table temp; +select * into table temp_bench from onek; +drop table temp_bench; +select * into table temp_bench from onek; +drop table temp_bench; diff --git a/src/test/bench/query20 b/src/test/bench/query20 index e544ea63f4..db7568dff7 100644 --- a/src/test/bench/query20 +++ b/src/test/bench/query20 @@ -1,4 +1,4 @@ -select int4min(unique2) as x into table temp from tenk1; -drop table temp; -select int4min(unique2) as x into table temp from tenk1; -drop table temp; +select min(unique2) as x into table temp_bench from tenk1; +drop table temp_bench; +select min(unique2) as x into table temp_bench from tenk1; +drop table temp_bench; diff --git a/src/test/bench/query23 b/src/test/bench/query23 index e544ea63f4..db7568dff7 100644 --- a/src/test/bench/query23 +++ b/src/test/bench/query23 @@ -1,4 +1,4 @@ -select int4min(unique2) as x into table temp from tenk1; -drop table temp; -select int4min(unique2) as x into table temp from tenk1; -drop table temp; +select min(unique2) as x into table temp_bench from tenk1; +drop table temp_bench; +select min(unique2) as x into table temp_bench from tenk1; +drop table temp_bench; diff --git a/src/test/bench/query26 b/src/test/bench/query26 index 715c4c3744..32dedf054c 100644 --- a/src/test/bench/query26 +++ b/src/test/bench/query26 @@ -1,2 +1,2 @@ -insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even,stringu1,stringu2, string4) values (1000, 74, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, "ron may choi","jae kwang choi", "u. c. berkeley"); -insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (1999, 60, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, "ron may choi", "jae kwang choi", "u. c. berkeley"); +insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even,stringu1,stringu2, string4) values (1000, 74, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, 'ron may choi','jae kwang choi', 'u. c. berkeley'); +insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (1999, 60, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, 'ron may choi', 'jae kwang choi', 'u. c. berkeley'); diff --git a/src/test/bench/query29 b/src/test/bench/query29 index 3600685c6a..f6a715b229 100644 --- a/src/test/bench/query29 +++ b/src/test/bench/query29 @@ -1,2 +1,2 @@ -insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (1000, 70, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, "ron may choi", "jae kwang choi", "u. c. berkeley"); -insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (500, 40, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, "ron may choi", "jae kwang choi", "u. c. berkeley"); +insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (1000, 70, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, 'ron may choi', 'jae kwang choi', 'u. c. berkeley'); +insert into tenk1 (unique1, unique2, two, four, ten, twenty, hundred, thousand, twothousand, fivethous, tenthous, odd, even, stringu1, stringu2, string4) values (500, 40, 0, 2, 0, 10, 50, 688, 1950, 4950, 9950, 1, 100, 'ron may choi', 'jae kwang choi', 'u. c. berkeley'); diff --git a/src/test/bench/runwisc.sh b/src/test/bench/runwisc.sh index 50bf3532fa..8ddce2e3a6 100755 --- a/src/test/bench/runwisc.sh +++ b/src/test/bench/runwisc.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Header: /cvsroot/pgsql/src/test/bench/Attic/runwisc.sh,v 1.2 1997/04/17 13:48:52 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/test/bench/Attic/runwisc.sh,v 1.3 1999/04/16 06:31:13 ishii Exp $ # # Note that in our published benchmark numbers, we executed the command in the # following fashion: @@ -19,4 +19,4 @@ echo =============== vacuuming benchmark database... ================= echo "vacuum" | postgres -D${1} -Q bench > /dev/null echo =============== running benchmark... ================= -time postgres -D${1} -texecutor -tplanner -Q bench < bench.sql +time postgres -D${1} -B 256 -texecutor -tplanner -Q bench < bench.sql -- GitLab