Changeset 63

Timestamp:

10/15/07 13:13:03 (5 years ago)

Author:

cs186

Message:

Clean up tests, makes them faster too.

Location:

hw/hw2/MyStuff

Files:

• runtests.sh (modified) (2 diffs)
• runtests_setup.sql (modified) (2 diffs)

hw/hw2/MyStuff/runtests.sh

@@ -1 +1 @@
 #!/bin/csh
 
-# restart server so that it chooses index scan over heap scan 
-pg_ctl restart -o "-fs -fb"
-sleep 5
 
 ####
@@ -11 +8 @@
 mkdir -p runtests.out
 
-# set up tables
-psql -q -f runtests_setup.sql
+# run queries
+psql -q -t -f runtests_setup.sql
 
-#### Make sure basic near neighbor works on a few tuples
-####
-# SeqScan: 
-psql -c "select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testscan25 where the_box ~~ '(0.5,0.5,0.5,0.5)' and box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') > 0 order by dist" >! runtests.out/1
-# index
-psql -c "select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testgist25 where the_box ~~ '(0.5,0.5,0.5,0.5)' and box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') > 0" >! runtests.out/2
+# check output
 if ( `diff runtests.out/1 runtests.out/2` != '' ) echo 'OnePageNN failure'
-
-#### Bigger tables
-####
-# SeqScan: 
-psql -c "select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testscan where the_box ~~ '(0.5,0.5,0.5,0.5)' and box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') > 0 order by dist" >! runtests.out/3
-# index
-psql -c "select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testgist where the_box ~~ '(0.5,0.5,0.5,0.5)' and box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') > 0" >! runtests.out/4
 if ( `diff runtests.out/3 runtests.out/4` != '' ) echo 'BasicNN failure'
-
-####
-#### Make sure selections work
-####
-# SeqScan: 
-psql -c "select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testscan where the_box >> '(0.5,0.5,0.5,0.5)' order by dist" >! runtests.out/5
-# index
-psql -c "select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testgist where the_box >> '(0.5,0.5,0.5,0.5)'" >! runtests.out/6
 if ( `diff runtests.out/5 runtests.out/6` != '' ) echo 'SelectionNN failure'
-
-####
-#### Rectangle query
-####
-# Check the answer sets are the same
-if ( `psql -t -c "select id, box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') as dist from testscan where the_box ~~ '(0.5,0.7,0.5,0.7)' except select id, box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') as dist from testscan where the_box ~~ '(0.5,0.7,0.5,0.7)'"` != '' ) echo 'Rectangle failure: mismatch on zeros'
-# SeqScan:
-psql -c "select id, box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') as dist from testscan where the_box ~~ '(0.5,0.7,0.5,0.7)' and box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') > 0 order by dist" >! runtests.out/7
-# index
-psql -c "select id, box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') as dist from testgist where the_box ~~ '(0.5,0.7,0.5,0.7)' and box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') > 0" >! runtests.out/8
+if ( `cat runtests.out/10` != '') echo 'Rectangle failure: mismatch on zeros'
 if ( `diff runtests.out/7 runtests.out/8` != '' ) echo 'Rectangle failure'

hw/hw2/MyStuff/runtests_setup.sql

@@ -2 +2 @@
 -- Change the paths in the copy commands to get this working!
 --
-
 drop table if exists testgist;
 drop table if exists testscan;
@@ -8 +7 @@
 drop table if exists testscan25;
 create table testgist(id integer, the_box box);
-copy testgist from '/Users/joeh/devel/Hw2/MyStuff/randomboxes' delimiter ';' ;
+copy testgist from '/Users/joeh/devel/hw2/MyStuff/randomboxes' delimiter ';' ;
 create index testgistix on testgist using gist (the_box box_ops);
 
 create table testscan(id integer, the_box box);
-copy testscan from '/Users/joeh/devel/Hw2/MyStuff/randomboxes' delimiter ';' ;
+copy testscan from '/Users/joeh/devel/hw2/MyStuff/randomboxes' delimiter ';' ;
 
 create table testgist25 (id integer, the_box box);
-copy testgist25 from '/Users/joeh/devel/Hw2/MyStuff/randomboxes25' delimiter ';' ;
+copy testgist25 from '/Users/joeh/devel/hw2/MyStuff/randomboxes25' delimiter ';' ;
 create index testgist25ix on testgist25 using gist (the_box box_ops);
 
 create table testscan25(id integer, the_box box);
-copy testscan25 from '/Users/joeh/devel/Hw2/MyStuff/randomboxes25' delimiter ';' ;
+copy testscan25 from '/Users/joeh/devel/hw2/MyStuff/randomboxes25' delimiter ';' ;
+
+
+--
+-- Run queries
+--
+
+--
+-- Make sure basic near neighbor works on a few tuples
+--
+-- SeqScan: 
+set enable_seqscan to off;
+\o runtests.out/1
+select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testscan25 where the_box ~~ '(0.5,0.5,0.5,0.5)' and box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') > 0 order by dist;
+-- index
+\o runtests.out/2
+select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testgist25 where the_box ~~ '(0.5,0.5,0.5,0.5)' and box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') > 0;
+
+-- Bigger tables
+--
+-- SeqScan: 
+\o runtests.out/3
+select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testscan where the_box ~~ '(0.5,0.5,0.5,0.5)' and box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') > 0 order by dist;
+-- index
+\o runtests.out/4
+select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testgist where the_box ~~ '(0.5,0.5,0.5,0.5)' and box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') > 0;
+
+--
+-- Make sure selections work
+--
+-- SeqScan: 
+\o runtests.out/5
+select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testscan where the_box >> '(0.5,0.5,0.5,0.5)' order by dist;
+-- index
+\o runtests.out/6
+select id, box_mindistance(the_box, '(0.5,0.5,0.5,0.5)') as dist from testgist where the_box >> '(0.5,0.5,0.5,0.5)';
+
+--
+-- Rectangle query
+--
+-- Check the answer sets are the same
+\o runtests.out/10
+select id, box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') as dist from testscan where the_box ~~ '(0.5,0.7,0.5,0.7)' except select id, box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') as dist from testscan where the_box ~~ '(0.5,0.7,0.5,0.7)';
+-- SeqScan:
+\o runtests.out/7
+select id, box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') as dist from testscan where the_box ~~ '(0.5,0.7,0.5,0.7)' and box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') > 0 order by dist;
+-- index
+\o runtests.out/8
+select id, box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') as dist from testgist where the_box ~~ '(0.5,0.7,0.5,0.7)' and box_mindistance(the_box, '(0.5,0.7,0.5,0.7)') > 0;
+
+
+--
+-- Drop tables
+--
+drop table testscan;
+drop table testgist;
+drop table testscan25;
+drop table testgist25;