Changeset: 02e5870b944f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02e5870b944f Modified Files: sql/test/pg_regress/Tests/point.sql sql/test/pg_regress/Tests/point.stable.err sql/test/pg_regress/Tests/point.stable.out Branch: geo Log Message:
fixed sql/test/pg_regress/Tests/point for some reason it calls bat.append when <-> is used diffs (truncated from 494 to 300 lines): diff --git a/sql/test/pg_regress/Tests/point.sql b/sql/test/pg_regress/Tests/point.sql --- a/sql/test/pg_regress/Tests/point.sql +++ b/sql/test/pg_regress/Tests/point.sql @@ -3,38 +3,38 @@ -- -- DROP TABLE POINT_TBL; -CREATE TABLE POINT_TBL(f1 point); +CREATE TABLE POINT_TBL(f1 GEOMETRY(POINT)); --INSERT INTO POINT_TBL(f1) VALUES ('(0.0,0.0)'); -INSERT INTO POINT_TBL(f1) VALUES (point(0.0,0.0)); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(0.0,0.0)); --INSERT INTO POINT_TBL(f1) VALUES ('(-10.0,0.0)'); -INSERT INTO POINT_TBL(f1) VALUES (point(-10.0,0.0)); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(-10.0,0.0)); --INSERT INTO POINT_TBL(f1) VALUES ('(-3.0,4.0)'); -INSERT INTO POINT_TBL(f1) VALUES (point(-3.0,4.0)); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(-3.0,4.0)); --INSERT INTO POINT_TBL(f1) VALUES ('(5.1, 34.5)'); -INSERT INTO POINT_TBL(f1) VALUES (point(5.1, 34.5)); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(5.1, 34.5)); --INSERT INTO POINT_TBL(f1) VALUES ('(-5.0,-12.0)'); -INSERT INTO POINT_TBL(f1) VALUES (point(-5.0,-12.0)); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(-5.0,-12.0)); INSERT INTO POINT_TBL(f1) VALUES (null); -- bad format points INSERT INTO POINT_TBL(f1) VALUES (1.0,2.0); INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf'); -INSERT INTO POINT_TBL(f1) VALUES (point('asdfasdf')); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint('asdfasdf')); INSERT INTO POINT_TBL(f1) VALUES ('10.0,10.0'); -INSERT INTO POINT_TBL(f1) VALUES (point('10.0,10.0')); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint('10.0,10.0')); INSERT INTO POINT_TBL(f1) VALUES ('(10.0 10.0)'); -INSERT INTO POINT_TBL(f1) VALUES (point(10.0 10.0))); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(10.0 10.0))); INSERT INTO POINT_TBL(f1) VALUES ('(10,0.10,0'); -INSERT INTO POINT_TBL(f1) VALUES (point(10,0.10,0)); +INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(10,0.10,0)); SELECT '' AS six, POINT_TBL.* FROM POINT_TBL; @@ -43,33 +43,36 @@ CREATE VIEW POINT_TBL_VW AS SELECT f1, c SELECT * FROM POINT_TBL_VW; -- left of -SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE p.f1 << '(0.0, 0.0)'; +--SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE p.f1 << '(0.0, 0.0)'; +SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE p.f1 << ST_MakePoint(0.0, 0.0); -- right of -SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE '(0.0,0.0)' >> p.f1; +--SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE '(0.0,0.0)' >> p.f1; +SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE ST_MakePoint(0.0,0.0) >> p.f1; -- above -SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE '(0.0,0.0)' >^ p.f1; +--SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE '(0.0,0.0)' >^ p.f1; +SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE ST_MakePoint(0.0,0.0) >^ p.f1; -- below -SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 <^ '(0.0, 0.0)'; +--SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 <^ '(0.0, 0.0)'; +SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 <^ ST_MakePoint(0.0, 0.0); -- equal -SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 ~= '(5.1, 34.5)'; +--SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 ~= '(5.1, 34.5)'; +SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 ~= ST_MakePoint(5.1, 34.5); -- point in box -SELECT '' AS three, p.* FROM POINT_TBL_VW p - WHERE p.f1 @ mbr('linestring(0 0, 100 100)'); +--SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE p.f1 @ mbr('linestring(0 0, 100 100)'); +SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE p.f1 @ ST_WKTToSQL('linestring(0 0, 100 100)'); -SELECT '' AS three, p.* FROM POINT_TBL_VW p - WHERE not p.f1 @ box '(0,0,100,100)'; +--SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE not p.f1 @ box '(0,0,100,100)'; +SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE not p.f1 @ ST_WKTToSQL('linestring(0 0, 100 100)'); -SELECT '' AS two, p.* FROM POINT_TBL_VW p - WHERE p.f1 @ path '[(0,0),(-10,0),(-10,10)]'; +SELECT '' AS two, p.* FROM POINT_TBL_VW p WHERE p.f1 @ path '[(0,0),(-10,0),(-10,10)]'; -SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist - FROM POINT_TBL p - ORDER BY dist; +--SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist FROM POINT_TBL p ORDER BY dist; +SELECT '' AS six, p.f1, p.f1 <-> ST_MakePoint(0,0) AS dist FROM POINT_TBL p ORDER BY dist; /* SET geqo TO 'off'; */ @@ -77,9 +80,7 @@ SELECT '' AS thirtysix, p1.f1 AS point1, FROM POINT_TBL p1, POINT_TBL p2 ORDER BY dist, point1 using <<, point2 using <<; -SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2 - FROM POINT_TBL p1, POINT_TBL p2 - WHERE (p1.f1 <-> p2.f1) > 3; +SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2 FROM POINT_TBL p1, POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3; -- put distance result into output to allow sorting with GEQ optimizer - tgl 97/05/10 SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance @@ -96,3 +97,4 @@ SELECT '' AS three, p1.f1 AS point1, p2. /* RESET geqo; */ DROP VIEW POINT_TBL_VW; +DROP TABLE POINT_TBL; diff --git a/sql/test/pg_regress/Tests/point.stable.err b/sql/test/pg_regress/Tests/point.stable.err --- a/sql/test/pg_regress/Tests/point.stable.err +++ b/sql/test/pg_regress/Tests/point.stable.err @@ -1,11 +1,11 @@ stderr of test 'point` 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 > +# 18:36:56 > +# 18:36:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31786" "--set" "mapi_usock=/var/tmp/mtest-5174/.s.monetdb.31786" "--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" +# 18:36:56 > -# 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,106 +17,79 @@ stderr of test 'point` in directory 'sql # 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 = 31786 +# cmdline opt mapi_usock = /var/tmp/mtest-5174/.s.monetdb.31786 # 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 > +# 18:36:57 > +# 18:36:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-5174" "--port=31786" +# 18:36:57 > -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 QUERY = INSERT INTO POINT_TBL(f1) VALUES (1.0,2.0); ERROR = !INSERT INTO: number of values doesn't match number of columns of table 'point_tbl' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 QUERY = INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf'); ERROR = !ParseException: Unknown type: 'ASDFASDF' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = INSERT INTO POINT_TBL(f1) VALUES (point('asdfasdf')); -ERROR = !SELECT: no such unary operator 'point(char)' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint('asdfasdf')); +ERROR = !SELECT: no such unary operator 'st_makepoint(char)' +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 QUERY = INSERT INTO POINT_TBL(f1) VALUES ('10.0,10.0'); ERROR = !ParseException: Expected word but encountered number: '10' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = INSERT INTO POINT_TBL(f1) VALUES (point('10.0,10.0')); -ERROR = !SELECT: no such unary operator 'point(char)' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint('10.0,10.0')); +ERROR = !SELECT: no such unary operator 'st_makepoint(char)' +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 QUERY = INSERT INTO POINT_TBL(f1) VALUES ('(10.0 10.0)'); ERROR = !ParseException: Unknown type: '(' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = INSERT INTO POINT_TBL(f1) VALUES (point(10.0 10.0))); -ERROR = !syntax error, unexpected INTNUM, expecting ')' or ',' in: "insert into point_tbl(f1) values (point(10.0 10.0" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(10.0 10.0))); +ERROR = !syntax error, unexpected INTNUM, expecting ')' or ',' in: "insert into point_tbl(f1) values (st_makepoint(10.0 10.0" +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 QUERY = INSERT INTO POINT_TBL(f1) VALUES ('(10,0.10,0'); ERROR = !ParseException: Unknown type: '(' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = INSERT INTO POINT_TBL(f1) VALUES (point(10,0.10,0)); -ERROR = !SELECT: no such operator 'point' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE p.f1 << '(0.0, 0.0)'; -ERROR = !SELECT: no such binary operator 'left_shift(point,char)' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE '(0.0,0.0)' >> p.f1; -ERROR = !SELECT: no such binary operator 'right_shift(char,point)' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE '(0.0,0.0)' >^ p.f1; -ERROR = !syntax error, unexpected '^' in: "select '' as one, p.* from point_tbl_vw p where '(0.0,0.0)' >^" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 <^ '(0.0, 0.0)'; +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = INSERT INTO POINT_TBL(f1) VALUES (ST_MakePoint(10,0.10,0)); +ERROR = !column needs geometry(4, 0) and value is geometry(6, 0) +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE p.f1 << ST_MakePoint(0.0, 0.0); +ERROR = !SELECT: no such binary operator 'left_shift(geometry,geometry)' +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = SELECT '' AS three, p.* FROM POINT_TBL_VW p WHERE ST_MakePoint(0.0,0.0) >> p.f1; +ERROR = !SELECT: no such binary operator 'right_shift(geometry,geometry)' +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE ST_MakePoint(0.0,0.0) >^ p.f1; +ERROR = !syntax error, unexpected '^' in: "select '' as one, p.* from point_tbl_vw p where st_makepoint(0.0,0.0) >^" +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 <^ ST_MakePoint(0.0, 0.0); ERROR = !syntax error, unexpected '^' in: "select '' as one, p.* from point_tbl_vw p where p.f1 <^" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS one, p.* FROM POINT_TBL_VW p WHERE p.f1 ~= '(5.1, 34.5)'; -ERROR = !syntax error, unexpected '~', expecting SCOLON in: "select '' as one, p.* from point_tbl_vw p where p.f1 ~" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS three, p.* FROM POINT_TBL_VW p - WHERE p.f1 @ mbr('linestring(0 0, 100 100)'); -ERROR = !syntax error, unexpected AT, expecting SCOLON in: "select '' as three, p.* from point_tbl_vw p - ! where p.f1 @" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS three, p.* FROM POINT_TBL_VW p - WHERE not p.f1 @ box '(0,0,100,100)'; -ERROR = !syntax error, unexpected AT, expecting SCOLON in: "select '' as three, p.* from point_tbl_vw p - ! where not p.f1 @" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS two, p.* FROM POINT_TBL_VW p - WHERE p.f1 @ path '[(0,0),(-10,0),(-10,10)]'; -ERROR = !syntax error, unexpected AT, expecting SCOLON in: "select '' as two, p.* from point_tbl_vw p - ! where p.f1 @" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS six, p.f1, p.f1 <-> point '(0,0)' AS dist - FROM POINT_TBL p - ORDER BY dist; -ERROR = !syntax error, unexpected COMPARISON in: "select '' as six, p.f1, p.f1 <->" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 +QUERY = SELECT '' AS two, p.* FROM POINT_TBL_VW p WHERE p.f1 @ path '[(0,0),(-10,0),(-10,10)]'; +ERROR = !syntax error, unexpected STRING, expecting SCOLON in: "select '' as two, p.* from point_tbl_vw p where p.f1 @ path '[(0,0),(-10,0),(-10" +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 QUERY = SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS dist FROM POINT_TBL p1, POINT_TBL p2 ORDER BY dist, point1 using <<, point2 using <<; -ERROR = !syntax error, unexpected COMPARISON in: "select '' as thirtysix, p1.f1 as point1, p2.f1 as point2, p1.f1 <->" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = SELECT '' AS thirty, p1.f1 AS point1, p2.f1 AS point2 - FROM POINT_TBL p1, POINT_TBL p2 - WHERE (p1.f1 <-> p2.f1) > 3; -ERROR = !syntax error, unexpected COMPARISON in: "select '' as thirty, p1.f1 as point1, p2.f1 as point2 - ! from point_tbl p1, poin" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +ERROR = !syntax error, unexpected USING, expecting SCOLON in: "select '' as thirtysix, p1.f1 as point1, p2.f1 as point2, p1.f1 <-> p2.f1 as dis" +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 QUERY = SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance FROM POINT_TBL p1, POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 ORDER BY distance, point1 using <<, point2 using <<; -ERROR = !syntax error, unexpected COMPARISON in: "select '' as fifteen, p1.f1 as point1, p2.f1 as point2, (p1.f1 <->" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +ERROR = !syntax error, unexpected USING, expecting SCOLON in: "select '' as fifteen, p1.f1 as point1, p2.f1 as point2, (p1.f1 <-> p2.f1) as dis" +MAPI = (monetdb) /var/tmp/mtest-5174/.s.monetdb.31786 QUERY = SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance FROM POINT_TBL p1, POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1 ORDER BY distance; -ERROR = !syntax error, unexpected COMPARISON in: "select '' as three, p1.f1 as point1, p2.f1 as point2, (p1.f1 <->" +ERROR = !syntax error, unexpected '^' in: "select '' as three, p1.f1 as point1, p2.f1 as point2, (p1.f1 <-> p2.f1) as dista" +# 18:36:57 > +# 18:36:57 > "Done." +# 18:36:57 > -# 17:11:19 > -# 17:11:19 > "Done." -# 17:11:19 > - diff --git a/sql/test/pg_regress/Tests/point.stable.out b/sql/test/pg_regress/Tests/point.stable.out --- a/sql/test/pg_regress/Tests/point.stable.out +++ b/sql/test/pg_regress/Tests/point.stable.out @@ -1,50 +1,80 @@ stdout of test 'point` 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" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list