Changeset: c1fc0f734a0d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c1fc0f734a0d
Modified Files:
sql/benchmarks/tpcds/Tests/40.stable.out
sql/benchmarks/tpcds/Tests/40.stable.out.int128
sql/test/pg_regress/Tests/polygon.stable.out
Branch: Oct2020
Log Message:
Merge with Jun2020 branch.
diffs (158 lines):
diff --git a/geom/sql/conformance/Tests/T48.stable.out
b/geom/sql/conformance/Tests/T48.stable.out
--- a/geom/sql/conformance/Tests/T48.stable.out
+++ b/geom/sql/conformance/Tests/T48.stable.out
@@ -29,7 +29,7 @@ stdout of test 'T48` in directory 'geom/
% %1 # name
% clob # type
% 45 # length
-[ "POLYGON ((62 48, 84 48, 84 42, 56 34, 62 48))" ]
+[ "POLYGON ((84 48, 84 42, 56 34, 62 48, 84 48))" ]
# 15:15:54 >
# 15:15:54 > "Done."
diff --git a/geom/sql/conformance/Tests/T49.stable.out
b/geom/sql/conformance/Tests/T49.stable.out
--- a/geom/sql/conformance/Tests/T49.stable.out
+++ b/geom/sql/conformance/Tests/T49.stable.out
@@ -29,7 +29,7 @@ stdout of test 'T49` in directory 'geom/
% %1 # name
% clob # type
% 43 # length
-[ "POLYGON ((52 18, 66 23, 73 9, 48 6, 52 18))" ]
+[ "POLYGON ((66 23, 73 9, 48 6, 52 18, 66 23))" ]
# 15:15:54 >
# 15:15:54 > "Done."
diff --git a/geom/sql/functions/Tests/ST_NumPoints.stable.err
b/geom/sql/functions/Tests/ST_NumPoints.stable.err
--- a/geom/sql/functions/Tests/ST_NumPoints.stable.err
+++ b/geom/sql/functions/Tests/ST_NumPoints.stable.err
@@ -31,7 +31,7 @@ stderr of test 'ST_NumPoints` in directo
MAPI = (monetdb) /var/tmp/mtest-8056/.s.monetdb.39838
QUERY = SELECT ST_NumPoints(ST_GeomFromText('polygon((77.29 29.07,77.42
29.26,77.27 29.31,77.29 29.07))'));
-ERROR = !Geometry "POLYGON ((77.29000000000001 29.07, 77.42 29.26, 77.27
29.31, 77.29000000000001 29.07))" not a LineString
+ERROR = !Geometry "POLYGON ((77.29 29.07, 77.42 29.26, 77.27 29.31, 77.29
29.07))" not a LineString
CODE = 38000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = select st_numPoints(st_mpointFromText('multipoint(1 2 3, 4 5 6, 7 8 9,
10 11 12)'));
diff --git a/geom/sql/functions/Tests/ST_NumPoints.stable.out
b/geom/sql/functions/Tests/ST_NumPoints.stable.out
--- a/geom/sql/functions/Tests/ST_NumPoints.stable.out
+++ b/geom/sql/functions/Tests/ST_NumPoints.stable.out
@@ -25,8 +25,8 @@ stdout of test 'ST_NumPoints` in directo
# 09:53:35 >
#SELECT ST_NumPoints(ST_GeomFromText('LINESTRING(77.29 29.07,77.42 29.26,77.27
29.31,77.29 29.07)'));
-% . # table_name
-% %1 # name
+% .%2 # table_name
+% %2 # name
% int # type
% 1 # length
[ 4 ]
diff --git a/geom/sql/pg_regression/Tests/dump.stable.out
b/geom/sql/pg_regression/Tests/dump.stable.out
--- a/geom/sql/pg_regression/Tests/dump.stable.out
+++ b/geom/sql/pg_regression/Tests/dump.stable.out
@@ -98,14 +98,14 @@ stdout of test 'dump` in directory 'geom
% %4, id, polygonwkb # name
% char, clob, geometry # type
% 3, 3, 0 # length
-[ "t11", "1", "GEOMETRYCOLLECTION EMPTY" ]
+[ "t11", "1", "GEOMETRYCOLLECTION (GEOMETRYCOLLECTION EMPTY,
LINESTRING EMPTY, POLYGON EMPTY, MULTIPOINT EMPTY, MULTILINESTRING EMPTY,
MULTIPOLYGON EMPTY, GEOMETRYCOLLECTION (GEOMETRYCOLLECTION EMPTY))" ]
[ "t11", "1", "GEOMETRYCOLLECTION EMPTY" ]
[ "t11", "2", "LINESTRING EMPTY" ]
[ "t11", "3", "POLYGON EMPTY" ]
[ "t11", "4", "MULTIPOINT EMPTY" ]
[ "t11", "5", "MULTILINESTRING EMPTY" ]
[ "t11", "6", "MULTIPOLYGON EMPTY" ]
-[ "t11", "7", "GEOMETRYCOLLECTION EMPTY" ]
+[ "t11", "7", "GEOMETRYCOLLECTION (GEOMETRYCOLLECTION EMPTY)" ]
[ "t11", "7,1", "GEOMETRYCOLLECTION EMPTY" ]
# 12:29:09 >
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.stable.err
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.stable.err
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.stable.err
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.stable.err
@@ -38,7 +38,7 @@ ERROR = !Could not parse Python code
! 1. def pyfun(i,j,_columns,_column_types,_conn):
!> 2. return(i*j
! 3.
- !unexpected EOF while parsing (<string>, line 2)
+ !'(' was never closed (<string>, line 2)
CODE = PY000
MAPI = (monetdb) /var/tmp/mtest-13372/.s.monetdb.36607
QUERY = SELECT AVG(pyapi10_indentation_error(i,j)) FROM
pyapi10_random_table_nulls(5000);
diff --git
a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
--- a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
+++ b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out
@@ -51,10 +51,10 @@ stdout of test 'python-microseconds.Bug-
# 17:15:02 >
[(datetime.datetime(2014, 4, 24, 17, 12, 12, 415000),)]
-[(datetime.datetime(2014, 4, 24, 19, 12, 12, 415000),)]
+[(datetime.datetime(2014, 4, 24, 21, 12, 12, 415000,
tzinfo=datetime.timezone(datetime.timedelta(seconds=7200))),)]
[(datetime.date(2014, 4, 24),)]
[(datetime.time(17, 12, 12),)]
-[(datetime.time(19, 12, 12),)]
+[(datetime.time(21, 12, 12,
tzinfo=datetime.timezone(datetime.timedelta(seconds=7200))),)]
# 17:15:02 >
# 17:15:02 > "Done."
diff --git a/sql/test/pg_regress/Tests/polygon.stable.err
b/sql/test/pg_regress/Tests/polygon.stable.err
--- a/sql/test/pg_regress/Tests/polygon.stable.err
+++ b/sql/test/pg_regress/Tests/polygon.stable.err
@@ -33,11 +33,7 @@ MAPI = (monetdb) /var/tmp/mtest-30019/.
QUERY = INSERT INTO POLYGON_TBL(f1) VALUES ('POLYGON((0.0 0.0, 0.0 0.0))');
ERROR = !Geos operation GEOSWKTReader_read failed
CODE = 38000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = INSERT INTO POLYGON_TBL(f1) VALUES ('POLYGON((0.0 1.0, 1.0 1.0, 0.0
1.0))');
-ERROR = !Geos operation GEOSWKTReader_read failed
-CODE = 38000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
+MAPI = (monetdb) /var/tmp/mtest-715714/.s.monetdb.37559
QUERY = INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0 0.0');
ERROR = !Geos operation GEOSWKTReader_read failed
CODE = 38000
diff --git a/sql/test/pg_regress/Tests/polygon.stable.out
b/sql/test/pg_regress/Tests/polygon.stable.out
--- a/sql/test/pg_regress/Tests/polygon.stable.out
+++ b/sql/test/pg_regress/Tests/polygon.stable.out
@@ -34,6 +34,8 @@ stdout of test 'polygon` in directory 's
% geometry # type
% 0 # length
[ "POLYGON ((3 1, 3 3, 1 0, 3 1))" ]
+#INSERT INTO POLYGON_TBL(f1) VALUES ('POLYGON((0.0 1.0, 1.0 1.0, 0.0 1.0))');
+[ 1 ]
#INSERT INTO POLYGON_TBL(f1) VALUES ('POLYGON((0.0 1.0, 0.0 1.0, 0.0 1.0, 0.0
1.0))');
[ 1 ]
#INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)');
@@ -45,6 +47,7 @@ stdout of test 'polygon` in directory 's
% 0, 0 # length
[ "", "POLYGON ((2 0, 2 4, 0 0, 2 0))" ]
[ "", "POLYGON ((3 1, 3 3, 1 0, 3 1))" ]
+[ "", "POLYGON ((0 1, 1 1, 0 1))" ]
[ "", "POLYGON ((0 1, 0 1, 0 1, 0 1))" ]
[ "", "POLYGON ((0 2, 0 1, 0 1, 0 1, 0 2))" ]
#CREATE VIEW POLYGON_TBL_VW AS SELECT f1, cast(f1 as varchar(244)) as txt FROM
POLYGON_TBL;
@@ -55,6 +58,7 @@ stdout of test 'polygon` in directory 's
% 0, 35 # length
[ "POLYGON ((2 0, 2 4, 0 0, 2 0))", "POLYGON ((2 0, 2 4, 0 0, 2 0))"
]
[ "POLYGON ((3 1, 3 3, 1 0, 3 1))", "POLYGON ((3 1, 3 3, 1 0, 3 1))"
]
+[ "POLYGON ((0 1, 1 1, 0 1))", "POLYGON ((0 1, 1 1, 0 1))" ]
[ "POLYGON ((0 1, 0 1, 0 1, 0 1))", "POLYGON ((0 1, 0 1, 0 1, 0 1))"
]
[ "POLYGON ((0 2, 0 1, 0 1, 0 1, 0 2))", "POLYGON ((0 2, 0 1, 0 1, 0 1,
0 2))" ]
#SELECT '' AS three, p.*
@@ -67,6 +71,7 @@ stdout of test 'polygon` in directory 's
% 0, 0, 30 # length
[ "", "POLYGON ((2 0, 2 4, 0 0, 2 0))", "POLYGON ((2 0, 2 4, 0 0, 2
0))" ]
[ "", "POLYGON ((3 1, 3 3, 1 0, 3 1))", "POLYGON ((3 1, 3 3, 1 0, 3
1))" ]
+[ "", "POLYGON ((0 1, 1 1, 0 1))", "POLYGON ((0 1, 1 1, 0 1))" ]
#SELECT '' AS one, p.*
# FROM POLYGON_TBL_VW p
# WHERE st_overlaps(p.f1, 'POLYGON((3.0 1.0, 3.0 3.0, 1.0 0.0, 3.0 1.0))');
@@ -85,6 +90,7 @@ stdout of test 'polygon` in directory 's
% 0, 0, 35 # length
[ "", "POLYGON ((2 0, 2 4, 0 0, 2 0))", "POLYGON ((2 0, 2 4, 0 0, 2
0))" ]
[ "", "POLYGON ((3 1, 3 3, 1 0, 3 1))", "POLYGON ((3 1, 3 3, 1 0, 3
1))" ]
+[ "", "POLYGON ((0 1, 1 1, 0 1))", "POLYGON ((0 1, 1 1, 0 1))" ]
[ "", "POLYGON ((0 1, 0 1, 0 1, 0 1))", "POLYGON ((0 1, 0 1, 0 1, 0
1))" ]
[ "", "POLYGON ((0 2, 0 1, 0 1, 0 1, 0 2))", "POLYGON ((0 2, 0 1, 0 1, 0 1,
0 2))" ]
#SELECT '' AS two, p.*
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
