more fine tuning to force index use during index tests

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

diff --git a/regress/knn_recheck.sql b/regress/knn_recheck.sql
index 294dab5984f875337beabcbf4508411c62c723cc..1f50c696e314836b5f458e39a2a13ec981d3716e 100644 (file)
--- a/regress/knn_recheck.sql
+++ b/regress/knn_recheck.sql
@@ -19,12 +19,12 @@ WHERE gid IN(1000, 10000, 2000, 40000);
 \r
 -- without index order should match st_distance order --\r
 -- point check\r
-SELECT gid, RANK() OVER(ORDER BY ST_Distance( 'POINT(200 1000)'::geometry, geom) )\r
+SELECT gid, ST_Distance( 'POINT(200 1000)'::geometry, geom)::numeric(10,2)\r
 FROM knn_recheck_geom\r
 ORDER BY 'POINT(200 1000)'::geometry <-> geom LIMIT 5;\r
 \r
 -- linestring check\r
-SELECT gid, RANK() OVER(ORDER BY ST_Distance( 'LINESTRING(200 100, -10 600)'::geometry, geom) )\r
+SELECT gid, ST_Distance( 'LINESTRING(200 100, -10 600)'::geometry, geom)::numeric(10,2)\r
 FROM knn_recheck_geom\r
 ORDER BY 'LINESTRING(200 100, -10 600)'::geometry <-> geom LIMIT 5;\r
 \r
@@ -40,8 +40,9 @@ ORDER BY a.gid, b.rn;
 -- create index and repeat\r
 CREATE INDEX idx_knn_recheck_geom_gist ON knn_recheck_geom USING gist(geom);\r
 \r
+set enable_seqscan = false;\r
 -- point check after index\r
-SELECT gid, RANK() OVER(ORDER BY ST_Distance( 'POINT(200 1000)'::geometry, geom) )\r
+SELECT gid, ST_Distance( 'POINT(200 1000)'::geometry, geom)::numeric(10,2)\r
 FROM knn_recheck_geom\r
 ORDER BY 'POINT(200 1000)'::geometry <-> geom LIMIT 5;\r
 \r

diff --git a/regress/knn_recheck_expected b/regress/knn_recheck_expected
index 709bb71880ee9ab2a2709a66e506a551e5d152e2..5c6a4a98ab94e04f71c5aa46f1d59dea92e38333 100644 (file)
--- a/regress/knn_recheck_expected
+++ b/regress/knn_recheck_expected
@@ -1,13 +1,13 @@
-500001|1
-206360|2
-206359|3
-206361|4
-206358|5
-500000|1
-134128|2
-199066|3
-155774|4
-112482|5
+500001|0.00
+206360|122.32
+206359|122.42
+206361|122.72
+206358|123.01
+500000|0.00
+134128|0.04
+199066|0.04
+155774|0.04
+112482|0.04
 50000|48969|1|1
 50000|51031|2|2
 50000|47938|3|3
@@ -28,11 +28,11 @@
 70000|600004|1|1
 70000|71031|4|4
 70000|68969|5|5
-500001|1
-206360|2
-206359|3
-206361|4
-206358|5
+500001|0.00
+206360|122.32
+206359|122.42
+206361|122.72
+206358|123.01
 50000|48969|1|1
 50000|51031|2|2
 50000|47938|3|3