Commit 6a6c752b authored by Neil Conway's avatar Neil Conway

Stop a few regression tests from needlessly disabling GEQO. This was

necessary in 1997, when geqo_threshold did not exist, but it is no
longer needed.
parent e031844e
...@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation ...@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
-- --
-- Paths -- Paths
-- --
SET geqo TO 'off';
SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL; SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
eight | npoints | path eight | npoints | path
-------+---------+--------------------------- -------+---------+---------------------------
...@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul ...@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
| ((34,13),(40,15)) | ((34,13),(40,15))
(8 rows) (8 rows)
RESET geqo;
-- --
-- Polygons -- Polygons
-- --
......
...@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation ...@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
-- --
-- Paths -- Paths
-- --
SET geqo TO 'off';
SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL; SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
eight | npoints | path eight | npoints | path
-------+---------+--------------------------- -------+---------+---------------------------
...@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul ...@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
| ((34,13),(40,15)) | ((34,13),(40,15))
(8 rows) (8 rows)
RESET geqo;
-- --
-- Polygons -- Polygons
-- --
......
...@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation ...@@ -284,7 +284,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
-- --
-- Paths -- Paths
-- --
SET geqo TO 'off';
SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL; SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
eight | npoints | path eight | npoints | path
-------+---------+--------------------------- -------+---------+---------------------------
...@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul ...@@ -337,7 +336,6 @@ SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
| ((34,13),(40,15)) | ((34,13),(40,15))
(8 rows) (8 rows)
RESET geqo;
-- --
-- Polygons -- Polygons
-- --
......
...@@ -105,7 +105,6 @@ SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist ...@@ -105,7 +105,6 @@ SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist
| (5.1,34.5) | 34.8749193547455 | (5.1,34.5) | 34.8749193547455
(6 rows) (6 rows)
SET geqo TO 'off';
SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist
FROM POINT_TBL p1, POINT_TBL p2 FROM POINT_TBL p1, POINT_TBL p2
ORDER BY dist, p1.f1[0], p2.f1[0]; ORDER BY dist, p1.f1[0], p2.f1[0];
...@@ -222,4 +221,3 @@ SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dista ...@@ -222,4 +221,3 @@ SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dista
| (5.1,34.5) | (10,10) | 24.9851956166046 | (5.1,34.5) | (10,10) | 24.9851956166046
(3 rows) (3 rows)
RESET geqo;
...@@ -103,7 +103,6 @@ SELECT '' AS three, t1.* ...@@ -103,7 +103,6 @@ SELECT '' AS three, t1.*
| ["Wed Dec 31 16:00:00 1969 PST" "Mon May 01 00:30:30 1995 PDT"] | ["Wed Dec 31 16:00:00 1969 PST" "Mon May 01 00:30:30 1995 PDT"]
(3 rows) (3 rows)
SET geqo TO 'off';
SELECT '' AS five, t1.f1, t2.f1 SELECT '' AS five, t1.f1, t2.f1
FROM TINTERVAL_TBL t1, TINTERVAL_TBL t2 FROM TINTERVAL_TBL t1, TINTERVAL_TBL t2
WHERE t1.f1 && t2.f1 and WHERE t1.f1 && t2.f1 and
...@@ -167,4 +166,3 @@ SELECT '' AS three, t1.f1 ...@@ -167,4 +166,3 @@ SELECT '' AS three, t1.f1
| ["Wed Dec 31 16:00:00 1969 PST" "Mon May 01 00:30:30 1995 PDT"] | ["Wed Dec 31 16:00:00 1969 PST" "Mon May 01 00:30:30 1995 PDT"]
(3 rows) (3 rows)
RESET geqo;
...@@ -87,8 +87,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation ...@@ -87,8 +87,6 @@ SELECT '' AS twenty, b.f1 / p.f1 AS rotation
-- Paths -- Paths
-- --
SET geqo TO 'off';
SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL; SELECT '' AS eight, npoints(f1) AS npoints, f1 AS path FROM PATH_TBL;
SELECT '' AS four, path(f1) FROM POLYGON_TBL; SELECT '' AS four, path(f1) FROM POLYGON_TBL;
...@@ -101,8 +99,6 @@ SELECT '' AS eight, p1.f1 + point '(10,10)' AS dist_add ...@@ -101,8 +99,6 @@ SELECT '' AS eight, p1.f1 + point '(10,10)' AS dist_add
SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
FROM PATH_TBL p1; FROM PATH_TBL p1;
RESET geqo;
-- --
-- Polygons -- Polygons
-- --
......
...@@ -55,8 +55,6 @@ SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist ...@@ -55,8 +55,6 @@ SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist
FROM POINT_TBL p FROM POINT_TBL p
ORDER BY dist; ORDER BY dist;
SET geqo TO 'off';
SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist
FROM POINT_TBL p1, POINT_TBL p2 FROM POINT_TBL p1, POINT_TBL p2
ORDER BY dist, p1.f1[0], p2.f1[0]; ORDER BY dist, p1.f1[0], p2.f1[0];
...@@ -76,6 +74,3 @@ SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dista ...@@ -76,6 +74,3 @@ SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dista
FROM POINT_TBL p1, POINT_TBL p2 FROM POINT_TBL p1, POINT_TBL p2
WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1 WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1
ORDER BY distance; ORDER BY distance;
RESET geqo;
...@@ -70,8 +70,6 @@ SELECT '' AS three, t1.* ...@@ -70,8 +70,6 @@ SELECT '' AS three, t1.*
WHERE t1.f1 && WHERE t1.f1 &&
tinterval '["Aug 15 14:23:19 1983" "Sep 16 14:23:19 1983"]'; tinterval '["Aug 15 14:23:19 1983" "Sep 16 14:23:19 1983"]';
SET geqo TO 'off';
SELECT '' AS five, t1.f1, t2.f1 SELECT '' AS five, t1.f1, t2.f1
FROM TINTERVAL_TBL t1, TINTERVAL_TBL t2 FROM TINTERVAL_TBL t1, TINTERVAL_TBL t2
WHERE t1.f1 && t2.f1 and WHERE t1.f1 && t2.f1 and
...@@ -97,5 +95,3 @@ SELECT '' AS three, t1.f1 ...@@ -97,5 +95,3 @@ SELECT '' AS three, t1.f1
(abstime 'Aug 15 14:23:19 1983' <#> (abstime 'Aug 15 14:23:19 1983' <#>
abstime 'Sep 16 14:23:19 1983') abstime 'Sep 16 14:23:19 1983')
ORDER BY t1.f1; ORDER BY t1.f1;
RESET geqo;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment