Changeset: ee1f41eec252 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee1f41eec252
Added Files:
geom/sql/Tests/pg_regression/Tests/boundary.sql
geom/sql/Tests/pg_regression/Tests/boundary.stable.err
geom/sql/Tests/pg_regression/Tests/boundary.stable.out
geom/sql/Tests/pg_regression/Tests/dump.sql
geom/sql/Tests/pg_regression/Tests/dumppoints.sql
geom/sql/Tests/pg_regression/Tests/dumppoints.stable.err
geom/sql/Tests/pg_regression/Tests/dumppoints.stable.out
Modified Files:
geom/sql/Tests/pg_regression/Tests/All
Branch: geo
Log Message:
pg_regress: dump, dumppoints, boundary
diffs (truncated from 373 to 300 lines):
diff --git a/geom/sql/Tests/pg_regression/Tests/All
b/geom/sql/Tests/pg_regression/Tests/All
--- a/geom/sql/Tests/pg_regression/Tests/All
+++ b/geom/sql/Tests/pg_regression/Tests/All
@@ -84,4 +84,12 @@ regress_ogc_cover
#regress_management #Functions not applicable in MOnetDB
+#dump #ST_Dump works only for multipolygons - Unknown Types: TRIANGLE, TIN
+
+dumppoints #Uknown Types: TRIANGLE, TIN, CURVEPOLYGON (queries for these types
commented out)
+
+boundary #Uknown Types: TRIANGLE (queries for these types commented out)
+
+
+
removeTmpFiles
diff --git a/geom/sql/Tests/pg_regression/Tests/boundary.sql
b/geom/sql/Tests/pg_regression/Tests/boundary.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pg_regression/Tests/boundary.sql
@@ -0,0 +1,5 @@
+SELECT ST_AsText(ST_Boundary(ST_GeomFromText('LINESTRING(1 1,0 0, -1 1)')));
+SELECT ST_AsText(ST_Boundary(ST_GeomFromText('POLYGON((1 1,0 0, -1 1, 1
1))')));
+SELECT ST_AsEWKT(ST_Boundary(ST_GeomFromText('POLYGON((1 1 1,0 0 1, -1 1 1, 1
1 1))')));
+SELECT ST_AsEWKT(ST_Boundary(ST_GeomFromText('MULTILINESTRING((1 1 1,0 0 0.5,
-1 1 1),(1 1 0.5,0 0 0.5, -1 1 0.5, 1 1 0.5) )')));
+--SELECT ST_AsText(ST_Boundary(ST_GeomFromText('TRIANGLE((1 1,0 0, -1 1, 1
1))')));
diff --git a/geom/sql/Tests/pg_regression/Tests/boundary.stable.err
b/geom/sql/Tests/pg_regression/Tests/boundary.stable.err
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pg_regression/Tests/boundary.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'boundary` in directory 'geom/sql/Tests/pg_regression` itself:
+
+
+# 15:14:23 >
+# 15:14:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36603" "--set"
"mapi_usock=/var/tmp/mtest-18298/.s.monetdb.36603" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_pg_regression"
"--set" "mal_listing=0"
+# 15:14:23 >
+
+# 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 = 36603
+# cmdline opt mapi_usock = /var/tmp/mtest-18298/.s.monetdb.36603
+# 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_pg_regression
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 15:14:23 >
+# 15:14:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-18298" "--port=36603"
+# 15:14:23 >
+
+
+# 15:14:23 >
+# 15:14:23 > "Done."
+# 15:14:23 >
+
diff --git a/geom/sql/Tests/pg_regression/Tests/boundary.stable.out
b/geom/sql/Tests/pg_regression/Tests/boundary.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pg_regression/Tests/boundary.stable.out
@@ -0,0 +1,55 @@
+stdout of test 'boundary` in directory 'geom/sql/Tests/pg_regression` itself:
+
+
+# 15:14:23 >
+# 15:14:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36603" "--set"
"mapi_usock=/var/tmp/mtest-18298/.s.monetdb.36603" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_pg_regression"
"--set" "mal_listing=0"
+# 15:14:23 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_geom_sql_Tests_pg_regression', 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:36603/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-18298/.s.monetdb.36603
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:14:23 >
+# 15:14:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-18298" "--port=36603"
+# 15:14:23 >
+
+#SELECT ST_AsText(ST_Boundary(ST_GeomFromText('LINESTRING(1 1,0 0, -1 1)')));
+% .L # table_name
+% st_geomfromtext_single_value # name
+% clob # type
+% 92 # length
+[ "\"MULTIPOINT (1.0000000000000000 1.0000000000000000, -1.0000000000000000
1.0000000000000000)\"" ]
+#SELECT ST_AsText(ST_Boundary(ST_GeomFromText('POLYGON((1 1,0 0, -1 1, 1
1))')));
+% .L # table_name
+% st_geomfromtext_single_value # name
+% clob # type
+% 170 # length
+[ "\"LINESTRING (1.0000000000000000 1.0000000000000000, 0.0000000000000000
0.0000000000000000, -1.0000000000000000 1.0000000000000000, 1.0000000000000000
1.0000000000000000)\"" ]
+#SELECT ST_AsEWKT(ST_Boundary(ST_GeomFromText('POLYGON((1 1 1,0 0 1, -1 1 1, 1
1 1))')));
+% .L # table_name
+% st_geomfromtext_single_value # name
+% clob # type
+% 255 # length
+[ "SRID:0;\"LINESTRING Z (1.0000000000000000 1.0000000000000000
1.0000000000000000, 0.0000000000000000 0.0000000000000000 1.0000000000000000,
-1.0000000000000000 1.0000000000000000 1.0000000000000000, 1.0000000000000000
1.0000000000000000 1.0000000000000000)\"" ]
+#SELECT ST_AsEWKT(ST_Boundary(ST_GeomFromText('MULTILINESTRING((1 1 1,0 0 0.5,
-1 1 1),(1 1 0.5,0 0 0.5, -1 1 0.5, 1 1 0.5) )')));
+% .L # table_name
+% st_geomfromtext_single_value # name
+% clob # type
+% 139 # length
+[ "SRID:0;\"MULTIPOINT Z (-1.0000000000000000 1.0000000000000000
1.0000000000000000, 1.0000000000000000 1.0000000000000000
0.7500000000000000)\"" ]
+
+# 15:14:23 >
+# 15:14:23 > "Done."
+# 15:14:23 >
+
diff --git a/geom/sql/Tests/pg_regression/Tests/dump.sql
b/geom/sql/Tests/pg_regression/Tests/dump.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pg_regression/Tests/dump.sql
@@ -0,0 +1,28 @@
+SELECT 't1', * FROM ST_Dump(ST_WKTToSQL('POINT (0 9)'));
+SELECT 't2', * FROM ST_Dump(ST_WKTToSQL('LINESTRING (0 0, 0 9, 9 9, 9 0, 0
0)'));
+SELECT 't3', * FROM ST_Dump(ST_WKTToSQL('POLYGON ((0 0, 0 9, 9 9, 9 0, 0
0))'));
+SELECT 't4', * FROM ST_Dump(ST_WKTToSQL('TRIANGLE ((0 0, 0 9, 9 0, 0 0))'));
+SELECT 't5', * FROM ST_Dump(ST_WKTToSQL('POLYGON ((0 0, 0 9, 9 9, 9 0, 0 0),
(1 1, 1 3, 3 2, 1 1), (7 6, 6 8, 8 8, 7 6))'));
+SELECT 't6', * FROM ST_Dump(ST_WKTToSQL('MULTIPOLYGON (((0 0, 0 3, 4 3, 4 0, 0
0)), ((2 4, 1 6, 4 5, 2 4), (7 6, 6 8, 8 8, 7 6)))'));
+SELECT 't7', * FROM ST_Dump(ST_WKTToSQL('POLYHEDRALSURFACE (((0 0 0, 0 0 1, 0
1 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 1 0 0, 0 0 0)))'));
+SELECT 't8', * FROM ST_Dump(ST_WKTToSQL('TIN (((0 0 0, 0 0 1, 0 1 0, 0 0 0)),
((0 0 0, 0 1 0, 1 1 0, 0 0 0)))'));
+SELECT 't9', *
+FROM ST_Dump(ST_WKTToSQL('
+ GEOMETRYCOLLECTION(
+ POINT(99 98),
+ LINESTRING(1 1, 3 3),
+ POLYGON((0 0, 0 1, 1 1, 0 0)),
+ POLYGON((0 0, 0 9, 9 9, 9 0, 0 0), (5 5, 5 6, 6 6, 5 5)),
+ MULTIPOLYGON(((0 0, 0 9, 9 9, 9 0, 0 0), (5 5, 5 6, 6 6, 5
5))))'));
+SELECT 't10', count(*) FROM ST_Dump(ST_WKTToSQL('GEOMETRYCOLLECTION EMPTY'));
+SELECT 't11', count(*)
+FROM ST_Dump(ST_WKTToSQL('
+ GEOMETRYCOLLECTION (
+ GEOMETRYCOLLECTION EMPTY,
+ POINT EMPTY,
+ LINESTRING EMPTY,
+ POLYGON EMPTY,
+ MULTIPOINT EMPTY,
+ MULTILINESTRING EMPTY,
+ MULTIPOLYGON EMPTY,
+ GEOMETRYCOLLECTION (GEOMETRYCOLLECTION EMPTY))'));
diff --git a/geom/sql/Tests/pg_regression/Tests/dumppoints.sql
b/geom/sql/Tests/pg_regression/Tests/dumppoints.sql
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pg_regression/Tests/dumppoints.sql
@@ -0,0 +1,19 @@
+SELECT * FROM ST_DumpPoints(ST_WKTToSQL('POINT (0 9)'));
+SELECT * FROM ST_DumpPoints(ST_WKTToSQL('LINESTRING (0 0, 0 9, 9 9, 9 0, 0
0)'));
+SELECT * FROM ST_DumpPoints(ST_WKTToSQL('POLYGON ((0 0, 0 9, 9 9, 9 0, 0
0))'));
+--SELECT * FROM ST_DumpPoints(ST_WKTToSQL('TRIANGLE ((0 0, 0 9, 9 0, 0 0))'));
+SELECT * FROM ST_DumpPoints(ST_WKTToSQL('POLYGON ((0 0, 0 9, 9 9, 9 0, 0 0),
(1 1, 1 3, 3 2, 1 1), (7 6, 6 8, 8 8, 7 6))'));
+SELECT * FROM ST_DumpPoints(ST_WKTToSQL('MULTIPOLYGON (((0 0, 0 3, 4 3, 4 0, 0
0)), ((2 4, 1 6, 4 5, 2 4), (7 6, 6 8, 8 8, 7 6)))'));
+SELECT * FROM ST_DumpPoints(ST_WKTToSQL('POLYHEDRALSURFACE (((0 0 0, 0 0 1, 0
1 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 1 0 0, 0 0 0)))'));
+--SELECT * FROM ST_DumpPoints(ST_WKTToSQL('TIN (((0 0 0, 0 0 1, 0 1 0, 0 0
0)), ((0 0 0, 0 1 0, 1 1 0, 0 0 0)))'));
+SELECT * FROM ST_DumpPoints(ST_WKTToSQL('GEOMETRYCOLLECTION(
+ POINT(99 98),
+ LINESTRING(1 1, 3 3),
+ POLYGON((0 0, 0 1, 1 1, 0 0)),
+ POLYGON((0 0, 0 9, 9 9, 9 0, 0 0), (5 5, 5 6, 6 6, 5 5)),
+ MULTIPOLYGON(((0 0, 0 9, 9 9, 9 0, 0 0), (5 5, 5 6, 6 6, 5 5))))'));
+--SELECT * FROM ST_DumpPoints(ST_GeomFromText('CURVEPOLYGON(
+-- CIRCULARSTRING
+-- (-71.0821 42.3036, -71.4821
42.3036, -71.7821 42.7036, -71.0821 42.7036, -71.0821 42.3036),
+-- (-71.1821 42.4036, -71.3821
42.6036, -71.3821 42.4036, -71.1821 42.4036))', 4326));
+--SELECT * FROM ST_DumpPoints(ST_WKTToSQL('CURVEPOLYGON(CIRCULARSTRING(0 0, 4
0, 4 4, 0 4, 0 0),(1 1, 3 3, 3 1, 1 1))'));
diff --git a/geom/sql/Tests/pg_regression/Tests/dumppoints.stable.err
b/geom/sql/Tests/pg_regression/Tests/dumppoints.stable.err
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pg_regression/Tests/dumppoints.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'dumppoints` in directory 'geom/sql/Tests/pg_regression` itself:
+
+
+# 15:11:12 >
+# 15:11:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39394" "--set"
"mapi_usock=/var/tmp/mtest-17878/.s.monetdb.39394" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_pg_regression"
"--set" "mal_listing=0"
+# 15:11:12 >
+
+# 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 = 39394
+# cmdline opt mapi_usock = /var/tmp/mtest-17878/.s.monetdb.39394
+# 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_pg_regression
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 15:11:12 >
+# 15:11:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17878" "--port=39394"
+# 15:11:12 >
+
+
+# 15:11:12 >
+# 15:11:12 > "Done."
+# 15:11:12 >
+
diff --git a/geom/sql/Tests/pg_regression/Tests/dumppoints.stable.out
b/geom/sql/Tests/pg_regression/Tests/dumppoints.stable.out
new file mode 100644
--- /dev/null
+++ b/geom/sql/Tests/pg_regression/Tests/dumppoints.stable.out
@@ -0,0 +1,143 @@
+stdout of test 'dumppoints` in directory 'geom/sql/Tests/pg_regression` itself:
+
+
+# 15:11:12 >
+# 15:11:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39394" "--set"
"mapi_usock=/var/tmp/mtest-17878/.s.monetdb.39394" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_pg_regression"
"--set" "mal_listing=0"
+# 15:11:12 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_geom_sql_Tests_pg_regression', 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:39394/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17878/.s.monetdb.39394
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:11:12 >
+# 15:11:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17878" "--port=39394"
+# 15:11:12 >
+
+#SELECT * FROM ST_DumpPoints(ST_WKTToSQL('POINT (0 9)'));
+% ., . # table_name
+% path, pointg # name
+% clob, geometry # type
+% 1, 0 # length
+[ "1", "POINT (0 9)" ]
+#SELECT * FROM ST_DumpPoints(ST_WKTToSQL('LINESTRING (0 0, 0 9, 9 9, 9 0, 0
0)'));
+% ., . # table_name
+% path, pointg # name
+% clob, geometry # type
+% 1, 0 # length
+[ "1", "POINT (0 0)" ]
+[ "2", "POINT (0 9)" ]
+[ "3", "POINT (9 9)" ]
+[ "4", "POINT (9 0)" ]
+[ "5", "POINT (0 0)" ]
+#SELECT * FROM ST_DumpPoints(ST_WKTToSQL('POLYGON ((0 0, 0 9, 9 9, 9 0, 0
0))'));
+% ., . # table_name
+% path, pointg # name
+% clob, geometry # type
+% 3, 0 # length
+[ "1,1", "POINT (0 0)" ]
+[ "1,2", "POINT (0 9)" ]
+[ "1,3", "POINT (9 9)" ]
+[ "1,4", "POINT (9 0)" ]
+[ "1,5", "POINT (0 0)" ]
+#SELECT * FROM ST_DumpPoints(ST_WKTToSQL('POLYGON ((0 0, 0 9, 9 9, 9 0, 0 0),
(1 1, 1 3, 3 2, 1 1), (7 6, 6 8, 8 8, 7 6))'));
+% ., . # table_name
+% path, pointg # name
+% clob, geometry # type
+% 3, 0 # length
+[ "1,1", "POINT (0 0)" ]
+[ "1,2", "POINT (0 9)" ]
+[ "1,3", "POINT (9 9)" ]
+[ "1,4", "POINT (9 0)" ]
+[ "1,5", "POINT (0 0)" ]
+[ "2,1", "POINT (1 1)" ]
+[ "2,2", "POINT (1 3)" ]
+[ "2,3", "POINT (3 2)" ]
+[ "2,4", "POINT (1 1)" ]
+[ "3,1", "POINT (7 6)" ]
+[ "3,2", "POINT (6 8)" ]
+[ "3,3", "POINT (8 8)" ]
+[ "3,4", "POINT (7 6)" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
