Changeset: 752f543236a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=752f543236a0
Added Files:
geom/sql/Tests/functions/Tests/ST_IsRing.sql
Removed Files:
geom/sql/Tests/functions/Tests/isRing.sql
geom/sql/Tests/functions/Tests/isRing.stable.err
geom/sql/Tests/functions/Tests/isRing.stable.out
Modified Files:
geom/monetdb5/geom.h
geom/monetdb5/geom.mal
geom/monetdb5/geomBulk.c
geom/sql/Tests/functions/Tests/All
Branch: geo
Log Message:
ST_IsRing : mTest + bulk
diffs (156 lines):
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -189,6 +189,8 @@ geom_export str wkbIsClosed(bit *out, wk
geom_export str wkbIsClosed_bat(bat *inBAT_id, bat *outBAT_id);
geom_export str wkbIsRing(bit *out, wkb **geom);
+geom_export str wkbIsRing_bat(bat *inBAT_id, bat *outBAT_id);
+
geom_export str wkbIsValid(bit *out, wkb **geom);
geom_export str wkbIsValidReason(char** out, wkb **geom);
geom_export str wkbIsValidDetail(char** out, wkb **geom);
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -509,6 +509,7 @@ command Boundary(w:bat[:oid,:wkb]) :bat[
command IsClosed(w:bat[:oid,:wkb]) :bat[:oid,:bit] address wkbIsClosed_bat;
command IsEmpty(w:bat[:oid,:wkb]) :bat[:oid,:bit] address wkbIsEmpty_bat;
command IsSimple(w:bat[:oid,:wkb]) :bat[:oid,:bit] address wkbIsSimple_bat;
+command IsRing(w:bat[:oid,:wkb]) :bat[:oid,:bit] address wkbIsRing_bat;
command pbsmIndexCreate(x:bat[:oid,:dbl], y:bat[:oid,:dbl], xmin:dbl,
ymin:dbl, xmax:dbl, ymax:dbl) :bat[:oid,:int] address pbsmIndexCreate_bat;
command geom.pbsmIndexLoad() address pbsmIndexLoad_bat;
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -253,6 +253,9 @@ str wkbIsEmpty_bat(bat *outBAT_id, bat *
str wkbIsSimple_bat(bat *outBAT_id, bat *inBAT_id) {
return wkbBitOut_bat(outBAT_id, inBAT_id, wkbIsSimple,
"batgeom.wkbIsSimple");
}
+str wkbIsRing_bat(bat *outBAT_id, bat *inBAT_id) {
+ return wkbBitOut_bat(outBAT_id, inBAT_id, wkbIsRing,
"batgeom.wkbIsRing");
+}
/*******************************/
/********* 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
@@ -18,7 +18,9 @@ ST_IsEmpty
ST_IsSimple
#isValid
-#isRing
+
+ST_IsRing
+
#coordinates
#srid
#geometryN
diff --git a/geom/sql/Tests/functions/Tests/isRing.sql
b/geom/sql/Tests/functions/Tests/ST_IsRing.sql
rename from geom/sql/Tests/functions/Tests/isRing.sql
rename to geom/sql/Tests/functions/Tests/ST_IsRing.sql
--- a/geom/sql/Tests/functions/Tests/isRing.sql
+++ b/geom/sql/Tests/functions/Tests/ST_IsRing.sql
@@ -2,3 +2,5 @@ SELECT ST_IsRing(st_linefromtext('LINEST
SELECT ST_IsRing(st_linefromtext('LINESTRING(0 0, 0 1, 1 0, 1 1, 0 0)'));
select ST_IsRing(ST_GeomFromText('POLYGON((0 0, 1 1, 1 2, 1 1, 0 0))'));
+SELECT geom AS "GEOMETRY" FROM geometries WHERE ST_IsRing(geom);
+
diff --git a/geom/sql/Tests/functions/Tests/isRing.stable.err
b/geom/sql/Tests/functions/Tests/isRing.stable.err
deleted file mode 100644
--- a/geom/sql/Tests/functions/Tests/isRing.stable.err
+++ /dev/null
@@ -1,36 +0,0 @@
-stderr of test 'isRing` in directory 'geom/sql/Tests/functions` itself:
-
-
-# 10:52:09 >
-# 10:52:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39851" "--set"
"mapi_usock=/var/tmp/mtest-4010/.s.monetdb.39851" "--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"
-# 10:52:09 >
-
-# 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 = 39851
-# cmdline opt mapi_usock = /var/tmp/mtest-4010/.s.monetdb.39851
-# 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
-
-# 10:52:10 >
-# 10:52:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-4010" "--port=39851"
-# 10:52:10 >
-
-
-# 10:52:10 >
-# 10:52:10 > "Done."
-# 10:52:10 >
-
diff --git a/geom/sql/Tests/functions/Tests/isRing.stable.out
b/geom/sql/Tests/functions/Tests/isRing.stable.out
deleted file mode 100644
--- a/geom/sql/Tests/functions/Tests/isRing.stable.out
+++ /dev/null
@@ -1,49 +0,0 @@
-stdout of test 'isRing` in directory 'geom/sql/Tests/functions` itself:
-
-
-# 10:52:09 >
-# 10:52:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39851" "--set"
"mapi_usock=/var/tmp/mtest-4010/.s.monetdb.39851" "--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"
-# 10:52:09 >
-
-# 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:39851/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-4010/.s.monetdb.39851
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-
-# 10:52:10 >
-# 10:52:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-4010" "--port=39851"
-# 10:52:10 >
-
-#SELECT ST_IsRing(st_linefromtext('LINESTRING(0 0, 0 1, 1 1, 1 0, 0 0)'));
-% .L # table_name
-% st_linefromtext_single_value # name
-% boolean # type
-% 5 # length
-[ true ]
-#SELECT ST_IsRing(st_linefromtext('LINESTRING(0 0, 0 1, 1 0, 1 1, 0 0)'));
-% .L # table_name
-% st_linefromtext_single_value # name
-% boolean # type
-% 5 # length
-[ false ]
-#select ST_IsRing(ST_GeomFromText('POLYGON((0 0, 1 1, 1 2, 1 1, 0 0))'));
-% .L # table_name
-% st_geomfromtext_single_value # name
-% boolean # type
-% 5 # length
-[ false ]
-
-# 10:52:10 >
-# 10:52:10 > "Done."
-# 10:52:10 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
