Changeset: 2f726a6671c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f726a6671c7
Added Files:
geom/sql/Tests/makeBox2D.sql
geom/sql/Tests/makeBox2D.stable.err
geom/sql/Tests/makeBox2D.stable.out
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/40_geom.sql
geom/sql/Tests/All
Branch: geo
Log Message:
MakeBox2D + mTest
diffs (227 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -183,6 +183,7 @@ geom_export str geom_2_geom_bat(int* out
geom_export str wkbMBR(mbr **res, wkb **geom);
geom_export str wkbMBR_bat(int* outBAT_id, int* inBAT_id);
+geom_export str wkbBox2D(mbr** box, wkb** point1, wkb** point2);
geom_export str mbrOverlaps(bit *out, mbr **b1, mbr **b2);
geom_export str mbrOverlaps_wkb(bit *out, wkb **geom1WKB, wkb **geom2WKB);
@@ -3104,7 +3105,55 @@ str wkbMBR_bat(int* outBAT_id, int* inBA
return MAL_SUCCEED;
}
-/*returns true if the two mbrs overlap */
+str wkbBox2D(mbr** box, wkb** point1, wkb** point2) {
+ GEOSGeom point1_geom, point2_geom;
+ double xmin=0.0, ymin=0.0, xmax=0.0, ymax=0.0;
+
+ //check null input
+ if(wkb_isnil(*point1) || wkb_isnil(*point2)) {
+ *box=mbr_nil;
+ return MAL_SUCCEED;
+ }
+
+ //check input not point geometries
+ point1_geom = wkb2geos(*point1);
+ if((GEOSGeomTypeId(point1_geom)+1) != wkbPoint) {
+ GEOSGeom_destroy(point1_geom);
+ *box = mbr_nil;
+ throw(MAL, "geom.MakeBox2D", "Geometries should be points");
+ }
+
+ point2_geom = wkb2geos(*point2);
+ if((GEOSGeomTypeId(point2_geom)+1) != wkbPoint) {
+ GEOSGeom_destroy(point1_geom);
+ GEOSGeom_destroy(point2_geom);
+ *box = mbr_nil;
+ throw(MAL, "geom.MakeBox2D", "Geometries should be points");
+ }
+
+ if(GEOSGeomGetX(point1_geom, &xmin) == -1 ||
+ GEOSGeomGetY(point1_geom, &ymin) == -1 ||
+ GEOSGeomGetX(point2_geom, &xmax) == -1 ||
+ GEOSGeomGetY(point2_geom, &ymax) == -1) {
+
+ GEOSGeom_destroy(point1_geom);
+ GEOSGeom_destroy(point2_geom);
+ *box = mbr_nil;
+ throw(MAL, "geom.MakeBox2D", "Error in reading the points'
coordinates");
+
+ }
+
+ *box = (mbr*) GDKmalloc(sizeof(mbr));
+ (*box)->xmin = (float) xmin;
+ (*box)->ymin = (float) ymin;
+ (*box)->xmax = (float) xmax;
+ (*box)->ymax = (float) ymax;
+
+ return MAL_SUCCEED;
+}
+
+/*returns true if the two
+ * mbrs overlap */
str mbrOverlaps(bit *out, mbr **b1, mbr **b2) {
if (mbr_isnil(*b1) || mbr_isnil(*b2))
*out = 0;
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -278,6 +278,8 @@ comment "Transforms a geometry from one
command mbr(:wkb) :mbr address wkbMBR
comment "Creates the mbr for the given wkb.";
+command MakeBox2D(:wkb,:wkb) :mbr address wkbBox2D
+comment "Creates an mbr from the two 2D points";
command mbrOverlaps(geom1:wkb, geom2:wkb) :bit address mbrOverlaps_wkb
comment "Returns true if the mbr of geom1 overlaps the mbr of geom2";
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
@@ -4072,7 +4072,7 @@ CREATE FUNCTION ST_MakePointM(x double,
--CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external name
geom."MakePolygon"; --gets linestring
--CREATE FUNCTION ST_MakePolygon(outerGeom Geometry, interiorGeoms Geometry[])
RETURNS Geometry external name geom."MakePolygon"; --gets linestrings
--CREATE FUNCTION ST_Polygon(geom Geometry, srid SMALLINT) RETURNS Geometry
external name geom."Polygon" --gets linestring
---CREATE FUNCTION ST_MakeBox2D(lowLeftPointGeom Geometry, upRightPointGeom
Geometry) RETURNS mbr external name geom."MakeBox2D"; --gets 2d points
+CREATE FUNCTION ST_MakeBox2D(lowLeftPointGeom Geometry, upRightPointGeom
Geometry) RETURNS mbr external name geom."MakeBox2D"; --gets 2d points
--CREATE FUNCTION ST_3DMakeBox(lowLeftPointGeom Geometry, upRightPointGeom
Geometry) RETURNS mbr external name geom."MakeBox3D"; --gets 3d points
-- Other constructors
diff --git a/geom/sql/Tests/All b/geom/sql/Tests/All
--- a/geom/sql/Tests/All
+++ b/geom/sql/Tests/All
@@ -39,3 +39,4 @@ mbr_overlap_or_below
mbr_distance
covers
coveredBy
+makeBox2D
diff --git a/geom/sql/Tests/makeBox2D.sql b/geom/sql/Tests/makeBox2D.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/makeBox2D.sql
@@ -0,0 +1,3 @@
+select ST_MakeBox2D(ST_Point(-989502.1875, 528439.5625), ST_Point(-987121.375
,529933.1875));
+select ST_MakeBox2D(ST_Point(-989502.1875, 528439.5625), null);
+select ST_MakeBox2D(ST_PointFromText('POINT(-989502.1875 528439.5625)'),
ST_GeomFromText('linestring(-987121.375 529933.1875, 0 0)'));
diff --git a/geom/sql/Tests/makeBox2D.stable.err
b/geom/sql/Tests/makeBox2D.stable.err
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/makeBox2D.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'makeBox2D` in directory 'geom/sql` itself:
+
+
+# 12:51:25 >
+# 12:51:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36612" "--set"
"mapi_usock=/var/tmp/mtest-7141/.s.monetdb.36612" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0"
+# 12:51:25 >
+
+# 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
+# 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 = 36612
+# cmdline opt mapi_usock = /var/tmp/mtest-7141/.s.monetdb.36612
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 12:51:25 >
+# 12:51:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7141" "--port=36612"
+# 12:51:25 >
+
+MAPI = (monetdb) /var/tmp/mtest-7141/.s.monetdb.36612
+QUERY = select ST_MakeBox2D(ST_PointFromText('POINT(-989502.1875
528439.5625)'), ST_GeomFromText('linestring(-987121.375 529933.1875, 0 0)'));
+ERROR = !Geometries should be points
+
+# 12:51:25 >
+# 12:51:25 > "Done."
+# 12:51:25 >
+
diff --git a/geom/sql/Tests/makeBox2D.stable.out
b/geom/sql/Tests/makeBox2D.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/makeBox2D.stable.out
@@ -0,0 +1,70 @@
+stdout of test 'makeBox2D` in directory 'geom/sql` itself:
+
+
+# 12:51:25 >
+# 12:51:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36612" "--set"
"mapi_usock=/var/tmp/mtest-7141/.s.monetdb.36612" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0"
+# 12:51:25 >
+
+# 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.356 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://sibuyan.da.cwi.nl:36612/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-7141/.s.monetdb.36612
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 12:51:25 >
+# 12:51:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7141" "--port=36612"
+# 12:51:25 >
+
+#select ST_MakeBox2D(ST_Point(-989502.1875, 528439.5625), ST_Point(-987121.375
,529933.1875));
+% .L # table_name
+% st_point_single_value # name
+% mbr # type
+% 0 # length
+[ "BOX (-989502.1875 528439.5625, -987121.375 529933.1875)" ]
+#select ST_MakeBox2D(ST_Point(-989502.1875, 528439.5625), null);
+% .L # table_name
+% st_point_single_value # name
+% mbr # type
+% 0 # length
+[ NULL ]
+
+# 12:51:25 >
+# 12:51:25 > "Done."
+# 12:51:25 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
