Changeset: 349b1d58c101 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=349b1d58c101 Added Files: geom/BugTracker/Tests/SingleServer geom/sql/conformance/Tests/SingleServer geom/sql/functions/Tests/SingleServer geom/sql/pg_regression/Tests/SingleServer sql/backends/monet5/generator/Tests/SingleServer sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select1.test sql/test/SQLite_regress/sqllogictest/Tests/select1.timeout sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select2.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select2.test sql/test/SQLite_regress/sqllogictest/Tests/select2.timeout sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select3.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select3.test sql/test/SQLite_regress/sqllogictest/Tests/select3.timeout sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select4.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select4.test sql/test/SQLite_regress/sqllogictest/Tests/select4.timeout sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select5.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/select5.test sql/test/SQLite_regress/sqllogictest/Tests/select5.timeout testing/mktest.py testing/sqllogictest.py Removed Files: geom/sql/Tests/All geom/sql/Tests/T19.stable.err geom/sql/Tests/T19.stable.out geom/sql/Tests/T20.stable.err geom/sql/Tests/T20.stable.out geom/sql/Tests/T9.stable.err geom/sql/Tests/T9.stable.out geom/sql/Tests/area.sql geom/sql/Tests/asBinary.sql geom/sql/Tests/asBinary.stable.err geom/sql/Tests/asBinary.stable.out geom/sql/Tests/basic.modules geom/sql/Tests/basic.sql geom/sql/Tests/basic.stable.err geom/sql/Tests/basic.stable.out geom/sql/Tests/binary.sql geom/sql/Tests/binary.stable.err geom/sql/Tests/binary.stable.out geom/sql/Tests/centroid.sql geom/sql/Tests/distance.sql geom/sql/Tests/example.modules geom/sql/Tests/example.sql geom/sql/Tests/example.stable.err geom/sql/Tests/example.stable.out geom/sql/Tests/geom-null-tests.modules geom/sql/Tests/geom-null-tests.sql geom/sql/Tests/geom-null-tests.stable.err geom/sql/Tests/geom-null-tests.stable.out geom/sql/Tests/geom_curve.modules geom/sql/Tests/geom_curve.sql geom/sql/Tests/geom_curve.stable.err geom/sql/Tests/geom_curve.stable.out geom/sql/Tests/geom_geometry.modules geom/sql/Tests/geom_geometry.sql geom/sql/Tests/geom_geometry.stable.err geom/sql/Tests/geom_geometry.stable.out geom/sql/Tests/geom_linestring.modules geom/sql/Tests/geom_linestring.sql geom/sql/Tests/geom_linestring.stable.err geom/sql/Tests/geom_linestring.stable.out geom/sql/Tests/geom_mbr.modules geom/sql/Tests/geom_mbr.sql geom/sql/Tests/geom_mbr.stable.err geom/sql/Tests/geom_mbr.stable.out geom/sql/Tests/geom_multi.modules geom/sql/Tests/geom_multi.sql geom/sql/Tests/geom_multi.stable.err geom/sql/Tests/geom_multi.stable.out geom/sql/Tests/geom_point.modules geom/sql/Tests/geom_point.sql geom/sql/Tests/geom_point.stable.err geom/sql/Tests/geom_point.stable.out geom/sql/Tests/geom_polygon.modules geom/sql/Tests/geom_polygon.sql geom/sql/Tests/geom_polygon.stable.err geom/sql/Tests/geom_polygon.stable.out geom/sql/Tests/geom_surface.modules geom/sql/Tests/geom_surface.sql geom/sql/Tests/geom_surface.stable.err geom/sql/Tests/geom_surface.stable.out geom/sql/Tests/intersection.sql geom/sql/Tests/length.sql geom/sql/Tests/makeLine.sql geom/sql/Tests/makeLine.stable.err geom/sql/Tests/makeLine.stable.out geom/sql/Tests/mbr.sql geom/sql/Tests/mbr.stable.err geom/sql/Tests/mbr.stable.out geom/sql/Tests/mbr_left.sql geom/sql/Tests/mbr_left.stable.err geom/sql/Tests/mbr_left.stable.out geom/sql/Tests/mbr_right.sql geom/sql/Tests/mbr_right.stable.err geom/sql/Tests/mbr_right.stable.out geom/sql/Tests/normalized.sql geom/sql/Tests/normalized.stable.err geom/sql/Tests/normalized.stable.out geom/sql/Tests/null-mbr.Bug-2814.modules geom/sql/Tests/null-mbr.Bug-2814.sql geom/sql/Tests/null-mbr.Bug-2814.stable.err geom/sql/Tests/null-mbr.Bug-2814.stable.out geom/sql/Tests/pointOnSurface.sql geom/sql/Tests/pointOnSurface.stable.err geom/sql/Tests/pointOnSurface.stable.out geom/sql/Tests/relation.modules geom/sql/Tests/relation.sql geom/sql/Tests/relation.stable.err geom/sql/Tests/relation.stable.out geom/sql/Tests/spatial.modules geom/sql/Tests/spatial.sql geom/sql/Tests/spatial.stable.err geom/sql/Tests/spatial.stable.out geom/sql/Tests/union.sql geom/sql/Tests/union.stable.err geom/sql/Tests/union.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test1.timeout sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test2.timeout sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test3.timeout sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test4.timeout sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.sh sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out-noapprove sql/test/SQLite_regress/sqllogictest/Tests/test5.timeout sql/test/SQLite_regress/sqllogictest/select1.test sql/test/SQLite_regress/sqllogictest/select2.test sql/test/SQLite_regress/sqllogictest/select3.test sql/test/SQLite_regress/sqllogictest/select4.test sql/test/SQLite_regress/sqllogictest/select5.test sql/test/SQLite_regress/sqllogictest/sqllogictest.py Modified Files: monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_parser.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/tablet.c monetdb5/scheduler/run_adder.c sql/backends/monet5/UDF/pyapi3/pyapi3.c sql/backends/monet5/sql_optimizer.c sql/rel.txt sql/server/rel_psm.c sql/server/rel_unnest.c sql/server/sql_atom.c sql/server/sql_mvc.c sql/storage/store.c sql/test/SQLite_regress/sqllogictest/Tests/All sql/test/mergetables/Tests/sqlsmith-exists.sql sql/test/mergetables/Tests/sqlsmith-exists.stable.out testing/Makefile.ag testing/Mtest.py.in testing/README Branch: default Log Message:
Merged with linear-hashing diffs (truncated from 7570 to 300 lines): diff --git a/geom/BugTracker/Tests/SingleServer b/geom/BugTracker/Tests/SingleServer new file mode 100644 diff --git a/geom/sql/Tests/All b/geom/sql/Tests/All deleted file mode 100644 --- a/geom/sql/Tests/All +++ /dev/null @@ -1,6 +0,0 @@ -# HAVE_GEOM?mbr_left -# HAVE_GEOM?mbr_right -#HAVE_GEOM?asBinary -#HAVE_GEOM?dwithin -#HAVE_GEOM?nPoints -#HAVE_GEOM?dumpPoints diff --git a/geom/sql/Tests/T19.stable.err b/geom/sql/Tests/T19.stable.err deleted file mode 100644 --- a/geom/sql/Tests/T19.stable.err +++ /dev/null @@ -1,36 +0,0 @@ -stderr of test 'T19` 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/T19.stable.out b/geom/sql/Tests/T19.stable.out deleted file mode 100644 --- a/geom/sql/Tests/T19.stable.out +++ /dev/null @@ -1,37 +0,0 @@ -stdout of test 'T19` 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-2015 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 - - -# 07:38:49 > -# 07:38:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3079" "--port=37052" -# 07:38:49 > - -#SELECT IsClosed(LineFromWKB(AsBinary(Boundary(boundary)),SRID(boundary))) FROM named_places WHERE name = 'Goose Island'; -% sys.L # table_name -% issimple_shore # name -% boolean # type -% 5 # length -[ true ] - -# 07:38:49 > -# 07:38:49 > "Done." -# 07:38:49 > - diff --git a/geom/sql/Tests/T20.stable.err b/geom/sql/Tests/T20.stable.err deleted file mode 100644 --- a/geom/sql/Tests/T20.stable.err +++ /dev/null @@ -1,36 +0,0 @@ -stderr of test 'T20` 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/T20.stable.out b/geom/sql/Tests/T20.stable.out deleted file mode 100644 --- a/geom/sql/Tests/T20.stable.out +++ /dev/null @@ -1,37 +0,0 @@ -stdout of test 'T20` 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-2015 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 - - -# 07:38:49 > -# 07:38:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3079" "--port=37052" -# 07:38:49 > - -#SELECT IsRing(LineFromWKB(AsBinary(Boundary(boundary)),SRID(boundary))) FROM named_places WHERE name = 'Goose Island'; -% sys.L # table_name -% issimple_shore # name -% boolean # type -% 5 # length -[ true ] - -# 07:38:49 > -# 07:38:49 > "Done." -# 07:38:49 > - diff --git a/geom/sql/Tests/T9.stable.err b/geom/sql/Tests/T9.stable.err deleted file mode 100644 --- a/geom/sql/Tests/T9.stable.err +++ /dev/null @@ -1,36 +0,0 @@ -stderr of test 'T9` 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/T9.stable.out b/geom/sql/Tests/T9.stable.out deleted file mode 100644 --- a/geom/sql/Tests/T9.stable.out +++ /dev/null @@ -1,37 +0,0 @@ -stdout of test 'T9` in directory 'geom/sql` itself: - - -# 07:38:48 > -# 07:38:48 > "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:48 > - -# 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-2015 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 - - -# 07:38:48 > -# 07:38:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3079" "--port=37052" -# 07:38:48 > - -#SELECT AsText(PolyFromWKB(AsBinary(boundary),101)) FROM named_places WHERE name = 'Goose Island'; -% sys.L # table_name -% astext_boundary # name -% clob # type -% 217 # length -[ "\"POLYGON ((67.0000000000000000 13.0000000000000000, 67.0000000000000000 18.0000000000000000, 59.0000000000000000 18.0000000000000000, 59.0000000000000000 13.0000000000000000, 67.0000000000000000 13.0000000000000000))\"" ] - -# 07:38:48 > -# 07:38:48 > "Done." -# 07:38:48 > - diff --git a/geom/sql/Tests/area.sql b/geom/sql/Tests/area.sql deleted file mode 100644 --- a/geom/sql/Tests/area.sql +++ /dev/null @@ -1,7 +0,0 @@ -SELECT ST_Area(the_geom) As sqft, ST_Area(the_geom)*POWER(0.3048,2) As sqm - FROM (SELECT - ST_GeomFromText('POLYGON((743238 2967416,743238 2967450, - 743265 2967450,743265.625 2967416,743238 2967416))',2249) ) As foo(the_geom); - -SELECT ST_SRID(geom) as SRID, ST_Area(geom) as SQFT FROM (select ST_GeomFromText('POLYGON((743238 2967416,743238 2967450,743265 2967450,743265.625 2967416,743238 2967416))',4326)) as foo(geom); -SELECT ST_SRID(geom) as SRID, ST_Area(geom) as SQFT FROM (select ST_GeomFromText('POLYGON((743238 2967416,743238 2967450,743265 2967450,743265.625 2967416,743238 2967416))',2249)) as foo(geom); diff --git a/geom/sql/Tests/asBinary.sql b/geom/sql/Tests/asBinary.sql deleted file mode 100644 --- a/geom/sql/Tests/asBinary.sql +++ /dev/null @@ -1,3 +0,0 @@ -SELECT ST_AsBinary(ST_GeomFromText('POLYGON((0 0,0 1,1 1,1 0,0 0))')); -SELECT ST_AsBinary(ST_GeomFromText('linestring(10 10,10 11,11 11)')); -SELECT ST_AsBinary(ST_GeomFromText('linearring(10 10,10 11,11 11,10 10)')); diff --git a/geom/sql/Tests/asBinary.stable.err b/geom/sql/Tests/asBinary.stable.err deleted file mode 100644 --- a/geom/sql/Tests/asBinary.stable.err +++ /dev/null @@ -1,37 +0,0 @@ -stderr of test 'asBinary` in directory 'geom/sql` itself: - - -# 16:34:35 > -# 16:34:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37066" "--set" "mapi_usock=/var/tmp/mtest-17364/.s.monetdb.37066" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" "--set" "embedded_r=yes" -# 16:34:35 > - -# builtin opt gdk_dbpath = /export/scratch1/alvanaki/INSTALL/monetdb/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 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
