Changeset: 2b66d2510676 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b66d2510676
Modified Files:
geom/sql/Tests/relation.sql
geom/sql/Tests/relation.stable.err
geom/sql/Tests/relation.stable.out
geom/sql/Tests/spatial.sql
geom/sql/Tests/spatial.stable.out
Branch: default
Log Message:
geom/sql/Tests/{relation,spatial}.sql: add "order by" to enforce deterministic
result order
diffs (101 lines):
diff --git a/geom/sql/Tests/relation.sql b/geom/sql/Tests/relation.sql
--- a/geom/sql/Tests/relation.sql
+++ b/geom/sql/Tests/relation.sql
@@ -18,12 +18,12 @@ SELECT * FROM geoms;
SELECT * FROM geoms where g is NOT NULL;
-SELECT a.g, b.g, Equals(a.g,b.g), Disjoint(a.g,b.g), "Intersect"(a.g,b.g),
Touches(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL;
+SELECT a.g, b.g, Equals(a.g,b.g), Disjoint(a.g,b.g), "Intersect"(a.g,b.g),
Touches(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL order by a.g, b.g;
-SELECT a.g, b.g, Crosses(a.g,b.g), Within(a.g,b.g), Contains(a.g,b.g),
Overlaps(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL;
+SELECT a.g, b.g, Crosses(a.g,b.g), Within(a.g,b.g), Contains(a.g,b.g),
Overlaps(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL order by a.g, b.g;
-SELECT a.g, b.g, Relate(a.g,b.g,'Touches') FROM geoms a, geoms b where a.g is
not NULL and b.g is not NULL;
+SELECT a.g, b.g, Relate(a.g,b.g,'Touches') FROM geoms a, geoms b where a.g is
not NULL and b.g is not NULL order by a.g, b.g;
-SELECT a.g, b.g, Relate(a.g,b.g,'*F**T**F*') FROM geoms a, geoms b where a.g
is not NULL and b.g is not NULL;
+SELECT a.g, b.g, Relate(a.g,b.g,'*F**T**F*') FROM geoms a, geoms b where a.g
is not NULL and b.g is not NULL order by a.g, b.g;
DROP TABLE geoms;
diff --git a/geom/sql/Tests/relation.stable.err
b/geom/sql/Tests/relation.stable.err
--- a/geom/sql/Tests/relation.stable.err
+++ b/geom/sql/Tests/relation.stable.err
@@ -38,7 +38,7 @@ MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('');
ERROR = !ParseException: Expected word but encountered end of stream
MAPI = monetdb@madrid:30163
-QUERY = SELECT a.g, b.g, Relate(a.g,b.g,'Touches') FROM geoms a, geoms b where
a.g is not NULL and b.g is not NULL;
+QUERY = SELECT a.g, b.g, Relate(a.g,b.g,'Touches') FROM geoms a, geoms b where
a.g is not NULL and b.g is not NULL order by a.g, b.g;
ERROR = !GDKerror:!ERROR: IllegalArgumentException: IllegalArgumentException:
Should be length 9, is [Touches] instead
!
diff --git a/geom/sql/Tests/relation.stable.out
b/geom/sql/Tests/relation.stable.out
--- a/geom/sql/Tests/relation.stable.out
+++ b/geom/sql/Tests/relation.stable.out
@@ -40,9 +40,9 @@ Ready.
[ "LINESTRING (10 10, 20 20, 30 40)" ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))" ]
-#SELECT a.g, b.g, Equals(a.g,b.g), Disjoint(a.g,b.g), "Intersect"(a.g,b.g),
Touches(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL;
-% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L3 # table_name
-% g, g, L1, L2, L3, touches_g # name
+#SELECT a.g, b.g, Equals(a.g,b.g), Disjoint(a.g,b.g), "Intersect"(a.g,b.g),
Touches(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL order by a.g, b.g;
+% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L4 # table_name
+% g, g, L1, L2, L3, L4 # name
% geometry, geometry, boolean, boolean, boolean,
boolean # type
% 0, 0, 5, 5, 5, 5 # length
[ "POINT (10 10)", "POINT (10 10)", true, false, true, false
]
@@ -61,9 +61,9 @@ Ready.
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "LINESTRING (10 10, 20 20, 30 40)", false, false, true,
false ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", false,
false, true, false ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10
15, 15 15))", true, false, true, false ]
-#SELECT a.g, b.g, Crosses(a.g,b.g), Within(a.g,b.g), Contains(a.g,b.g),
Overlaps(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL;
-% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L3 # table_name
-% g, g, L1, L2, L3, overlaps_g # name
+#SELECT a.g, b.g, Crosses(a.g,b.g), Within(a.g,b.g), Contains(a.g,b.g),
Overlaps(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL order by a.g, b.g;
+% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L4 # table_name
+% g, g, L1, L2, L3, L4 # name
% geometry, geometry, boolean, boolean, boolean,
boolean # type
% 0, 0, 5, 5, 5, 5 # length
[ "POINT (10 10)", "POINT (10 10)", false, true, true, false
]
@@ -82,9 +82,9 @@ Ready.
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "LINESTRING (10 10, 20 20, 30 40)", true, false, false,
false ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", false,
true, false, false ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10
15, 15 15))", false, true, true, false ]
-#SELECT a.g, b.g, Relate(a.g,b.g,'*F**T**F*') FROM geoms a, geoms b where a.g
is not NULL and b.g is not NULL;
-% sys.a, sys.b, sys.L # table_name
-% g, g, relate_g # name
+#SELECT a.g, b.g, Relate(a.g,b.g,'*F**T**F*') FROM geoms a, geoms b where a.g
is not NULL and b.g is not NULL order by a.g, b.g;
+% sys.a, sys.b, sys.L1 # table_name
+% g, g, L1 # name
% geometry, geometry, boolean # type
% 0, 0, 5 # length
[ "POINT (10 10)", "POINT (10 10)", false ]
diff --git a/geom/sql/Tests/spatial.sql b/geom/sql/Tests/spatial.sql
--- a/geom/sql/Tests/spatial.sql
+++ b/geom/sql/Tests/spatial.sql
@@ -21,6 +21,6 @@ SELECT * FROM geoms where g is NOT NULL;
SELECT Area(g), Length(g), Buffer(g, 2.0), ConvexHull(g) FROM geoms where g is
not NULL;
-SELECT a.g, b.g, Distance(a.g,b.g), Intersection(a.g,b.g), "Union"(a.g,b.g),
Difference(a.g,b.g), SymDifference(a.g,b.g) FROM geoms a, geoms b where a.g is
not NULL and b.g is not NULL;
+SELECT a.g, b.g, Distance(a.g,b.g), Intersection(a.g,b.g), "Union"(a.g,b.g),
Difference(a.g,b.g), SymDifference(a.g,b.g) FROM geoms a, geoms b where a.g is
not NULL and b.g is not NULL order by a.g, b.g;
DROP TABLE geoms;
diff --git a/geom/sql/Tests/spatial.stable.out
b/geom/sql/Tests/spatial.stable.out
--- a/geom/sql/Tests/spatial.stable.out
+++ b/geom/sql/Tests/spatial.stable.out
@@ -56,9 +56,9 @@ Ready.
[ 0, 36.5028154, "POLYGON ((18.35629117 21.18471829, 28.21114562
40.89442719, 28.42001204 41.2262292, 28.68959652 41.51090791, 29.00953906
41.73752328, 29.36754447 41.8973666, 29.74985478 41.98429518, 30.14177804
41.99496842, 30.52825285 41.92897614, 30.89442719 41.78885438, 31.2262292
41.57998796, 31.51090791 41.31040348, 31.73752328 40.99046094, 31.8973666
40.63245553, 31.98429518 40.25014522, 31.99496842 39.85822196, 31.92897614
39.47174715, 31.78885438 39.10557281, 21.63758456 18.85152983, 21.60738418
18.80962903, 11.41421356 8.585786438, 11.11114047 8.337060775, 10.76536686
8.152240935, 10.39018064 8.038429439, 10 8, 9.609819356 8.038429439,
9.234633135 8.152240935, 8.888859534 8.337060775, 8.585786438 8.585786438,
8.337060775 8.888859534, 8.152240935 9.234633135, 8.038429439 9.609819356, 8
10, 8.038429439 10.39018064, 8.152240935 10.76536686, 8.337060775 11.11114047,
8.585786438 11.41421356, 18.35629117 21.18471829))", "POLYGON ((10 10, 30
40, 20 20, 10 10))" ]
[ 75, 36.18033989, "POLYGON ((9.755412201 7.800022564, 8.14166335
8.797374203, 8.171572875 21, 9 21.82842712, 21 21.82842712, 21.82842712 21,
21.85833665 14.2026258, 21.54426658 13.69444975, 9.755412201 7.800022564))",
"POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
[ 62.5, 53.2514077, "POLYGON ((9.755412201 7.800022564, 8.14166335
8.797374203, 8.171572875 21, 9 21.82842712, 21 21.82842712, 21.82842712 21,
21.85833665 14.2026258, 21.54426658 13.69444975, 9.755412201 7.800022564))",
"POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
-#SELECT a.g, b.g, Distance(a.g,b.g), Intersection(a.g,b.g), "Union"(a.g,b.g),
Difference(a.g,b.g), SymDifference(a.g,b.g) FROM geoms a, geoms b where a.g is
not NULL and b.g is not NULL;
-% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L4, sys.L4 # table_name
-% g, g, L1, L2, L3, L4, symdifference_g # name
+#SELECT a.g, b.g, Distance(a.g,b.g), Intersection(a.g,b.g), "Union"(a.g,b.g),
Difference(a.g,b.g), SymDifference(a.g,b.g) FROM geoms a, geoms b where a.g is
not NULL and b.g is not NULL order by a.g, b.g;
+% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L4, sys.L5 # table_name
+% g, g, L1, L2, L3, L4, L5 # name
% geometry, geometry, double, geometry, geometry,
geometry, geometry # type
% 0, 0, 24, 0, 0, 0, 0 # length
[ "POINT (10 10)", "POINT (10 10)", 0, "POINT (10 10)",
"POINT (10 10)", "GEOMETRYCOLLECTION EMPTY", "GEOMETRYCOLLECTION
EMPTY" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
