Changeset: 6636e532db32 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6636e532db32
Added Files:
geom/sql/Tests/asBinary.sql
geom/sql/Tests/asBinary.stable.err
geom/sql/Tests/asBinary.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:
AsBinary +mTest. Results differ from postGIS since we also have geometry type
LinearRing.
diffs (232 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -106,7 +106,7 @@ geom_export str wkbGeometryType(char**,
geom_export str wkbGetSRID(int*, wkb**);
//Envelope
geom_export str wkbAsText(char**, wkb**, int*);
-//AsBinary
+geom_export str wkbAsBinary(char**, wkb**);
geom_export str wkbIsEmpty(bit*, wkb**);
geom_export str wkbIsSimple(bit*, wkb**);
//Is3D
@@ -994,6 +994,31 @@ int wkbFROMSTR(char* geomWKT, int* len,
return (int)strlen(geomWKT);
}
+//Returns the wkb in a hex representation */
+static char hexit[] = "0123456789ABCDEF";
+
+str wkbAsBinary(char **tostr, wkb **geomWKB) {
+ char *s;
+ int i;
+
+ if(wkb_isnil(*geomWKB)) {
+ *tostr = (str) GDKmalloc(1);
+ **tostr = '\0';
+ return MAL_SUCCEED;
+ }
+ *tostr = (str) GDKmalloc(1+((*geomWKB)->len)*2);
+
+ s = *tostr;
+ for (i = 0; i < (*geomWKB)->len; i++) {
+ int val = ((*geomWKB)->data[i] >> 4) & 0xf;
+ *s++ = hexit[val];
+ val = (*geomWKB)->data[i] & 0xf;
+ *s++ = hexit[val];
+ }
+ *s = '\0';
+ return MAL_SUCCEED;
+}
+
/* Creates the string representation (WKT) of a WKB */
/* return length of resulting string. */
int wkbTOSTR(char **geomWKT, int* len, wkb *geomWKB) {
@@ -1032,6 +1057,8 @@ int wkbTOSTR(char **geomWKT, int* len, w
return (int) dstStrLen;
}
+
+
/* read mbr from disk */
mbr* mbrREAD(mbr *a, stream *s, size_t cnt) {
mbr *c;
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -64,6 +64,10 @@ comment "Returns the number of interior
#Geometry Constructors
+command AsBinary(w:wkb) :str address wkbAsBinary
+comment "Returns the wkb representation into HEX format";
+
+
#command AsText(w:wkb) :str address wkbAsText
#comment "Creates the text representation of the Geometry.";
#command AsEWKT(w:wkb) :str address wkbAsEWKT
@@ -495,7 +499,7 @@ comment "Called when inserting values to
-module geom;
+#module geom;
command calc.isnil(v:wkb):bit
address wkbIsnil
comment "Nil test for wkb value";
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
@@ -4199,7 +4199,7 @@ END;
-------------------------------------------------------------------------
--------------------------- Geometry Outputs ----------------------------
-------------------------------------------------------------------------
---CREATE FUNCTION ST_AsBinary RETURNS EXTERNAL NAME
+CREATE FUNCTION ST_AsBinary(geom Geometry) RETURNS string EXTERNAL NAME
geom."AsBinary";
--CREATE FUNCTION ST_AsEWKB RETURNS EXTERNAL NAME
CREATE FUNCTION ST_AsEWKT(geom Geometry) RETURNS string EXTERNAL NAME
geom."AsEWKT";
--CREATE FUNCTION ST_AsGeoJSON RETURNS EXTERNAL NAME
diff --git a/geom/sql/Tests/All b/geom/sql/Tests/All
--- a/geom/sql/Tests/All
+++ b/geom/sql/Tests/All
@@ -41,3 +41,4 @@ covers
coveredBy
makeBox2D
makeEnvelope
+asBinary
diff --git a/geom/sql/Tests/asBinary.sql b/geom/sql/Tests/asBinary.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/asBinary.sql
@@ -0,0 +1,3 @@
+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
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/asBinary.stable.err
@@ -0,0 +1,37 @@
+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
+# 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 = 37066
+# cmdline opt mapi_usock = /var/tmp/mtest-17364/.s.monetdb.37066
+# 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 embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 16:34:35 >
+# 16:34:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17364" "--port=37066"
+# 16:34:35 >
+
+
+# 16:34:35 >
+# 16:34:35 > "Done."
+# 16:34:35 >
+
diff --git a/geom/sql/Tests/asBinary.stable.out
b/geom/sql/Tests/asBinary.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/asBinary.stable.out
@@ -0,0 +1,81 @@
+stdout 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 >
+
+# MonetDB 5 server v11.20.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 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:37066/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17364/.s.monetdb.37066
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R 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: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.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: 80_udf_hge.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 16:34:35 >
+# 16:34:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17364" "--port=37066"
+# 16:34:35 >
+
+#SELECT ST_AsBinary(ST_GeomFromText('POLYGON((0 0,0 1,1 1,1 0,0 0))'));
+% .L # table_name
+% st_geomfromtext_single_value # name
+% clob # type
+% 186 # length
+[
"01040000000100000005000000000000000000000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000F03F000000000000F03F000000000000000000000000000000000000000000000000"
]
+#SELECT ST_AsBinary(ST_GeomFromText('linestring(10 10,10 11,11 11)'));
+% .L # table_name
+% st_geomfromtext_single_value # name
+% clob # type
+% 114 # length
+[
"010200000003000000000000000000244000000000000024400000000000002440000000000000264000000000000026400000000000002640"
]
+#SELECT ST_AsBinary(ST_GeomFromText('linearring(10 10,10 11,11 11,10 10)'));
+% .L # table_name
+% st_geomfromtext_single_value # name
+% clob # type
+% 146 # length
+[
"01030000000400000000000000000024400000000000002440000000000000244000000000000026400000000000002640000000000000264000000000000024400000000000002440"
]
+
+# 16:34:35 >
+# 16:34:35 > "Done."
+# 16:34:35 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
