Changeset: a27466e9b886 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a27466e9b886
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/Tests/T13.stable.err
geom/sql/Tests/T13.stable.out
Branch: geo
Log Message:
check for linestring in startpoint - others via GEOS function
diffs (127 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -1235,7 +1235,7 @@ wkbStartPoint(wkb **out, wkb **geom)
{
GEOSGeom geosGeometry = wkb2geos(*geom);
- if (!geosGeometry) {
+ if (!geosGeometry || GEOSGeomTypeId(geosGeometry) != GEOS_LINESTRING) {
*out = geos2wkb(NULL);
return MAL_SUCCEED;
}
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -245,7 +245,7 @@ comment "Returns the centroid of this Ge
command StartPoint(w:wkb) :wkb
address wkbStartPoint
-comment "Returns the start point of this Geometry where should be Linestring
(?).";
+comment "Returns the start point of this Geometry which should be Linestring.";
command EndPoint(w:wkb) :wkb
address wkbEndPoint
diff --git a/geom/sql/Tests/T13.stable.err b/geom/sql/Tests/T13.stable.err
--- a/geom/sql/Tests/T13.stable.err
+++ b/geom/sql/Tests/T13.stable.err
@@ -1,11 +1,11 @@
stderr of test 'T13` 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 >
+# 17:40:09 >
+# 17:40:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35321" "--set"
"mapi_usock=/var/tmp/mtest-28903/.s.monetdb.35321" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/gast730/INSTALL/var/MonetDB/mTests_geom_sql" "--set"
"mal_listing=0"
+# 17:40:09 >
-# 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 'T13` 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 = 35321
+# cmdline opt mapi_usock = /var/tmp/mtest-28903/.s.monetdb.35321
# 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 >
+# 17:40:11 >
+# 17:40:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28903" "--port=35321"
+# 17:40:11 >
-# 14:29:09 >
-# 14:29:09 > "Done."
-# 14:29:09 >
+# 17:40:11 >
+# 17:40:11 > "Done."
+# 17:40:11 >
diff --git a/geom/sql/Tests/T13.stable.out b/geom/sql/Tests/T13.stable.out
--- a/geom/sql/Tests/T13.stable.out
+++ b/geom/sql/Tests/T13.stable.out
@@ -1,9 +1,9 @@
stdout of test 'T13` 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 >
+# 17:40:09 >
+# 17:40:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35321" "--set"
"mapi_usock=/var/tmp/mtest-28903/.s.monetdb.35321" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/gast730/INSTALL/var/MonetDB/mTests_geom_sql" "--set"
"mal_listing=0"
+# 17:40:09 >
# MonetDB 5 server v11.18.0
# This is an unreleased version
@@ -13,26 +13,28 @@ stdout of test 'T13` 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:35321/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28903/.s.monetdb.35321
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
Ready.
+#WARNING To speedup geom.Boundary a bulk operator implementation is needed
+#WARNING To speedup geom.AsText a bulk operator implementation is needed
-# 07:38:48 >
-# 07:38:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3079" "--port=37052"
-# 07:38:48 >
+# 17:40:11 >
+# 17:40:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28903" "--port=35321"
+# 17:40:11 >
-#SELECT AsText(Boundary((boundary),101) FROM named_places WHERE name = 'Goose
Island';
+#SELECT AsText(Boundary(boundary)) FROM named_places WHERE name = 'Goose
Island';
% sys.L # table_name
% boundary_boundary # name
% clob # type
% 218 # length
[ "\"LINESTRING (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 >
+# 17:40:11 >
+# 17:40:11 > "Done."
+# 17:40:11 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
