Ported index regress test to lwgeom

git-svn-id: http://svn.osgeo.org/postgis/trunk@1117 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/regress/regress_index.sql b/regress/regress_index.sql
index 1ddf3668b549ca8ad83212d1132fcf962c18c6b6..19b67e03403e94be2ab731ba28abb0b43d914ec3 100644 (file)
--- a/regress/regress_index.sql
+++ b/regress/regress_index.sql
@@ -1,27 +1,16 @@
 --- build a larger database
-\set ECHO none
 \i regress_lots_of_points.sql
-\set ECHO all
 
 --- test some of the searching capabilities
 
 -- GiST index
 
-CREATE INDEX quick_gist on test using gist (the_geom gist_geometry_ops) with (islossy);
+CREATE INDEX quick_gist on test using gist (the_geom gist_geometry_ops);
 
- select * from test where the_geom && 'BOX3D(125 125,135 135)'::box3d order by num;
+ select num,astext(the_geom) from test where the_geom && 'BOX3D(125 125,135 135)'::box3d order by num;
 
 set enable_seqscan = off;
 
- select * from test where the_geom && 'BOX3D(125 125,135 135)'::box3d  order by num;
-
-
---- RTree (not recommended)
-
-CREATE INDEX quick_rt on test using rtree (the_geom rt_geometry_ops);
-set enable_seqscan = on;
- select * from test where the_geom && 'BOX3D(125 125,135 135)'::box3d order by num;
-set enable_seqscan = off;
- select * from test where the_geom && 'BOX3D(125 125,135 135)'::box3d  order by num;
+ select num,astext(the_geom) from test where the_geom && 'BOX3D(125 125,135 135)'::box3d  order by num;
 
 

diff --git a/regress/regress_index_expected b/regress/regress_index_expected
index 809b11185b73f45d9a1b4e3eda5e71cbded36d98..39e5b33c944e15cf575ab526bc2961e2a3bbef0a 100644 (file)
--- a/regress/regress_index_expected
+++ b/regress/regress_index_expected
@@ -1,58 +1,9 @@
-You are now connected as new user postgres.
-CREATE
-
---- test some of the searching capabilities
-
--- GiST index
-
-CREATE INDEX quick_gist on test using gist (the_geom gist_geometry_ops) with (islossy);
-CREATE
-
- select * from test where the_geom && 'BOX3D(125 125,135 135)'::box3d order by num;
- num  |           the_geom           
-------+------------------------------
- 2594 | POINT(130.504303 126.53112)
- 3618 | POINT(130.447205 131.655289)
- 7245 | POINT(128.10466 130.94133)
-(3 rows)
-
-
-set enable_seqscan = off;
-SET VARIABLE
-
- select * from test where the_geom && 'BOX3D(125 125,135 135)'::box3d  order by num;
- num  |           the_geom           
-------+------------------------------
- 2594 | POINT(130.504303 126.53112)
- 3618 | POINT(130.447205 131.655289)
- 7245 | POINT(128.10466 130.94133)
-(3 rows)
-
-
-
---- RTree (not recommended)
-
-CREATE INDEX quick_rt on test using rtree (the_geom rt_geometry_ops);
-CREATE
-set enable_seqscan = on;
-SET VARIABLE
- select * from test where the_geom && 'BOX3D(125 125,135 135)'::box3d order by num;
- num  |           the_geom           
-------+------------------------------
- 2594 | POINT(130.504303 126.53112)
- 3618 | POINT(130.447205 131.655289)
- 7245 | POINT(128.10466 130.94133)
-(3 rows)
-
-set enable_seqscan = off;
-SET VARIABLE
- select * from test where the_geom && 'BOX3D(125 125,135 135)'::box3d  order by num;
- num  |           the_geom           
-------+------------------------------
- 2594 | POINT(130.504303 126.53112)
- 3618 | POINT(130.447205 131.655289)
- 7245 | POINT(128.10466 130.94133)
-(3 rows)
-
-
-
+CREATE TABLE
+CREATE INDEX
+2594|POINT(130.504303 126.53112)
+3618|POINT(130.447205 131.655289)
+7245|POINT(128.10466 130.94133)
+SET
+2594|POINT(130.504303 126.53112)
+3618|POINT(130.447205 131.655289)
+7245|POINT(128.10466 130.94133)

diff --git a/regress/regress_lots_of_points.sql b/regress/regress_lots_of_points.sql
index c6730cbef252efcc00eea596e0393d5df78749bd..ee30196a1a69c5beb354610a2e74e3a05b78944e 100644 (file)
--- a/regress/regress_lots_of_points.sql
+++ b/regress/regress_lots_of_points.sql
@@ -1,6 +1,6 @@
 -- Selected TOC Entries:
 --
-\connect - postgres
+--\connect - postgres
 --
 -- TOC Entry ID 2 (OID 2231457)
 --

diff --git a/regress/run_index_regress b/regress/run_index_regress
index 9b0887acc7c360d53f53ded011e7475367ec50e2..02b79a6af2b22a399b4f08c4108d7aa0e4982579 100755 (executable)
--- a/regress/run_index_regress
+++ b/regress/run_index_regress
@@ -1,11 +1,15 @@
-#!/bin/csh
+#!/bin/sh
+
 echo "Running Index Regression"
 echo ""
-createdb geometry_reg
-psql -e geometry_reg <postgis.sql >& /dev/null
 echo "Index Creation will take some time..."
-echo "This test included the unrecommended RTREE index"
 echo ""
-psql -e geometry_reg <regress_index.sql >& regress_index_out
+
+DB=postgis_reg
+createdb $DB > /dev/null
+createlang plpgsql $DB > /dev/null
+psql -f ../lwpostgis.sql $DB > /dev/null 2>&1
+psql -tA < regress_index.sql $DB > regress_index_out 2>&1
 diff regress_index_out regress_index_expected
-dropdb geometry_reg
+sleep 1
+dropdb $DB > /dev/null

diff --git a/regress/run_regress b/regress/run_regress
index 02e87893db465e65909a1ff5c870b7f16013fb03..f2b62dbf59f249a1a0c5cbaaf1649678a36cbdf2 100755 (executable)
--- a/regress/run_regress
+++ b/regress/run_regress
@@ -10,4 +10,5 @@ createlang plpgsql $DB > /dev/null
 psql -f ../lwpostgis.sql $DB > /dev/null 2>&1
 psql -tA < regress.sql $DB 2>&1 | grep -v INSERT > regress_out
 diff regress_expected regress_out
+sleep 1
 dropdb $DB > /dev/null