Changeset: 521596f93598 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=521596f93598 Added Files: geom/sql/Tests/T1.reqtests geom/sql/Tests/T1.stable.err geom/sql/Tests/T1.stable.out geom/sql/Tests/T10.reqtests geom/sql/Tests/T11.reqtests geom/sql/Tests/T12.reqtests geom/sql/Tests/T13.reqtests geom/sql/Tests/T13.stable.err geom/sql/Tests/T13.stable.out geom/sql/Tests/T14.reqtests geom/sql/Tests/T14.stable.err geom/sql/Tests/T14.stable.out geom/sql/Tests/T15.reqtests geom/sql/Tests/T15.stable.err geom/sql/Tests/T15.stable.out geom/sql/Tests/T16.reqtests geom/sql/Tests/T17.reqtests geom/sql/Tests/T17.stable.err geom/sql/Tests/T17.stable.out geom/sql/Tests/T18.reqtests geom/sql/Tests/T18.stable.err geom/sql/Tests/T18.stable.out geom/sql/Tests/T19.reqtests geom/sql/Tests/T19.stable.err geom/sql/Tests/T19.stable.out geom/sql/Tests/T2.reqtests geom/sql/Tests/T2.stable.err geom/sql/Tests/T2.stable.out geom/sql/Tests/T20.reqtests geom/sql/Tests/T20.stable.err geom/sql/Tests/T20.stable.out geom/sql/Tests/T21.reqtests geom/sql/Tests/T22.reqtests geom/sql/Tests/T22.stable.err geom/sql/Tests/T22.stable.out geom/sql/Tests/T23.reqtests geom/sql/Tests/T23.stable.err geom/sql/Tests/T23.stable.out geom/sql/Tests/T24.reqtests geom/sql/Tests/T24.stable.err geom/sql/Tests/T24.stable.out geom/sql/Tests/T25.reqtests geom/sql/Tests/T25.stable.err geom/sql/Tests/T25.stable.out geom/sql/Tests/T26.reqtests geom/sql/Tests/T27.reqtests geom/sql/Tests/T27.stable.err geom/sql/Tests/T27.stable.out geom/sql/Tests/T28.reqtests geom/sql/Tests/T28.stable.err geom/sql/Tests/T28.stable.out geom/sql/Tests/T29.reqtests geom/sql/Tests/T29.stable.err geom/sql/Tests/T29.stable.out geom/sql/Tests/T3.reqtests geom/sql/Tests/T3.stable.err geom/sql/Tests/T3.stable.out geom/sql/Tests/T30.reqtests geom/sql/Tests/T30.stable.err geom/sql/Tests/T30.stable.out geom/sql/Tests/T31.reqtests geom/sql/Tests/T31.stable.err geom/sql/Tests/T31.stable.out geom/sql/Tests/T32.reqtests geom/sql/Tests/T32.stable.err geom/sql/Tests/T32.stable.out geom/sql/Tests/T33.reqtests geom/sql/Tests/T34.reqtests geom/sql/Tests/T34.stable.err geom/sql/Tests/T34.stable.out geom/sql/Tests/T35.reqtests geom/sql/Tests/T35.stable.err geom/sql/Tests/T35.stable.out geom/sql/Tests/T36.reqtests geom/sql/Tests/T36.sql geom/sql/Tests/T36.stable.err geom/sql/Tests/T36.stable.out geom/sql/Tests/T37.reqtests geom/sql/Tests/T38.reqtests geom/sql/Tests/T39.reqtests geom/sql/Tests/T4.reqtests geom/sql/Tests/T4.stable.err geom/sql/Tests/T4.stable.out geom/sql/Tests/T40.reqtests geom/sql/Tests/T41.reqtests geom/sql/Tests/T42.reqtests geom/sql/Tests/T43.reqtests geom/sql/Tests/T43.stable.err geom/sql/Tests/T43.stable.out geom/sql/Tests/T44.reqtests geom/sql/Tests/T45.reqtests geom/sql/Tests/T46.reqtests geom/sql/Tests/T47.reqtests geom/sql/Tests/T48.reqtests geom/sql/Tests/T49.reqtests geom/sql/Tests/T49.stable.err geom/sql/Tests/T49.stable.out geom/sql/Tests/T5.reqtests geom/sql/Tests/T50.reqtests geom/sql/Tests/T51.reqtests geom/sql/Tests/T52.reqtests geom/sql/Tests/T6.reqtests geom/sql/Tests/T7.reqtests geom/sql/Tests/T7.stable.err geom/sql/Tests/T7.stable.out geom/sql/Tests/T8.reqtests geom/sql/Tests/T9.reqtests geom/sql/Tests/T9.stable.err geom/sql/Tests/T9.stable.out geom/sql/Tests/binary.sql geom/sql/Tests/binary.stable.err geom/sql/Tests/binary.stable.out geom/sql/Tests/conformance_drop.sql geom/sql/Tests/conformance_drop.stable.err geom/sql/Tests/conformance_drop.stable.out geom/sql/Tests/conformance_load.sql geom/sql/Tests/conformance_load.stable.err geom/sql/Tests/conformance_load.stable.out geom/sql/Tests/normalized.sql geom/sql/Tests/normalized.stable.err geom/sql/Tests/normalized.stable.out Removed Files: geom/sql/Tests/ogc_conformance.sql geom/sql/Tests/ogc_conformance.stable.err geom/sql/Tests/ogc_conformance.stable.out geom/sql/Tests/ogc_destroy.sql geom/sql/Tests/ogc_destroy.stable.err geom/sql/Tests/ogc_destroy.stable.out geom/sql/Tests/ogc_dropconformance.sql geom/sql/Tests/ogc_dropconformance.stable.err geom/sql/Tests/ogc_dropconformance.stable.out geom/sql/Tests/ogc_geometry.sql geom/sql/Tests/ogc_load.sql geom/sql/Tests/ogc_load.stable.err geom/sql/Tests/ogc_load.stable.out geom/sql/Tests/ogc_schema.sql geom/sql/Tests/ogc_schema.stable.err geom/sql/Tests/ogc_schema.stable.out geom/sql/Tests/ogc_test.sql geom/sql/Tests/ogc_test.stable.err geom/sql/Tests/ogc_test.stable.out Modified Files: geom/sql/Tests/All geom/sql/Tests/T1.sql geom/sql/Tests/T10.sql geom/sql/Tests/T10.stable.err geom/sql/Tests/T10.stable.out geom/sql/Tests/T11.sql geom/sql/Tests/T11.stable.err geom/sql/Tests/T11.stable.out geom/sql/Tests/T12.sql geom/sql/Tests/T12.stable.err geom/sql/Tests/T12.stable.out geom/sql/Tests/T13.sql geom/sql/Tests/T14.sql geom/sql/Tests/T15.sql geom/sql/Tests/T16.sql geom/sql/Tests/T16.stable.err geom/sql/Tests/T16.stable.out geom/sql/Tests/T17.sql geom/sql/Tests/T18.sql geom/sql/Tests/T19.sql geom/sql/Tests/T2.sql geom/sql/Tests/T20.sql geom/sql/Tests/T21.sql geom/sql/Tests/T21.stable.err geom/sql/Tests/T21.stable.out geom/sql/Tests/T22.sql geom/sql/Tests/T23.sql geom/sql/Tests/T24.sql geom/sql/Tests/T25.sql geom/sql/Tests/T26.sql geom/sql/Tests/T26.stable.err geom/sql/Tests/T26.stable.out geom/sql/Tests/T27.sql geom/sql/Tests/T28.sql geom/sql/Tests/T29.sql geom/sql/Tests/T3.sql geom/sql/Tests/T30.sql geom/sql/Tests/T31.sql geom/sql/Tests/T32.sql geom/sql/Tests/T33.sql geom/sql/Tests/T33.stable.err geom/sql/Tests/T33.stable.out geom/sql/Tests/T34.sql geom/sql/Tests/T35.sql geom/sql/Tests/T37.sql geom/sql/Tests/T37.stable.err geom/sql/Tests/T37.stable.out geom/sql/Tests/T38.sql geom/sql/Tests/T38.stable.err geom/sql/Tests/T38.stable.out geom/sql/Tests/T39.sql geom/sql/Tests/T39.stable.err geom/sql/Tests/T39.stable.out geom/sql/Tests/T4.sql geom/sql/Tests/T40.sql geom/sql/Tests/T40.stable.err geom/sql/Tests/T40.stable.out geom/sql/Tests/T41.sql geom/sql/Tests/T41.stable.err geom/sql/Tests/T41.stable.out geom/sql/Tests/T42.sql geom/sql/Tests/T42.stable.err geom/sql/Tests/T42.stable.out geom/sql/Tests/T43.sql geom/sql/Tests/T44.sql geom/sql/Tests/T44.stable.err geom/sql/Tests/T44.stable.out geom/sql/Tests/T45.sql geom/sql/Tests/T45.stable.err geom/sql/Tests/T45.stable.out geom/sql/Tests/T46.sql geom/sql/Tests/T46.stable.err geom/sql/Tests/T46.stable.out geom/sql/Tests/T47.sql geom/sql/Tests/T47.stable.err geom/sql/Tests/T47.stable.out geom/sql/Tests/T48.sql geom/sql/Tests/T48.stable.err geom/sql/Tests/T48.stable.out geom/sql/Tests/T49.sql geom/sql/Tests/T5.sql geom/sql/Tests/T5.stable.err geom/sql/Tests/T5.stable.out geom/sql/Tests/T50.sql geom/sql/Tests/T50.stable.err geom/sql/Tests/T50.stable.out geom/sql/Tests/T51.sql geom/sql/Tests/T51.stable.err geom/sql/Tests/T51.stable.out geom/sql/Tests/T52.sql geom/sql/Tests/T52.stable.err geom/sql/Tests/T52.stable.out geom/sql/Tests/T6.sql geom/sql/Tests/T6.stable.err geom/sql/Tests/T6.stable.out geom/sql/Tests/T7.sql geom/sql/Tests/T8.sql geom/sql/Tests/T8.stable.err geom/sql/Tests/T8.stable.out geom/sql/Tests/T9.sql Branch: default Log Message:
Fixed Open Geospatial Consortium (OGC) tests. The document referred to in changeset 144aec2d2d25 (http://www.opengeospatial.org/standards/sfs) contains three schema definitions with tests. The first two sets of tests are very basic and are here represented by the normalized and binary tests. The third set is the actual conformance test and has 52 tests. Some of these tests don't work in our implementation because of missing functionality. Those tests have been disabled with the reason given, although expected output is provided. Two tests (T13 and T14) are syntactically incorrect and I can't figure out what was intended, so they have also been disabled. Other tests were also incorrect but were fixable. diffs (truncated from 8930 to 300 lines): diff --git a/geom/sql/Tests/All b/geom/sql/Tests/All --- a/geom/sql/Tests/All +++ b/geom/sql/Tests/All @@ -14,54 +14,53 @@ example null-mbr.Bug-2814 geom-null-tests -ogc_schema -ogc_load -ogc_test -ogc_destroy +normalized +binary -ogc_conformance +conformance_load T1 T2 T3 T4 T5 T6 -T7 +# T7 no such unary operator 'geometrytype(multilinestring)' T8 -# T9 uses AsBinary +# T9 no such unary operator 'asbinary(polygon)' T10 T11 T12 -T13 -T14 +# T13 !syntax/parse error (incorrect query in document) +# T14 !syntax/parse error (incorrect query in document) T15 T16 -T17 -T18 -# T19 uses AsBinary -# T20 uses AsBinary +# T17 no such unary operator 'startpoint(linestring)' +# T18 no such unary operator 'endpoint(linestring)' +# T19 no such unary operator 'asbinary(geometry)' +# T20 no such unary operator 'asbinary(geometry)' T21 -T22 -T23 -T24 -T25 +# T22 no such unary operator 'numpoints(linestring)' +# T23 no such binary operator 'pointn(linestring,tinyint)' +# T24 no such unary operator 'centroid(polygon)' +# T25 no such unary operator 'pointonsurface(polygon)' T26 -T27 -T28 -T29 -T30 -T31 -T32 +# T27 no such unary operator 'exteriorring(polygon)' +# T28 no such unary operator 'numinteriorring(polygon)' +# T29 no such binary operator 'interiorringn(polygon,tinyint)' +# T30 no such unary operator 'numgeometries(multilinestring)' +# T31 no such binary operator 'geometryn(multilinestring,tinyint)' +# T32 no such unary operator 'isclosed(multilinestring)' T33 -T34 -T35 +# T34 no such unary operator 'centroid(multipolygon)' +# T35 no such unary operator 'pointonsurface(multipolygon)' +T36 T37 T38 T39 T40 T41 T42 -T43 +# T43 no such binary operator 'intersects(linestring,multilinestring)' T44 T45 T46 @@ -71,4 +70,4 @@ T49 T50 T51 T52 -ogc_dropconformance +conformance_drop diff --git a/geom/sql/Tests/T1.reqtests b/geom/sql/Tests/T1.reqtests new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T1.reqtests @@ -0,0 +1,1 @@ +conformance_load diff --git a/geom/sql/Tests/T1.sql b/geom/sql/Tests/T1.sql --- a/geom/sql/Tests/T1.sql +++ b/geom/sql/Tests/T1.sql @@ -1,2 +1,2 @@ - SELECT f_table_name - FROM geometry_columns; +-- Conformance Item T1 +SELECT f_table_name FROM geometry_columns; diff --git a/geom/sql/Tests/T1.stable.err b/geom/sql/Tests/T1.stable.err new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T1.stable.err @@ -0,0 +1,36 @@ +stderr of test 'T1` in directory 'geom/sql` itself: + + +# 14:29:09 > +# 14:29:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38941" "--set" "mapi_usock=/var/tmp/mtest-20126/.s.monetdb.38941" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" +# 14:29:09 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-devel/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 38941 +# cmdline opt mapi_usock = /var/tmp/mtest-20126/.s.monetdb.38941 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-devel/var/MonetDB/mTests_geom_sql +# cmdline opt mal_listing = 0 +# cmdline opt gdk_debug = 536870922 + +# 14:29:09 > +# 14:29:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-20126" "--port=38941" +# 14:29:09 > + + +# 14:29:09 > +# 14:29:09 > "Done." +# 14:29:09 > + diff --git a/geom/sql/Tests/T1.stable.out b/geom/sql/Tests/T1.stable.out new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T1.stable.out @@ -0,0 +1,48 @@ +stdout of test 'T1` in directory 'geom/sql` itself: + + +# 14:29:09 > +# 14:29:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38941" "--set" "mapi_usock=/var/tmp/mtest-20126/.s.monetdb.38941" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" +# 14:29:09 > + +# MonetDB 5 server v11.18.0 (hg id: 5d7fe15187f5) +# This is an unreleased version +# Serving database 'mTests_geom_sql', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.591 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:38941/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-20126/.s.monetdb.38941 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. + +# 14:29:09 > +# 14:29:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-20126" "--port=38941" +# 14:29:09 > + +#SELECT f_table_name FROM geometry_columns; +% sys.geometry_columns # table_name +% f_table_name # name +% clob # type +% 14 # length +[ "lakes" ] +[ "road_segments" ] +[ "divided_routes" ] +[ "forests" ] +[ "bridges" ] +[ "streams" ] +[ "buildings" ] +[ "buildings" ] +[ "ponds" ] +[ "named_places" ] +[ "map_neatlines" ] + +# 14:29:09 > +# 14:29:09 > "Done." +# 14:29:09 > + diff --git a/geom/sql/Tests/T10.reqtests b/geom/sql/Tests/T10.reqtests new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T10.reqtests @@ -0,0 +1,1 @@ +conformance_load diff --git a/geom/sql/Tests/T10.sql b/geom/sql/Tests/T10.sql --- a/geom/sql/Tests/T10.sql +++ b/geom/sql/Tests/T10.sql @@ -1,3 +1,2 @@ -SELECT SRID(boundary) -FROM named_places -WHERE name = 'Goose Island'; +-- Conformance Item T10 +SELECT SRID(boundary) FROM named_places WHERE name = 'Goose Island'; diff --git a/geom/sql/Tests/T10.stable.err b/geom/sql/Tests/T10.stable.err --- a/geom/sql/Tests/T10.stable.err +++ b/geom/sql/Tests/T10.stable.err @@ -1,11 +1,11 @@ stderr of test 'T10` in directory 'geom/sql` itself: -# 07:38:49 > -# 07:38:49 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37052" "--set" "mapi_usock=/var/tmp/mtest-3079/.s.monetdb.37052" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" -# 07:38:49 > +# 14:29:09 > +# 14:29:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38941" "--set" "mapi_usock=/var/tmp/mtest-20126/.s.monetdb.38941" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" +# 14:29:09 > -# builtin opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-devel/var/monetdb5/dbfarm/demo # builtin opt gdk_debug = 0 # builtin opt gdk_vmtrim = no # builtin opt monet_prompt = > @@ -17,19 +17,20 @@ stderr of test 'T10` in directory 'geom/ # builtin opt sql_debug = 0 # cmdline opt gdk_nr_threads = 0 # cmdline opt mapi_open = true -# cmdline opt mapi_port = 37052 -# cmdline opt mapi_usock = /var/tmp/mtest-3079/.s.monetdb.37052 +# cmdline opt mapi_port = 38941 +# cmdline opt mapi_usock = /var/tmp/mtest-20126/.s.monetdb.38941 # cmdline opt monet_prompt = # cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/MonetDB/mTests_geom_sql +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-devel/var/MonetDB/mTests_geom_sql # cmdline opt mal_listing = 0 +# cmdline opt gdk_debug = 536870922 -# 07:38:49 > -# 07:38:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3079" "--port=37052" -# 07:38:49 > +# 14:29:09 > +# 14:29:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-20126" "--port=38941" +# 14:29:09 > -# 07:38:49 > -# 07:38:49 > "Done." -# 07:38:49 > +# 14:29:09 > +# 14:29:09 > "Done." +# 14:29:09 > diff --git a/geom/sql/Tests/T10.stable.out b/geom/sql/Tests/T10.stable.out --- a/geom/sql/Tests/T10.stable.out +++ b/geom/sql/Tests/T10.stable.out @@ -20,15 +20,12 @@ stdout of test 'T10` in directory 'geom/ # MonetDB/SQL module loaded Ready. -#WARNING To speedup geom.SRID a bulk operator implementation is needed # 07:38:49 > # 07:38:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3079" "--port=37052" # 07:38:49 > -#SELECT SRID(boundary) -#FROM named_places -#WHERE name = 'Goose Island'; +#SELECT SRID(boundary) FROM named_places WHERE name = 'Goose Island'; % sys.L # table_name % srid_boundary # name % int # type diff --git a/geom/sql/Tests/T11.reqtests b/geom/sql/Tests/T11.reqtests new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T11.reqtests @@ -0,0 +1,1 @@ +conformance_load diff --git a/geom/sql/Tests/T11.sql b/geom/sql/Tests/T11.sql --- a/geom/sql/Tests/T11.sql +++ b/geom/sql/Tests/T11.sql @@ -1,3 +1,2 @@ -SELECT IsEmpty(centerline) -FROM road_segments -WHERE name = 'Route 5'; +-- Conformance Item T11 +SELECT IsEmpty(centerline) FROM road_segments WHERE name = 'Route 5' AND aliases = 'Main Street'; diff --git a/geom/sql/Tests/T11.stable.err b/geom/sql/Tests/T11.stable.err --- a/geom/sql/Tests/T11.stable.err +++ b/geom/sql/Tests/T11.stable.err @@ -1,11 +1,11 @@ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
