From 1f7a47912af2206698d14650f2149fa951b8ce07 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 25 Oct 2013 15:50:31 -0400 Subject: [PATCH] Revert "Tweak "line" test to avoid negative zeros on some platforms" This reverts commit a0a546f0d94ec6cbb3cd6b1c82f58d801046615f. It seems better to tweak the code to suppress -0 results during line_construct_pts(), which I'll do in the next commit. --- src/test/regress/expected/line.out | 18 +++++++++--------- src/test/regress/sql/line.sql | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/regress/expected/line.out b/src/test/regress/expected/line.out index 877b9e933d..f20abdc430 100644 --- a/src/test/regress/expected/line.out +++ b/src/test/regress/expected/line.out @@ -5,7 +5,7 @@ --DROP TABLE LINE_TBL; CREATE TABLE LINE_TBL (s line); INSERT INTO LINE_TBL VALUES ('{1,-1,1}'); -INSERT INTO LINE_TBL VALUES ('(0,0.1),(6,6)'); +INSERT INTO LINE_TBL VALUES ('(0,0),(6,6)'); INSERT INTO LINE_TBL VALUES ('10,-10 ,-5,-4'); INSERT INTO LINE_TBL VALUES ('[-1e6,2e2,3e5, -4e1]'); INSERT INTO LINE_TBL VALUES ('(11,22,33,44)'); @@ -42,7 +42,7 @@ select * from LINE_TBL; s --------------------------------------------- {1,-1,1} - {0.983333333333333,-1,0.1} + {1,-1,0} {-0.4,-1,-6} {-0.000184615384615385,-1,15.3846153846154} {1,-1,11} @@ -55,7 +55,7 @@ SELECT * FROM LINE_TBL WHERE (s <-> line '[(1,2),(3,4)]') < 10; s --------------------------------------------- {1,-1,1} - {0.983333333333333,-1,0.1} + {1,-1,0} {-0.4,-1,-6} {-0.000184615384615385,-1,15.3846153846154} {1,-1,11} @@ -64,17 +64,17 @@ SELECT * FROM LINE_TBL WHERE (s <-> line '[(1,2),(3,4)]') < 10; (7 rows) SELECT * FROM LINE_TBL WHERE (point '(0.1,0.1)' <-> s) < 1; - s ----------------------------- + s +---------- {1,-1,1} - {0.983333333333333,-1,0.1} + {1,-1,0} (2 rows) SELECT * FROM LINE_TBL WHERE (lseg '[(0.1,0.1),(0.2,0.2)]' <-> s) < 1; - s ----------------------------- + s +---------- {1,-1,1} - {0.983333333333333,-1,0.1} + {1,-1,0} (2 rows) SELECT line '[(1,1),(2,1)]' <-> line '[(-1,-1),(-2,-1)]'; diff --git a/src/test/regress/sql/line.sql b/src/test/regress/sql/line.sql index 5af561bcfa..94067b0cee 100644 --- a/src/test/regress/sql/line.sql +++ b/src/test/regress/sql/line.sql @@ -7,7 +7,7 @@ CREATE TABLE LINE_TBL (s line); INSERT INTO LINE_TBL VALUES ('{1,-1,1}'); -INSERT INTO LINE_TBL VALUES ('(0,0.1),(6,6)'); +INSERT INTO LINE_TBL VALUES ('(0,0),(6,6)'); INSERT INTO LINE_TBL VALUES ('10,-10 ,-5,-4'); INSERT INTO LINE_TBL VALUES ('[-1e6,2e2,3e5, -4e1]'); INSERT INTO LINE_TBL VALUES ('(11,22,33,44)');