Changeset: e6620615a214 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6620615a214
Modified Files:
sql/test/pg_regress/Tests/box.sql
sql/test/pg_regress/Tests/box.stable.err
sql/test/pg_regress/Tests/box.stable.out
Branch: geo
Log Message:
updated sql/test/pg_regress/Tests/box
diffs (truncated from 634 to 300 lines):
diff --git a/sql/test/pg_regress/Tests/box.sql
b/sql/test/pg_regress/Tests/box.sql
--- a/sql/test/pg_regress/Tests/box.sql
+++ b/sql/test/pg_regress/Tests/box.sql
@@ -25,25 +25,33 @@
CREATE TABLE BOX_TBL (f1 mbr);
--INSERT INTO BOX_TBL (f1) VALUES ('(2.0,2.0,0.0,0.0)');
-INSERT INTO BOX_TBL (f1) VALUES ('linestring(2.0 2.0, 0.0 0.0)');
+--INSERT INTO BOX_TBL (f1) VALUES ('linestring(2.0 2.0, 0.0 0.0)');
+INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(2.0 2.0, 0.0 0.0)'));
--INSERT INTO BOX_TBL (f1) VALUES ('(1.0,1.0,3.0,3.0)');
-INSERT INTO BOX_TBL (f1) VALUES ('linestring(1.0 1.0, 3.0 3.0)');
+--INSERT INTO BOX_TBL (f1) VALUES ('linestring(1.0 1.0, 3.0 3.0)');
+INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(1.0 1.0, 3.0 3.0)'));
-- degenerate cases where the box is a line or a point
-- note that lines and points boxes all have zero area
--INSERT INTO BOX_TBL (f1) VALUES ('(2.5, 2.5, 2.5,3.5)');
-INSERT INTO BOX_TBL (f1) VALUES ('linestring(2.5 2.5, 2.5 3.5)');
+--INSERT INTO BOX_TBL (f1) VALUES ('linestring(2.5 2.5, 2.5 3.5)');
+INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(2.5 2.5, 2.5 3.5)'));
--INSERT INTO BOX_TBL (f1) VALUES ('(3.0, 3.0,3.0,3.0)');
-INSERT INTO BOX_TBL (f1) VALUES ('linestring(3.0 3.0, 3.0 3.0)');
+--INSERT INTO BOX_TBL (f1) VALUES ('linestring(3.0 3.0, 3.0 3.0)');
+INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(3.0 3.0, 3.0 3.0)'));
-- badly formatted box inputs
-INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)');
-INSERT INTO BOX_TBL (f1) VALUES ('linestring(2.3, 4.5)');
+--INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)');
+INSERT INTO BOX_TBL (f1) VALUES (MBR('(2.3, 4.5)'));
+--INSERT INTO BOX_TBL (f1) VALUES ('linestring(2.3, 4.5)');
+INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(2.3, 4.5)'));
-INSERT INTO BOX_TBL (f1) VALUES ('asdfasdf(ad');
-INSERT INTO BOX_TBL (f1) VALUES ('linestring(asdfasdf(ad)');
+--INSERT INTO BOX_TBL (f1) VALUES ('asdfasdf(ad');
+INSERT INTO BOX_TBL (f1) VALUES (MBR('asdfasdf(ad'));
+--INSERT INTO BOX_TBL (f1) VALUES ('linestring(asdfasdf(ad)');
+INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(asdfasdf(ad)'));
SELECT '' AS four, BOX_TBL.* FROM BOX_TBL;
@@ -52,123 +60,69 @@ SELECT '' AS four, b.f1, cast(f1 as varc
CREATE VIEW BOX_TBL_VW AS SELECT f1, cast(f1 as varchar(44)) as txt FROM
BOX_TBL;
SELECT * FROM BOX_TBL_VW;
---
-SELECT '' AS four, b.*, area(b.f1) as barea
- FROM BOX_TBL_VW b;
--- overlap
-SELECT '' AS three, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 && box '(2.5,2.5,1.0,1.0)';
-SELECT '' AS three, b.f1
- FROM BOX_TBL_VW b
- WHERE overlaps(b.f1, mbr('linestring(2.5 2.5, 1.0 1.0)'));
+--Area does not work on MBR
+--SELECT '' AS four, b.*, ST_Area(b.f1) as barea FROM BOX_TBL_VW b;
+
+-- overlap
+SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE b.f1 && mbr('linestring(2.5
2.5, 1.0 1.0)');
+SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE ST_Overlaps(b.f1,
mbr('linestring(2.5 2.5, 1.0 1.0)'));
-- left-or-overlap (x only)
-SELECT '' AS two, b1.*
- FROM BOX_TBL_VW b1
- WHERE b1.f1 &< box '(2.0,2.0,2.5,2.5)';
-SELECT '' AS two, b1.*
- FROM BOX_TBL_VW b1
- WHERE b1.f1 &< mbr('linestring(2.0 2.0, 2.5 2.5)');
+--SELECT '' AS two, b1.* FROM BOX_TBL_VW b1 WHERE b1.f1 &< box
'(2.0,2.0,2.5,2.5)';
+SELECT '' AS two, b1.* FROM BOX_TBL_VW b1 WHERE b1.f1 &< mbr('linestring(2.0
2.0, 2.5 2.5)');
-- right-or-overlap (x only)
-SELECT '' AS two, b1.*
- FROM BOX_TBL_VW b1
- WHERE b1.f1 &> box '(2.0,2.0,2.5,2.5)';
-SELECT '' AS two, b1.*
- FROM BOX_TBL_VW b1
- WHERE b1.f1 &> mbr('linestring(2.0 2.0, 2.5 2.5)');
+--SELECT '' AS two, b1.* FROM BOX_TBL_VW b1 WHERE b1.f1 &> box
'(2.0,2.0,2.5,2.5)';
+SELECT '' AS two, b1.* FROM BOX_TBL_VW b1 WHERE b1.f1 &> mbr('linestring(2.0
2.0, 2.5 2.5)');
-- left of
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 << box '(3.0,3.0,5.0,5.0)';
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 << mbr('linestring(3.0 3.0, 5.0 5.0)');
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 << box
'(3.0,3.0,5.0,5.0)';
+SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 << mbr('linestring(3.0
3.0, 5.0 5.0)');
-- area <=
-SELECT '' AS four, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 <= box '(3.0,3.0,5.0,5.0)';
-SELECT '' AS four, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 <= mbr('linestring(3.0 3.0, 5.0 5.0)');
+--SELECT '' AS four, b.f1 FROM BOX_TBL_VW b WHERE b.f1 <= box
'(3.0,3.0,5.0,5.0)';
+--SELECT '' AS four, b.f1 FROM BOX_TBL_VW b WHERE b.f1 <= mbr('linestring(3.0
3.0, 5.0 5.0)');
-- area <
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 < box '(3.0,3.0,5.0,5.0)';
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 < mbr('linestring(3.0 3.0, 5.0 5.0)');
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 < box
'(3.0,3.0,5.0,5.0)';
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 < mbr('linestring(3.0
3.0, 5.0 5.0)');
-- area =
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 = box '(3.0,3.0,5.0,5.0)';
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 = mbr('linestring(3.0 3.0, 5.0 5.0)');
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 = box
'(3.0,3.0,5.0,5.0)';
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 = mbr('linestring(3.0
3.0, 5.0 5.0)');
--- area >
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b -- zero area
- WHERE b.f1 > box '(3.5,3.0,4.5,3.0)';
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b -- zero area
- WHERE b.f1 > mbr('linestring(3.5 3.0, 4.5 3.0)');
+-- area > (zero area)
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 > box
'(3.5,3.0,4.5,3.0)';
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 > mbr('linestring(3.5
3.0, 4.5 3.0)');
--- area >=
-SELECT '' AS four, b.f1
- FROM BOX_TBL_VW b -- zero area
- WHERE b.f1 >= box '(3.5,3.0,4.5,3.0)';
-SELECT '' AS four, b.f1
- FROM BOX_TBL_VW b -- zero area
- WHERE b.f1 >= mbr('linestring(3.5 3.0, 4.5 3.0)');
+-- area >= (zero area)
+--SELECT '' AS four, b.f1 FROM BOX_TBL_VW WHERE b.f1 >= box
'(3.5,3.0,4.5,3.0)';
+--SELECT '' AS four, b.f1 FROM BOX_TBL_VW WHERE b.f1 >= mbr('linestring(3.5
3.0, 4.5 3.0)');
-- right of
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b
- WHERE box '(3.0,3.0,5.0,5.0)' >> b.f1;
-SELECT '' AS two, b.f1
- FROM BOX_TBL_VW b
- WHERE mbr('linestring(3.0 3.0, 5.0 5.0)') >> b.f1;
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b0 WHERE box '(3.0,3.0,5.0,5.0)' >>
b.f1;
+--SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE mbr('linestring(3.0 3.0, 5.0
5.0)') >> b.f1;
-- contained in
-SELECT '' AS three, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 @ box '(0,0,3,3)';
-SELECT '' AS three, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 @ mbr('linestring(0 0, 3 3)');
+--SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE b.f1 @ box '(0,0,3,3)';
+SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE b.f1 @ mbr('linestring(0 0, 3
3)');
-- contains
-SELECT '' AS three, b.f1
- FROM BOX_TBL_VW b
- WHERE box '(0,0,3,3)' ~ b.f1;
-SELECT '' AS three, b.f1
- FROM BOX_TBL_VW b
- WHERE mbr('linestring(0 0, 3 3)') ~ b.f1;
+--SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE box '(0,0,3,3)' ~ b.f1;
+SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE mbr('linestring(0 0, 3 3)') ~
b.f1;
-- box equality
-SELECT '' AS one, b.f1
- FROM BOX_TBL_VW b
- WHERE box '(1,1,3,3)' ~= b.f1;
-SELECT '' AS one, b.f1
- FROM BOX_TBL_VW b
- WHERE mbr('linestring(1 1, 3 3)') ~= b.f1;
+--SELECT '' AS one, b.f1 FROM BOX_TBL_VW b WHERE box '(1,1,3,3)' ~= b.f1;
+SELECT '' AS one, b.f1 FROM BOX_TBL_VW b WHERE mbr('linestring(1 1, 3 3)') ~=
b.f1;
-- center of box, left unary operator
-SELECT '' AS four, @@(b1.f1) AS p
- FROM BOX_TBL_VW b1;
+SELECT '' AS four, @@(b1.f1) AS p FROM BOX_TBL_VW b1;
-- wholly-contained
-SELECT '' AS one, b1.*, b2.*
- FROM BOX_TBL_VW b1, BOX_TBL_VW b2
- WHERE b1.f1 ~ b2.f1 and not b1.f1 ~= b2.f1;
+SELECT '' AS one, b1.*, b2.* FROM BOX_TBL_VW b1, BOX_TBL_VW b2 WHERE b1.f1 ~
b2.f1 and not b1.f1 ~= b2.f1;
SELECT '' AS four, height(f1), width(f1) FROM BOX_TBL_VW;
DROP VIEW BOX_TBL_VW;
+DROP TABLE BOX_TBL;
diff --git a/sql/test/pg_regress/Tests/box.stable.err
b/sql/test/pg_regress/Tests/box.stable.err
--- a/sql/test/pg_regress/Tests/box.stable.err
+++ b/sql/test/pg_regress/Tests/box.stable.err
@@ -1,11 +1,11 @@
stderr of test 'box` in directory 'sql/test/pg_regress` itself:
-# 17:11:18 >
-# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38959" "--set"
"mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set"
"mal_listing=0"
-# 17:11:18 >
+# 19:04:23 >
+# 19:04:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31707" "--set"
"mapi_usock=/var/tmp/mtest-6949/.s.monetdb.31707" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_sql_test_pg_regress"
"--set" "mal_listing=0"
+# 19:04:23 >
-# builtin opt gdk_dbpath = /ufs/dinther/INSTALL/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/export/scratch2/alvanaki/INSTALL/MonetDB-public/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,195 +17,41 @@ stderr of test 'box` in directory 'sql/t
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 38959
-# cmdline opt mapi_usock = /var/tmp/mtest-1142/.s.monetdb.38959
+# cmdline opt mapi_port = 31707
+# cmdline opt mapi_usock = /var/tmp/mtest-6949/.s.monetdb.31707
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress
+# cmdline opt gdk_dbpath =
/export/scratch2/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_sql_test_pg_regress
# cmdline opt mal_listing = 0
# cmdline opt gdk_debug = 536870922
-# 17:11:19 >
-# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
-# 17:11:19 >
+# 19:04:23 >
+# 19:04:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6949" "--port=31707"
+# 19:04:23 >
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)');
+MAPI = (monetdb) /var/tmp/mtest-6949/.s.monetdb.31707
+QUERY = INSERT INTO BOX_TBL (f1) VALUES (MBR('(2.3, 4.5)'));
ERROR = !ParseException: Unknown type: '('
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = INSERT INTO BOX_TBL (f1) VALUES ('linestring(2.3, 4.5)');
+MAPI = (monetdb) /var/tmp/mtest-6949/.s.monetdb.31707
+QUERY = INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(2.3, 4.5)'));
ERROR = !ParseException: Expected number but encountered ','
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = INSERT INTO BOX_TBL (f1) VALUES ('asdfasdf(ad');
+MAPI = (monetdb) /var/tmp/mtest-6949/.s.monetdb.31707
+QUERY = INSERT INTO BOX_TBL (f1) VALUES (MBR('asdfasdf(ad'));
ERROR = !ParseException: Unknown type: 'ASDFASDF'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = INSERT INTO BOX_TBL (f1) VALUES ('linestring(asdfasdf(ad)');
+MAPI = (monetdb) /var/tmp/mtest-6949/.s.monetdb.31707
+QUERY = INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(asdfasdf(ad)'));
ERROR = !ParseException: Expected number but encountered word: 'asdfasdf'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT '' AS four, b.*, area(b.f1) as barea
- FROM BOX_TBL_VW b;
-ERROR = !types mbr(0,0) and geometry(0,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT '' AS three, b.f1
- FROM BOX_TBL_VW b
- WHERE b.f1 && box '(2.5,2.5,1.0,1.0)';
-ERROR = !syntax error, unexpected '&' in: "select '' as three, b.f1
- ! from box_tbl_vw b
- ! where b.f1 &&"
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT '' AS three, b.f1
- FROM BOX_TBL_VW b
- WHERE overlaps(b.f1, mbr('linestring(2.5 2.5, 1.0 1.0)'));
-ERROR = !SELECT: no such binary operator 'overlaps(mbr,mbr)'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT '' AS two, b1.*
- FROM BOX_TBL_VW b1
- WHERE b1.f1 &< box '(2.0,2.0,2.5,2.5)';
-ERROR = !syntax error, unexpected COMPARISON in: "select '' as two, b1.*
- ! from box_tbl_vw b1
- ! where b1.f1 &<"
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT '' AS two, b1.*
- FROM BOX_TBL_VW b1
- WHERE b1.f1 &< mbr('linestring(2.0 2.0, 2.5 2.5)');
-ERROR = !syntax error, unexpected COMPARISON in: "select '' as two, b1.*
- ! from box_tbl_vw b1
- ! where b1.f1 &<"
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT '' AS two, b1.*
- FROM BOX_TBL_VW b1
- WHERE b1.f1 &> box '(2.0,2.0,2.5,2.5)';
-ERROR = !syntax error, unexpected COMPARISON in: "select '' as two, b1.*
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
