Changeset: 4dd8977c1c95 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4dd8977c1c95 Modified Files: geom/sql/40_geom.sql geom/sql/Tests/T23.stable.err geom/sql/Tests/T23.stable.out Branch: geo Log Message:
PointN done diffs (114 lines): diff --git a/geom/sql/40_geom.sql b/geom/sql/40_geom.sql --- a/geom/sql/40_geom.sql +++ b/geom/sql/40_geom.sql @@ -102,3 +102,5 @@ CREATE FUNCTION Centroid(g Geometry) RET CREATE FUNCTION StartPoint(g Geometry) RETURNS Geometry external name geom."StartPoint"; CREATE FUNCTION EndPoint(g Geometry) RETURNS Geometry external name geom."EndPoint"; CREATE FUNCTION NumPoints(g Geometry) RETURNS integer external name geom."NumPoints"; +CREATE FUNCTION PointN(g Geometry, n SMALLINT) RETURNS Geometry external name geom."PointN"; + diff --git a/geom/sql/Tests/T23.stable.err b/geom/sql/Tests/T23.stable.err --- a/geom/sql/Tests/T23.stable.err +++ b/geom/sql/Tests/T23.stable.err @@ -1,11 +1,11 @@ stderr of test 'T23` 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 > +# 12:29:47 > +# 12:29:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32713" "--set" "mapi_usock=/var/tmp/mtest-26944/.s.monetdb.32713" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/gast730/INSTALL/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" +# 12:29:47 > -# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-devel/var/monetdb5/dbfarm/demo +# builtin opt gdk_dbpath = /ufs/gast730/INSTALL/var/monetdb5/dbfarm/demo # builtin opt gdk_debug = 0 # builtin opt gdk_vmtrim = no # builtin opt monet_prompt = > @@ -17,20 +17,20 @@ stderr of test 'T23` in directory 'geom/ # 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 mapi_port = 32713 +# cmdline opt mapi_usock = /var/tmp/mtest-26944/.s.monetdb.32713 # cmdline opt monet_prompt = # cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-devel/var/MonetDB/mTests_geom_sql +# cmdline opt gdk_dbpath = /ufs/gast730/INSTALL/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 > +# 12:29:48 > +# 12:29:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-26944" "--port=32713" +# 12:29:48 > -# 14:29:09 > -# 14:29:09 > "Done." -# 14:29:09 > +# 12:29:48 > +# 12:29:48 > "Done." +# 12:29:48 > diff --git a/geom/sql/Tests/T23.stable.out b/geom/sql/Tests/T23.stable.out --- a/geom/sql/Tests/T23.stable.out +++ b/geom/sql/Tests/T23.stable.out @@ -1,9 +1,9 @@ stdout of test 'T23` in directory 'geom/sql` itself: -# 07:38:56 > -# 07:38:56 > "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:56 > +# 12:29:47 > +# 12:29:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32713" "--set" "mapi_usock=/var/tmp/mtest-26944/.s.monetdb.32713" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/gast730/INSTALL/var/MonetDB/mTests_geom_sql" "--set" "mal_listing=0" +# 12:29:47 > # MonetDB 5 server v11.18.0 # This is an unreleased version @@ -13,26 +13,28 @@ stdout of test 'T23` in directory 'geom/ # 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 +# Listening for connection requests on mapi:monetdb://athens.ins.cwi.nl:32713/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-26944/.s.monetdb.32713 # MonetDB/GIS module loaded # MonetDB/JAQL module loaded # MonetDB/SQL module loaded Ready. +#WARNING To speedup geom.PointN a bulk operator implementation is needed +#WARNING To speedup geom.AsText a bulk operator implementation is needed -# 07:38:56 > -# 07:38:56 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3079" "--port=37052" -# 07:38:56 > +# 12:29:48 > +# 12:29:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-26944" "--port=32713" +# 12:29:48 > #SELECT AsText(PointN(centerline, 1)) FROM road_segments WHERE fid = 102; % sys.L # table_name -% intersection_centerline # name +% pointn_centerline # name % clob # type -% 48 # length -[ "\"POINT (0.0000000000000000 18.0000000000000000)\"" ] +% 49 # length +[ "\"POINT (10.0000000000000000 21.0000000000000000)\"" ] -# 07:38:56 > -# 07:38:56 > "Done." -# 07:38:56 > +# 12:29:48 > +# 12:29:48 > "Done." +# 12:29:48 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
