Changeset: d4207db5b401 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4207db5b401 Added Files: 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 geom/sql/Tests/ogc_conformance.sql geom/sql/Tests/ogc_conformance.stable.err geom/sql/Tests/ogc_conformance.stable.out geom/sql/Tests/ogc_dropconformance.sql geom/sql/Tests/ogc_dropconformance.stable.err geom/sql/Tests/ogc_dropconformance.stable.out Modified Files: geom/sql/Tests/All Branch: default Log Message:
Splitting the OGC conformance tests The AsBinary functions are excluded. Also still some weird parsing (T15, T49) Rest has to be checked or facilitated using an extension of the MAL layer. diffs (truncated from 2985 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 @@ -18,5 +18,57 @@ ogc_schema ogc_load ogc_test ogc_destroy -ogc_geometry +ogc_conformance +T1 +T2 +T3 +T4 +T5 +T6 +T7 +T8 +# T9 uses AsBinary +T10 +T11 +T12 +T13 +T14 +T15 +T16 +T17 +T18 +# T19 uses AsBinary +# T20 uses AsBinary +T21 +T22 +T23 +T24 +T25 +T26 +T27 +T28 +T29 +T30 +T31 +T32 +T33 +T34 +T35 +T37 +T38 +T39 +T40 +T41 +T42 +T43 +T44 +T45 +T46 +T47 +T48 +T49 +T50 +T51 +T52 +ogc_dropconformance diff --git a/geom/sql/Tests/T1.sql b/geom/sql/Tests/T1.sql new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T1.sql @@ -0,0 +1,2 @@ + SELECT f_table_name + FROM geometry_columns; diff --git a/geom/sql/Tests/T10.sql b/geom/sql/Tests/T10.sql new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T10.sql @@ -0,0 +1,3 @@ +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 new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T10.stable.err @@ -0,0 +1,35 @@ +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 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/current//Linux/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 = 37052 +# cmdline opt mapi_usock = /var/tmp/mtest-3079/.s.monetdb.37052 +# 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 mal_listing = 0 + +# 07:38:49 > +# 07:38:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3079" "--port=37052" +# 07:38:49 > + + +# 07:38:49 > +# 07:38:49 > "Done." +# 07:38:49 > + diff --git a/geom/sql/Tests/T10.stable.out b/geom/sql/Tests/T10.stable.out new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T10.stable.out @@ -0,0 +1,41 @@ +stdout 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 > + +# MonetDB 5 server v11.18.0 +# 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://vienna.ins.cwi.nl:37052/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-3079/.s.monetdb.37052 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# 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'; +% sys.L # table_name +% srid_boundary # name +% int # type +% 1 # length +[ 0 ] + +# 07:38:49 > +# 07:38:49 > "Done." +# 07:38:49 > + diff --git a/geom/sql/Tests/T11.sql b/geom/sql/Tests/T11.sql new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T11.sql @@ -0,0 +1,3 @@ +SELECT IsEmpty(centerline) +FROM road_segments +WHERE name = 'Route 5'; diff --git a/geom/sql/Tests/T11.stable.err b/geom/sql/Tests/T11.stable.err new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T11.stable.err @@ -0,0 +1,35 @@ +stderr of test 'T11` in directory 'geom/sql` itself: + + +# 22:35:53 > +# 22:35:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35910" "--set" "mapi_usock=/var/tmp/mtest-29384/.s.monetdb.35910" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" +# 22:35:53 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/current//Linux/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 = 35910 +# cmdline opt mapi_usock = /var/tmp/mtest-29384/.s.monetdb.35910 +# 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 mal_listing = 0 + +# 22:35:53 > +# 22:35:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29384" "--port=35910" +# 22:35:53 > + + +# 22:35:53 > +# 22:35:53 > "Done." +# 22:35:53 > + diff --git a/geom/sql/Tests/T11.stable.out b/geom/sql/Tests/T11.stable.out new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T11.stable.out @@ -0,0 +1,43 @@ +stdout of test 'T11` in directory 'geom/sql` itself: + + +# 22:35:53 > +# 22:35:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35910" "--set" "mapi_usock=/var/tmp/mtest-29384/.s.monetdb.35910" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" +# 22:35:53 > + +# MonetDB 5 server v11.18.0 +# 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://vienna.ins.cwi.nl:35910/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-29384/.s.monetdb.35910 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. +#WARNING To speedup geom.IsEmpty a bulk operator implementation is needed + +# 22:35:53 > +# 22:35:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29384" "--port=35910" +# 22:35:53 > + +#SELECT IsEmpty(centerline) +#FROM road_segments +#WHERE name = 'Route 5'; +% sys.L # table_name +% isempty_centerline # name +% boolean # type +% 5 # length +[ false ] +[ false ] +[ false ] + +# 22:35:53 > +# 22:35:53 > "Done." +# 22:35:53 > + diff --git a/geom/sql/Tests/T12.sql b/geom/sql/Tests/T12.sql new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T12.sql @@ -0,0 +1,3 @@ +SELECT IsSimple(shore) +FROM lakes +WHERE name = 'Blue Lake'; diff --git a/geom/sql/Tests/T12.stable.err b/geom/sql/Tests/T12.stable.err new file mode 100644 --- /dev/null +++ b/geom/sql/Tests/T12.stable.err @@ -0,0 +1,35 @@ +stderr of test 'T12` 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 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/current//Linux/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 = 37052 +# cmdline opt mapi_usock = /var/tmp/mtest-3079/.s.monetdb.37052 +# 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 mal_listing = 0 + +# 07:38:49 > +# 07:38:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3079" "--port=37052" _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
