Changeset: 33b4fdcfb329 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33b4fdcfb329
Added Files:
geom/sql/Tests/coveredBy.sql
geom/sql/Tests/coveredBy.stable.err
geom/sql/Tests/coveredBy.stable.out
geom/sql/Tests/covers.sql
geom/sql/Tests/covers.stable.err
geom/sql/Tests/covers.stable.out
Modified Files:
geom/sql/40_geom.sql
geom/sql/Tests/All
Branch: geo
Log Message:
mTests for covers and coveredBy + typo fix
diffs (253 lines):
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
@@ -4274,7 +4274,7 @@ CREATE FUNCTION ST_Relate(geom1 Geometry
--CREATE FUNCTION ST_RelateMatch RETURNS EXTERNAL NAME
--CREATE FUNCTION ST_ShortestLine RETURNS EXTERNAL NAME
CREATE FUNCTION ST_Touches(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Touches";
-CREATE FUNCTION ST_Within(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Withis";
+CREATE FUNCTION ST_Within(geom1 Geometry, geom2 Geometry) RETURNS boolean
EXTERNAL NAME geom."Within";
-------------------------------------------------------------------------
------------------------- Geometry Processing ---------------------------
diff --git a/geom/sql/Tests/All b/geom/sql/Tests/All
--- a/geom/sql/Tests/All
+++ b/geom/sql/Tests/All
@@ -37,3 +37,5 @@ mbr_overlap_or_above
mbr_above
mbr_overlap_or_below
mbr_distance
+covers
+coveredBy
diff --git a/geom/sql/Tests/coveredBy.sql b/geom/sql/Tests/coveredBy.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/coveredBy.sql
@@ -0,0 +1,1 @@
+SELECT ST_CoveredBy(smallc,smallc) AS small_coveredBy_small,
ST_CoveredBy(smallc, bigc) AS small_coveredby_big, ST_CoveredBy(bigc, smallc)
as big_coveredby_small, ST_CoveredBy(ST_ExteriorRing(bigc), bigc) as
exterior_coveredby_big, ST_Within(ST_ExteriorRing(bigc),bigc) as
exterior_within_big FROM (SELECT ST_Buffer(ST_GeomFromText('POINT(1 2)'), 10)
As smallc, ST_Buffer(ST_GeomFromText('POINT(1 2)'), 20) As bigc) As foo;
diff --git a/geom/sql/Tests/coveredBy.stable.err
b/geom/sql/Tests/coveredBy.stable.err
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/coveredBy.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'coveredBy` in directory 'geom/sql` itself:
+
+
+# 10:38:14 >
+# 10:38:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32328" "--set"
"mapi_usock=/var/tmp/mtest-17864/.s.monetdb.32328" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0"
+# 10:38:14 >
+
+# 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 = 32328
+# cmdline opt mapi_usock = /var/tmp/mtest-17864/.s.monetdb.32328
+# 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
+
+# 10:38:15 >
+# 10:38:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17864" "--port=32328"
+# 10:38:15 >
+
+
+# 10:38:15 >
+# 10:38:15 > "Done."
+# 10:38:15 >
+
diff --git a/geom/sql/Tests/coveredBy.stable.out
b/geom/sql/Tests/coveredBy.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/coveredBy.stable.out
@@ -0,0 +1,64 @@
+stdout of test 'coveredBy` in directory 'geom/sql` itself:
+
+
+# 10:38:14 >
+# 10:38:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32328" "--set"
"mapi_usock=/var/tmp/mtest-17864/.s.monetdb.32328" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0"
+# 10:38:14 >
+
+# 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:32328/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17864/.s.monetdb.32328
+# 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
+
+# 10:38:15 >
+# 10:38:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17864" "--port=32328"
+# 10:38:15 >
+
+#SELECT ST_CoveredBy(smallc,smallc) AS small_coveredBy_small,
ST_CoveredBy(smallc, bigc) AS small_coveredby_big, ST_CoveredBy(bigc, smallc)
as big_coveredby_small, ST_CoveredBy(ST_ExteriorRing(bigc), bigc) as
exterior_coveredby_big, ST_Within(ST_ExteriorRing(bigc),bigc) as
exterior_within_big FROM (SELECT ST_Buffer(ST_GeomFromText('POINT(1 2)'), 10)
As smallc, ST_Buffer(ST_GeomFromText('POINT(1 2)'), 20) As bigc) As foo;
+% .L, .L, .L, .L, .L # table_name
+% small_coveredby_small, small_coveredby_big, big_coveredby_small,
exterior_coveredby_big, exterior_within_big # name
+% boolean, boolean, boolean, boolean, boolean # type
+% 5, 5, 5, 5, 5 # length
+[ true, true, false, true, false ]
+
+# 10:38:15 >
+# 10:38:15 > "Done."
+# 10:38:15 >
+
diff --git a/geom/sql/Tests/covers.sql b/geom/sql/Tests/covers.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/covers.sql
@@ -0,0 +1,1 @@
+SELECT ST_Covers(smallc,smallc) As small_covers_small, ST_Covers(smallc, bigc)
As small_covers_big, ST_Covers(bigc, ST_ExteriorRing(bigc)) As
big_covers_exterior, ST_Contains(bigc, ST_ExteriorRing(bigc)) As
big_contains_exterior FROM (SELECT ST_Buffer(ST_GeomFromText('POINT(1 2)'), 10)
As smallc, ST_Buffer(ST_GeomFromText('POINT(1 2)'), 20) As bigc) As foo;
diff --git a/geom/sql/Tests/covers.stable.err b/geom/sql/Tests/covers.stable.err
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/covers.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'covers` in directory 'geom/sql` itself:
+
+
+# 10:37:44 >
+# 10:37:44 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32861" "--set"
"mapi_usock=/var/tmp/mtest-17780/.s.monetdb.32861" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0"
+# 10:37:44 >
+
+# 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 = 32861
+# cmdline opt mapi_usock = /var/tmp/mtest-17780/.s.monetdb.32861
+# 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
+
+# 10:37:44 >
+# 10:37:44 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17780" "--port=32861"
+# 10:37:44 >
+
+
+# 10:37:45 >
+# 10:37:45 > "Done."
+# 10:37:45 >
+
diff --git a/geom/sql/Tests/covers.stable.out b/geom/sql/Tests/covers.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/covers.stable.out
@@ -0,0 +1,64 @@
+stdout of test 'covers` in directory 'geom/sql` itself:
+
+
+# 10:37:44 >
+# 10:37:44 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32861" "--set"
"mapi_usock=/var/tmp/mtest-17780/.s.monetdb.32861" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/monetdb/var/MonetDB/mTests_geom_sql"
"--set" "mal_listing=0"
+# 10:37:44 >
+
+# 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:32861/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17780/.s.monetdb.32861
+# 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
+
+# 10:37:44 >
+# 10:37:44 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17780" "--port=32861"
+# 10:37:44 >
+
+#SELECT ST_Covers(smallc,smallc) As small_covers_small, ST_Covers(smallc,
bigc) As small_covers_big, ST_Covers(bigc, ST_ExteriorRing(bigc)) As
big_covers_exterior, ST_Contains(bigc, ST_ExteriorRing(bigc)) As
big_contains_exterior FROM (SELECT ST_Buffer(ST_GeomFromText('POINT(1 2)'), 10)
As smallc, ST_Buffer(ST_GeomFromText('POINT(1 2)'), 20) As bigc) As foo;
+% .L, .L, .L, .L # table_name
+% small_covers_small, small_covers_big, big_covers_exterior,
big_contains_exterior # name
+% boolean, boolean, boolean, boolean # type
+% 5, 5, 5, 5 # length
+[ true, false, true, false ]
+
+# 10:37:45 >
+# 10:37:45 > "Done."
+# 10:37:45 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
