Changeset: 7b0e54e936bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b0e54e936bb
Modified Files:
geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
geom/sql/Tests/basic.stable.err
geom/sql/Tests/geom_curve.stable.err
geom/sql/Tests/geom_geometry.stable.err
geom/sql/Tests/geom_linestring.stable.err
geom/sql/Tests/geom_mbr.stable.err
geom/sql/Tests/geom_point.stable.err
geom/sql/Tests/geom_polygon.stable.err
geom/sql/Tests/geom_surface.stable.err
geom/sql/Tests/relation.stable.err
geom/sql/Tests/spatial.stable.err
Branch: Dec2011
Log Message:
Approved geom test output after changeset ba521825f4ac.
diffs (truncated from 524 to 300 lines):
diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
+++ b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
@@ -12,10 +12,10 @@ stderr of test 'X_crash.SF-1971632` in d
# 11:50:18 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30029
# 11:50:18 >
-MAPI = monetdb@volund:31171
+MAPI = monetdb@madrid:30163
QUERY = select X(g) from geoms;
-ERROR = !MALException:geom.wkbgetcoordX:GEOSGeom_getCoordSeq failed
- !ERROR: Geometry must be a Point or LineString
+ERROR = !GEOSGeom_getCoordSeq failed
+ !Geometry must be a Point or LineString
# 11:50:18 >
# 11:50:18 > Done.
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
@@ -10,7 +10,7 @@ stderr of test 'copy_into_crash.SF-19754
# 11:37:42 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30423
# 11:37:42 >
-MAPI = monetdb@sofia:31266
+MAPI = monetdb@madrid:30163
QUERY = COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
45111956, 'POINT(52.0697 4.3723)'
diff --git a/geom/sql/Tests/basic.stable.err b/geom/sql/Tests/basic.stable.err
--- a/geom/sql/Tests/basic.stable.err
+++ b/geom/sql/Tests/basic.stable.err
@@ -10,33 +10,33 @@ stderr of test 'basic` in directory 'sql
# 09:07:41 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=koala --port=34403
# 09:07:41 >
-MAPI = monetdb@volund:39079
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('LINESTRING(10 10)');
-ERROR = !MALException:wkb.FromText:IllegalArgumentException: point array must
contain 0 or >1 elements
-MAPI = monetdb@volund:39079
+ERROR = !IllegalArgumentException: point array must contain 0 or >1 elements
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('LINESTRING(10)');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@volund:39079
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('LINESTRING()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@volund:39079
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('LINESTRING');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@volund:39079
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@volund:39079
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('POINT(10)');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@volund:39079
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('POINT()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@volund:39079
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('POINT');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@volund:39079
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
+ERROR = !ParseException: Expected word but encountered end of stream
# 09:07:41 >
# 09:07:41 > Done.
diff --git a/geom/sql/Tests/geom_curve.stable.err
b/geom/sql/Tests/geom_curve.stable.err
--- a/geom/sql/Tests/geom_curve.stable.err
+++ b/geom/sql/Tests/geom_curve.stable.err
@@ -81,30 +81,30 @@ stderr of test 'geom_curve` in directory
# 20:50:33 > mclient -lsql -umonetdb -Pmonetdb --host=koolmees --port=30183
# 20:50:33 >
-MAPI = monetdb@ottar:32754
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO curves values ('POINT(10 10)');
-ERROR = !MALException:wkb.FromText:Geometry type 'Line' not found
-MAPI = monetdb@ottar:32754
+ERROR = !Geometry type 'Line' not found
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO curves values ('POLYGON((10 10, 10 20, 20 20, 20 15, 10
10))');
-ERROR = !MALException:wkb.FromText:Geometry type 'Line' not found
-MAPI = monetdb@ottar:32754
+ERROR = !Geometry type 'Line' not found
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO curves values ('POLYGON((10 10, 10 20, 20 20, 20 15, 10
10), (15 15, 15 20, 10 15, 15 15))');
-ERROR = !MALException:wkb.FromText:Geometry type 'Line' not found
-MAPI = monetdb@ottar:32754
+ERROR = !Geometry type 'Line' not found
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO curves values ('LINESTRING(10 10)');
-ERROR = !MALException:wkb.FromText:IllegalArgumentException: point array must
contain 0 or >1 elements
-MAPI = monetdb@ottar:32754
+ERROR = !IllegalArgumentException: point array must contain 0 or >1 elements
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO curves values ('LINESTRING(10)');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO curves values ('LINESTRING()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO curves values ('LINESTRING');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO curves values ('');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
+ERROR = !ParseException: Expected word but encountered end of stream
# 21:15:14 >
# 21:15:14 > Done.
diff --git a/geom/sql/Tests/geom_geometry.stable.err
b/geom/sql/Tests/geom_geometry.stable.err
--- a/geom/sql/Tests/geom_geometry.stable.err
+++ b/geom/sql/Tests/geom_geometry.stable.err
@@ -10,33 +10,33 @@ stderr of test 'geom_geometry` in direct
# 21:15:13 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=36438
# 21:15:13 >
-MAPI = monetdb@ottar:32754
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('LINESTRING(10 10)');
-ERROR = !MALException:wkb.FromText:IllegalArgumentException: point array must
contain 0 or >1 elements
-MAPI = monetdb@ottar:32754
+ERROR = !IllegalArgumentException: point array must contain 0 or >1 elements
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('LINESTRING(10)');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('LINESTRING()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('LINESTRING');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('POINT(10)');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('POINT()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('POINT');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO geoms values ('');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
+ERROR = !ParseException: Expected word but encountered end of stream
# 21:57:03 >
# 21:57:03 > Done.
diff --git a/geom/sql/Tests/geom_linestring.stable.err
b/geom/sql/Tests/geom_linestring.stable.err
--- a/geom/sql/Tests/geom_linestring.stable.err
+++ b/geom/sql/Tests/geom_linestring.stable.err
@@ -81,30 +81,30 @@ stderr of test 'geom_linestring` in dire
# 20:49:34 > mclient -lsql -umonetdb -Pmonetdb --host=koolmees --port=38689
# 20:49:34 >
-MAPI = monetdb@ottar:32754
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO lines values ('POINT(10 10)');
-ERROR = !MALException:wkb.FromText:Geometry type 'Line' not found
-MAPI = monetdb@ottar:32754
+ERROR = !Geometry type 'Line' not found
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO lines values ('POLYGON((10 10, 10 20, 20 20, 20 15, 10
10))');
-ERROR = !MALException:wkb.FromText:Geometry type 'Line' not found
-MAPI = monetdb@ottar:32754
+ERROR = !Geometry type 'Line' not found
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO lines values ('POLYGON((10 10, 10 20, 20 20, 20 15, 10
10), (15 15, 15 20, 10 15, 15 15))');
-ERROR = !MALException:wkb.FromText:Geometry type 'Line' not found
-MAPI = monetdb@ottar:32754
+ERROR = !Geometry type 'Line' not found
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO lines values ('LINESTRING(10 10)');
-ERROR = !MALException:wkb.FromText:IllegalArgumentException: point array must
contain 0 or >1 elements
-MAPI = monetdb@ottar:32754
+ERROR = !IllegalArgumentException: point array must contain 0 or >1 elements
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO lines values ('LINESTRING(10)');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO lines values ('LINESTRING()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO lines values ('LINESTRING');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO lines values ('');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
+ERROR = !ParseException: Expected word but encountered end of stream
# 21:15:15 >
# 21:15:15 > Done.
diff --git a/geom/sql/Tests/geom_mbr.stable.err
b/geom/sql/Tests/geom_mbr.stable.err
--- a/geom/sql/Tests/geom_mbr.stable.err
+++ b/geom/sql/Tests/geom_mbr.stable.err
@@ -71,18 +71,18 @@ stderr of test 'geom_mbr` in directory '
# 18:34:07 > mclient -lsql -umonetdb -Pmonetdb --host=ottar --port=32754
# 18:34:07 >
-MAPI = monetdb@ottar:32754
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO mbrs values (mbr('POINT(10)'));
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO mbrs values (mbr('POINT()'));
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO mbrs values (mbr('POINT'));
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO mbrs values (mbr(''));
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
+ERROR = !ParseException: Expected word but encountered end of stream
# 21:15:17 >
diff --git a/geom/sql/Tests/geom_point.stable.err
b/geom/sql/Tests/geom_point.stable.err
--- a/geom/sql/Tests/geom_point.stable.err
+++ b/geom/sql/Tests/geom_point.stable.err
@@ -81,18 +81,18 @@ stderr of test 'geom_point` in directory
# 20:49:34 > mclient -lsql -umonetdb -Pmonetdb --host=koolmees --port=38689
# 20:49:34 >
-MAPI = monetdb@ottar:32754
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO points values ('POINT(10)');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO points values ('POINT()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected number but encountered ')'
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO points values ('POINT');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@ottar:32754
+ERROR = !ParseException: Expected word but encountered end of stream
+MAPI = monetdb@madrid:30163
QUERY = INSERT INTO points values ('');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
+ERROR = !ParseException: Expected word but encountered end of stream
# 21:15:13 >
# 21:15:13 > Done.
diff --git a/geom/sql/Tests/geom_polygon.stable.err
b/geom/sql/Tests/geom_polygon.stable.err
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
