Changeset: 73d382269194 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73d382269194
Added Files:
geom/sql/Tests/functions/Tests/ST_Dimension.sql
geom/sql/Tests/functions/Tests/ST_Dimension.stable.err
geom/sql/Tests/functions/Tests/ST_Dimension.stable.out
Removed Files:
geom/sql/Tests/functions/Tests/dimension.sql
geom/sql/Tests/functions/Tests/dimension.stable.err
geom/sql/Tests/functions/Tests/dimension.stable.out
Modified Files:
geom/monetdb5/geom.h
geom/monetdb5/geom.mal
geom/monetdb5/geomBulk.c
geom/sql/Tests/functions/Tests/All
geom/sql/Tests/functions/Tests/ST_GeomFromText.stable.err
geom/sql/Tests/functions/Tests/ST_LineFromText.stable.err
geom/sql/Tests/functions/Tests/ST_MLineFromText.stable.err
geom/sql/Tests/functions/Tests/ST_MPointFromText.stable.err
geom/sql/Tests/functions/Tests/ST_MPolygonFromText.stable.err
geom/sql/Tests/functions/Tests/ST_MakeBox2D.stable.err
geom/sql/Tests/functions/Tests/ST_PointFromText.stable.err
geom/sql/Tests/functions/Tests/ST_PolygonFromText.stable.err
Branch: geo
Log Message:
ST_Dimension : mTest + bulk
diffs (truncated from 1080 to 300 lines):
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -124,6 +124,7 @@ geom_export str wkbMLineStringToPolygon(
/* Basic Methods on Geometric objects (OGC) */
geom_export str wkbDimension(int*, wkb**);
+geom_export str wkbDimension_bat(bat *inBAT_id, bat *outBAT_id);
geom_export str wkbGeometryType(char**, wkb**, int*);
geom_export str wkbGeometryType_bat(bat *inBAT_id, bat *outBAT_id, int *flag);
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -591,6 +591,7 @@ command IsValid(w:bat[:oid,:wkb]) :bat[:
command MakeBox2D(p1:bat[:oid,:wkb],p2:bat[:oid,:wkb]) :bat[:oid,:mbr] address
wkbBox2D_bat;
+command Dimension(w:bat[:oid,:wkb]) :bat[:oid,:int] address wkbDimension_bat;
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -137,6 +137,9 @@ str wkbFromText_bat(bat *outBAT_id, bat
return MAL_SUCCEED;
}
+/**************************************************************************/
+/********************* IN: wkb - OUT: str - FLAG :int *********************/
+/**************************************************************************/
static str wkbStrOutWithFlag_bat(bat *outBAT_id, bat *inBAT_id, int* flag, str
(*func)(char**, wkb**, int*), const char *name) {
BAT *outBAT = NULL, *inBAT = NULL;
wkb *inWKB = NULL;
@@ -199,6 +202,10 @@ str wkbGeometryType_bat(bat *outBAT_id,
return wkbStrOutWithFlag_bat(outBAT_id, inBAT_id, flag,
wkbGeometryType, "batgeom.wkbGeometryType");
}
+/***************************************************************************/
+/*************************** IN: wkb - OUT: wkb ****************************/
+/***************************************************************************/
+
str wkbBoundary_bat(bat *outBAT_id, bat *inBAT_id) {
BAT *outBAT = NULL, *inBAT = NULL;
wkb *inWKB = NULL;
@@ -253,6 +260,10 @@ str wkbBoundary_bat(bat *outBAT_id, bat
return MAL_SUCCEED;
}
+/***************************************************************************/
+/*************************** IN: wkb - OUT: bit ****************************/
+/***************************************************************************/
+
static str wkbBitOut_bat(bat *outBAT_id, bat *inBAT_id, str (*func)(bit*,
wkb**), const char *name) {
BAT *outBAT = NULL, *inBAT = NULL;
wkb *inWKB = NULL;
@@ -322,6 +333,64 @@ str wkbIsValid_bat(bat *outBAT_id, bat *
return wkbBitOut_bat(outBAT_id, inBAT_id, wkbIsValid,
"batgeom.wkbIsValid");
}
+/***************************************************************************/
+/*************************** IN: wkb - OUT: int ****************************/
+/***************************************************************************/
+
+str wkbDimension_bat(bat *outBAT_id, bat *inBAT_id) {
+ BAT *outBAT = NULL, *inBAT = NULL;
+ wkb *inWKB = NULL;
+ BUN p =0, q =0;
+ BATiter inBAT_iter;
+
+ //get the descriptor of the BAT
+ if ((inBAT = BATdescriptor(*inBAT_id)) == NULL) {
+ throw(MAL, "batgeom.wkbDimension", RUNTIME_OBJECT_MISSING);
+ }
+
+ if ( inBAT->htype != TYPE_void ) { //header type of BAT not void
+ BBPreleaseref(inBAT->batCacheid);
+ throw(MAL, "batgeom.wkbDimension", "The arguments must have
dense and aligned heads");
+ }
+
+ //create a new for the output BAT
+ if ((outBAT = BATnew(TYPE_void, ATOMindex("int"), BATcount(inBAT),
TRANSIENT)) == NULL) {
+ BBPreleaseref(inBAT->batCacheid);
+ throw(MAL, "batgeom.wkbDimension", MAL_MALLOC_FAIL);
+ }
+ //set the first idx of the new BAT equal to that of the input BAT
+ BATseqbase(outBAT, inBAT->hseqbase);
+
+ //iterator over the input BAT
+ inBAT_iter = bat_iterator(inBAT);
+ BATloop(inBAT, p, q) { //iterate over all valid elements
+ str err = NULL;
+ int outSingle;
+
+ inWKB = (wkb*) BUNtail(inBAT_iter, p);
+ if ((err = wkbDimension(&outSingle, &inWKB)) != MAL_SUCCEED) {
+ str msg = createException(MAL, "batgeom.wkbDimension",
"%s", err);
+ GDKfree(err);
+
+ BBPreleaseref(inBAT->batCacheid);
+ BBPreleaseref(outBAT->batCacheid);
+
+ return msg;
+ }
+ BUNappend(outBAT,&outSingle,TRUE); //add the result to the new
BAT
+ }
+
+ //set the number of elements in the outBAT
+ BATsetcount(outBAT, BATcount(inBAT));
+
+ BBPreleaseref(inBAT->batCacheid);
+ BBPkeepref(*outBAT_id = outBAT->batCacheid);
+
+ return MAL_SUCCEED;
+
+}
+
+
/*******************************/
/********* Two inputs **********/
/*******************************/
diff --git a/geom/sql/Tests/functions/Tests/All
b/geom/sql/Tests/functions/Tests/All
--- a/geom/sql/Tests/functions/Tests/All
+++ b/geom/sql/Tests/functions/Tests/All
@@ -38,7 +38,7 @@ ST_Contains
ST_Boundary #Missing geom_bat + bat_geom
-#dimension
+ST_Dimension
ST_AsEWKT
diff --git a/geom/sql/Tests/functions/Tests/ST_Dimension.sql
b/geom/sql/Tests/functions/Tests/ST_Dimension.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/functions/Tests/ST_Dimension.sql
@@ -0,0 +1,6 @@
+SELECT ST_Dimension(st_GeometryFromText('POINT(0 0)'));
+SELECT ST_Dimension(st_GeometryFromText('LINESTRING(1 1,0 0)'));
+SELECT ST_Dimension(st_GeometryFromText('polygon((0 0,1 0, 0 1, 1 1, 0 0))'));
+SELECT ST_Dimension(st_GeomCollFromText('GEOMETRYCOLLECTION(LINESTRING(1 1,0
0),POINT(0 0))'));
+
+SELECT DISTINCT ST_GeometryType(geom) AS "TYPE", ST_Dimension(geom) AS "DIM"
FROM geometries;
diff --git a/geom/sql/Tests/functions/Tests/ST_Dimension.stable.err
b/geom/sql/Tests/functions/Tests/ST_Dimension.stable.err
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/functions/Tests/ST_Dimension.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'ST_Dimension` in directory 'geom/sql/Tests/functions` itself:
+
+
+# 15:08:42 >
+# 15:08:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37646" "--set"
"mapi_usock=/var/tmp/mtest-28358/.s.monetdb.37646" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_functions"
"--set" "mal_listing=0"
+# 15:08:42 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/alvanaki/INSTALL/MonetDB-public/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 = 37646
+# cmdline opt mapi_usock = /var/tmp/mtest-28358/.s.monetdb.37646
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_functions
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 15:08:42 >
+# 15:08:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28358" "--port=37646"
+# 15:08:42 >
+
+
+# 15:08:42 >
+# 15:08:42 > "Done."
+# 15:08:42 >
+
diff --git a/geom/sql/Tests/functions/Tests/ST_Dimension.stable.out
b/geom/sql/Tests/functions/Tests/ST_Dimension.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/functions/Tests/ST_Dimension.stable.out
@@ -0,0 +1,67 @@
+stdout of test 'ST_Dimension` in directory 'geom/sql/Tests/functions` itself:
+
+
+# 15:08:42 >
+# 15:08:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37646" "--set"
"mapi_usock=/var/tmp/mtest-28358/.s.monetdb.37646" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_functions"
"--set" "mal_listing=0"
+# 15:08:42 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_geom_sql_Tests_functions', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers 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:37646/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28358/.s.monetdb.37646
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:08:42 >
+# 15:08:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28358" "--port=37646"
+# 15:08:42 >
+
+#SELECT ST_Dimension(st_GeometryFromText('POINT(0 0)'));
+% .L # table_name
+% st_geometryfromtext_single_value # name
+% int # type
+% 1 # length
+[ 0 ]
+#SELECT ST_Dimension(st_GeometryFromText('LINESTRING(1 1,0 0)'));
+% .L # table_name
+% st_geometryfromtext_single_value # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT ST_Dimension(st_GeometryFromText('polygon((0 0,1 0, 0 1, 1 1, 0 0))'));
+% .L # table_name
+% st_geometryfromtext_single_value # name
+% int # type
+% 1 # length
+[ 2 ]
+#SELECT ST_Dimension(st_GeomCollFromText('GEOMETRYCOLLECTION(LINESTRING(1 1,0
0),POINT(0 0))'));
+% .L # table_name
+% st_geomcollfromtext_single_value # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT DISTINCT ST_GeometryType(geom) AS "TYPE", ST_Dimension(geom) AS "DIM"
FROM geometries;
+% sys.L, sys.L # table_name
+% TYPE, DIM # name
+% clob, int # type
+% 21, 1 # length
+[ "ST_Point", 0 ]
+[ "ST_LineString", 1 ]
+[ "ST_Polygon", 2 ]
+[ "ST_MultiPoint", 0 ]
+[ "ST_MultiLinestring", 1 ]
+[ "ST_MultiPolygon", 2 ]
+[ "ST_GeometryCollection", 2 ]
+
+# 15:08:42 >
+# 15:08:42 > "Done."
+# 15:08:42 >
+
diff --git a/geom/sql/Tests/functions/Tests/ST_GeomFromText.stable.err
b/geom/sql/Tests/functions/Tests/ST_GeomFromText.stable.err
--- a/geom/sql/Tests/functions/Tests/ST_GeomFromText.stable.err
+++ b/geom/sql/Tests/functions/Tests/ST_GeomFromText.stable.err
@@ -29,184 +29,184 @@ stderr of test 'ST_GeomFromText` in dire
# 15:46:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9662" "--port=32350"
# 15:46:20 >
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('point(0 20)', 4326));
ERROR = !column needs geometry(4, 0) and value is geometry(4, 4326)
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('linestring(10 10, 20
20, 30 40)'));
ERROR = !column needs geometry(4, 0) and value is geometry(8, 0)
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('point(0 20)'));
ERROR = !column needs geometry(4, 4326) and value is geometry(4, 0)
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('point(0 20)', 0));
ERROR = !column needs geometry(4, 4326) and value is geometry(4, 0)
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('linestring(10 10, 20
20, 30 40)', 4329));
ERROR = !column needs geometry(4, 4326) and value is geometry(8, 4329)
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('point(0 20 20)',
4326));
ERROR = !column needs geometry(6, 0) and value is geometry(6, 4326)
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('linestring(10 10, 20
20, 30 40)'));
ERROR = !column needs geometry(6, 0) and value is geometry(8, 0)
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('point(0 20 20)'));
ERROR = !column needs geometry(6, 4326) and value is geometry(6, 0)
-MAPI = (monetdb) /var/tmp/mtest-22301/.s.monetdb.35113
+MAPI = (monetdb) /var/tmp/mtest-28358/.s.monetdb.37646
QUERY = insert into points_tbl values (st_geomfromtext('point(0 20 20)', 0));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
