Changeset: 97aa370668d3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97aa370668d3
Modified Files:
sql/test/pg_regress/Tests/point.sql
sql/test/pg_regress/Tests/point.stable.err
sql/test/pg_regress/Tests/point.stable.out
Branch: Jun2016
Log Message:
Approve new output and enable more queries to run successfully.
diffs (174 lines):
diff --git a/sql/test/pg_regress/Tests/point.sql
b/sql/test/pg_regress/Tests/point.sql
--- a/sql/test/pg_regress/Tests/point.sql
+++ b/sql/test/pg_regress/Tests/point.sql
@@ -78,22 +78,23 @@ SELECT '' AS six, p.f1, p.f1 <-> ST_Make
SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS
dist
FROM POINT_TBL p1, POINT_TBL p2
- ORDER BY dist, point1 using <<, point2 using <<;
+ ORDER BY dist, point1, point2; -- using <<, point2 using <<;
-SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2 FROM POINT_TBL p1,
POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3;
+SELECT '' AS twenty, p1.f1 AS point1, p2.f1 AS point2 FROM POINT_TBL p1,
POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3;
-- put distance result into output to allow sorting with GEQ optimizer - tgl
97/05/10
-SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS
distance
+SELECT '' AS ten, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS
distance
FROM POINT_TBL p1, POINT_TBL p2
WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1
- ORDER BY distance, point1 using <<, point2 using <<;
+ ORDER BY distance, point1, point2; -- using <<, point2 using <<;
-- put distance result into output to allow sorting with GEQ optimizer - tgl
97/05/10
-SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS
distance
+SELECT '' AS ten, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS
distance
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;
+
/* RESET geqo; */
DROP VIEW POINT_TBL_VW;
diff --git a/sql/test/pg_regress/Tests/point.stable.err
b/sql/test/pg_regress/Tests/point.stable.err
--- a/sql/test/pg_regress/Tests/point.stable.err
+++ b/sql/test/pg_regress/Tests/point.stable.err
@@ -63,23 +63,6 @@ ERROR = !column needs geometry(4, 0) and
MAPI = (monetdb) /var/tmp/mtest-30019/.s.monetdb.34946
QUERY = SELECT '' AS two, p.* FROM POINT_TBL_VW p WHERE p.f1 @ path
'[(0,0),(-10,0),(-10,10)]';
ERROR = !syntax error, unexpected STRING, expecting SCOLON in: "select '' as
two, p.* from point_tbl_vw p where p.f1 @ path '[(0,0),(-10,0),(-10"
-MAPI = (monetdb) /var/tmp/mtest-30019/.s.monetdb.34946
-QUERY = SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <->
p2.f1 AS dist
- FROM POINT_TBL p1, POINT_TBL p2
- ORDER BY dist, point1 using <<, point2 using <<;
-ERROR = !syntax error, unexpected USING, expecting SCOLON in: "select '' as
thirtysix, p1.f1 as point1, p2.f1 as point2, p1.f1 <-> p2.f1 as dis"
-MAPI = (monetdb) /var/tmp/mtest-30019/.s.monetdb.34946
-QUERY = SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <->
p2.f1) AS distance
- FROM POINT_TBL p1, POINT_TBL p2
- WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1
- ORDER BY distance, point1 using <<, point2 using <<;
-ERROR = !syntax error, unexpected USING, expecting SCOLON in: "select '' as
fifteen, p1.f1 as point1, p2.f1 as point2, (p1.f1 <-> p2.f1) as dis"
-MAPI = (monetdb) /var/tmp/mtest-30019/.s.monetdb.34946
-QUERY = SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <->
p2.f1) AS distance
- FROM POINT_TBL p1, POINT_TBL p2
- WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1
- ORDER BY distance;
-ERROR = !syntax error, unexpected '^' in: "select '' as three, p1.f1 as
point1, p2.f1 as point2, (p1.f1 <-> p2.f1) as dista"
# 18:36:57 >
# 18:36:57 > "Done."
diff --git a/sql/test/pg_regress/Tests/point.stable.out
b/sql/test/pg_regress/Tests/point.stable.out
--- a/sql/test/pg_regress/Tests/point.stable.out
+++ b/sql/test/pg_regress/Tests/point.stable.out
@@ -154,21 +154,63 @@ Ready.
[ "", "POINT (-10 0)", "\"POINT (-10 0)\"" ]
[ "", "POINT (-3 4)", "\"POINT (-3 4)\"" ]
[ "", "POINT (-5 -12)", "\"POINT (-5 -12)\"" ]
-[ "", NULL, NULL ]
#SELECT '' AS six, p.f1, p.f1 <-> ST_MakePoint(0,0) AS dist FROM POINT_TBL p
ORDER BY dist;
% .L, sys.p, sys.L # table_name
% six, f1, dist # name
% char, geometry, double # type
% 0, 0, 24 # length
-[ "", NULL, 0 ]
+[ "", NULL, NULL ]
[ "", "POINT (0 0)", 0 ]
[ "", "POINT (-3 4)", 5 ]
[ "", "POINT (-10 0)", 10 ]
[ "", "POINT (-5 -12)", 13 ]
[ "", "POINT (5.1 34.5)", 34.87491934 ]
-#SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2 FROM POINT_TBL p1,
POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3;
+#SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS
dist
+# FROM POINT_TBL p1, POINT_TBL p2
+# ORDER BY dist, point1, point2; -- using <<, point2 using <<;
+% .L, sys.L, sys.L, sys.L # table_name
+% thirtysix, point1, point2, dist # name
+% char, geometry, geometry, double # type
+% 0, 0, 0, 24 # length
+[ "", NULL, NULL, NULL ]
+[ "", NULL, "POINT (0 0)", NULL ]
+[ "", NULL, "POINT (-3 4)", NULL ]
+[ "", NULL, "POINT (-5 -12)", NULL ]
+[ "", NULL, "POINT (-10 0)", NULL ]
+[ "", NULL, "POINT (5.1 34.5)", NULL ]
+[ "", "POINT (0 0)", NULL, NULL ]
+[ "", "POINT (-3 4)", NULL, NULL ]
+[ "", "POINT (-5 -12)", NULL, NULL ]
+[ "", "POINT (-10 0)", NULL, NULL ]
+[ "", "POINT (5.1 34.5)", NULL, NULL ]
+[ "", "POINT (0 0)", "POINT (0 0)", 0 ]
+[ "", "POINT (-3 4)", "POINT (-3 4)", 0 ]
+[ "", "POINT (-5 -12)", "POINT (-5 -12)", 0 ]
+[ "", "POINT (-10 0)", "POINT (-10 0)", 0 ]
+[ "", "POINT (5.1 34.5)", "POINT (5.1 34.5)", 0 ]
+[ "", "POINT (0 0)", "POINT (-3 4)", 5 ]
+[ "", "POINT (-3 4)", "POINT (0 0)", 5 ]
+[ "", "POINT (-3 4)", "POINT (-10 0)", 8.062257748 ]
+[ "", "POINT (-10 0)", "POINT (-3 4)", 8.062257748 ]
+[ "", "POINT (0 0)", "POINT (-10 0)", 10 ]
+[ "", "POINT (-10 0)", "POINT (0 0)", 10 ]
+[ "", "POINT (0 0)", "POINT (-5 -12)", 13 ]
+[ "", "POINT (-5 -12)", "POINT (0 0)", 13 ]
+[ "", "POINT (-5 -12)", "POINT (-10 0)", 13 ]
+[ "", "POINT (-10 0)", "POINT (-5 -12)", 13 ]
+[ "", "POINT (-3 4)", "POINT (-5 -12)", 16.1245155 ]
+[ "", "POINT (-5 -12)", "POINT (-3 4)", 16.1245155 ]
+[ "", "POINT (-3 4)", "POINT (5.1 34.5)", 31.55724954 ]
+[ "", "POINT (5.1 34.5)", "POINT (-3 4)", 31.55724954 ]
+[ "", "POINT (0 0)", "POINT (5.1 34.5)", 34.87491934 ]
+[ "", "POINT (5.1 34.5)", "POINT (0 0)", 34.87491934 ]
+[ "", "POINT (-10 0)", "POINT (5.1 34.5)", 37.65979284 ]
+[ "", "POINT (5.1 34.5)", "POINT (-10 0)", 37.65979284 ]
+[ "", "POINT (-5 -12)", "POINT (5.1 34.5)", 47.58424107 ]
+[ "", "POINT (5.1 34.5)", "POINT (-5 -12)", 47.58424107 ]
+#SELECT '' AS twenty, p1.f1 AS point1, p2.f1 AS point2 FROM POINT_TBL p1,
POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3;
% .L, sys.L, sys.L # table_name
-% thirty, point1, point2 # name
+% twenty, point1, point2 # name
% char, geometry, geometry # type
% 0, 0, 0 # length
[ "", "POINT (0 0)", "POINT (-10 0)" ]
@@ -191,6 +233,42 @@ Ready.
[ "", "POINT (-5 -12)", "POINT (-10 0)" ]
[ "", "POINT (-5 -12)", "POINT (-3 4)" ]
[ "", "POINT (-5 -12)", "POINT (5.1 34.5)" ]
+#SELECT '' AS ten, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS
distance
+# FROM POINT_TBL p1, POINT_TBL p2
+# WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1
+# ORDER BY distance, point1, point2; -- using <<, point2 using <<;
+% .L, sys.L, sys.L, sys.L # table_name
+% ten, point1, point2, distance # name
+% char, geometry, geometry, double # type
+% 0, 0, 0, 24 # length
+[ "", "POINT (-3 4)", "POINT (0 0)", 5 ]
+[ "", "POINT (-10 0)", "POINT (-3 4)", 8.062257748 ]
+[ "", "POINT (-10 0)", "POINT (0 0)", 10 ]
+[ "", "POINT (-5 -12)", "POINT (0 0)", 13 ]
+[ "", "POINT (-10 0)", "POINT (-5 -12)", 13 ]
+[ "", "POINT (-5 -12)", "POINT (-3 4)", 16.1245155 ]
+[ "", "POINT (-3 4)", "POINT (5.1 34.5)", 31.55724954 ]
+[ "", "POINT (0 0)", "POINT (5.1 34.5)", 34.87491934 ]
+[ "", "POINT (-10 0)", "POINT (5.1 34.5)", 37.65979284 ]
+[ "", "POINT (-5 -12)", "POINT (5.1 34.5)", 47.58424107 ]
+#SELECT '' AS ten, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS
distance
+# FROM POINT_TBL p1, POINT_TBL p2
+# WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 -- and p1.f1 >^ p2.f1
+# ORDER BY distance;
+% .L, sys.L, sys.L, sys.L # table_name
+% ten, point1, point2, distance # name
+% char, geometry, geometry, double # type
+% 0, 0, 0, 24 # length
+[ "", "POINT (-3 4)", "POINT (0 0)", 5 ]
+[ "", "POINT (-10 0)", "POINT (-3 4)", 8.062257748 ]
+[ "", "POINT (-10 0)", "POINT (0 0)", 10 ]
+[ "", "POINT (-10 0)", "POINT (-5 -12)", 13 ]
+[ "", "POINT (-5 -12)", "POINT (0 0)", 13 ]
+[ "", "POINT (-5 -12)", "POINT (-3 4)", 16.1245155 ]
+[ "", "POINT (-3 4)", "POINT (5.1 34.5)", 31.55724954 ]
+[ "", "POINT (0 0)", "POINT (5.1 34.5)", 34.87491934 ]
+[ "", "POINT (-10 0)", "POINT (5.1 34.5)", 37.65979284 ]
+[ "", "POINT (-5 -12)", "POINT (5.1 34.5)", 47.58424107 ]
#DROP VIEW POINT_TBL_VW;
#DROP TABLE POINT_TBL;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
