Changeset: 199b46f198ba for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=199b46f198ba Modified Files: sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out Branch: Jan2014 Log Message:
approved correct output diffs (96 lines): diff --git a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err --- a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err +++ b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err @@ -28,7 +28,10 @@ stderr of test 'pivot.Bug-3339` in direc # 09:16:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21191" "--port=32634" # 09:16:37 > -?DO WE EXPECT THIS ERROR HERE? +MAPI = monetdb@niels:35691 +QUERY = SELECT (SELECT * FROM groupElements(pivot.x)) + FROM (SELECT * FROM tmp) as pivot; +ERROR = !cardinality violation (2>1) # 09:16:37 > # 09:16:37 > "Done." diff --git a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out --- a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out +++ b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out @@ -47,12 +47,9 @@ Ready. # loading sql script: 80_udf.sql # loading sql script: 99_system.sql -# 09:16:37 > -# 09:16:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21191" "--port=32634" -# 09:16:37 > - - -!OUTPUT BELOW NEEDS TO BE VALIDATED OR FIXED! +# 15:13:19 > +# 15:13:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=35691" +# 15:13:19 > #CREATE FUNCTION groupElements(beg INTEGER) #RETURNS TABLE (x INTEGER) @@ -82,10 +79,7 @@ Ready. #DROP TABLE tmp; #DROP FUNCTION groupElements; -!OUTPUT ABOVE NEEDS TO BE VALIDATED OR FIXED! +# 15:13:19 > +# 15:13:19 > "Done." +# 15:13:19 > - -# 09:16:37 > -# 09:16:37 > "Done." -# 09:16:37 > - diff --git a/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out b/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out --- a/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out +++ b/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out @@ -33,11 +33,11 @@ Ready. % .plan # table_name % rel # name % clob # type -% 98 # length +% 64 # length project ( | join ( -| | table(sys.t4311) [ t4311.a as t2.a, t4311.%TID% NOT NULL as t2.%TID% ] COUNT , -| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b, t4311.%TID% NOT NULL as t1.%TID% ] COUNT +| | table(sys.t4311) [ t4311.a as t2.a ] COUNT , +| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b ] COUNT | ) [ t1.a <= t2.a <= t1.b ] ) [ t2.a ] #plan @@ -48,11 +48,11 @@ project ( % .plan # table_name % rel # name % clob # type -% 98 # length +% 64 # length project ( | join ( -| | table(sys.t4311) [ t4311.a as t2.a, t4311.%TID% NOT NULL as t2.%TID% ] COUNT , -| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b, t4311.%TID% NOT NULL as t1.%TID% ] COUNT +| | table(sys.t4311) [ t4311.a as t2.a ] COUNT , +| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b ] COUNT | ) [ t1.a <= t2.a <= t1.b ] ) [ t2.a ] #plan @@ -63,11 +63,11 @@ project ( % .plan # table_name % rel # name % clob # type -% 98 # length +% 64 # length project ( | join ( -| | table(sys.t4311) [ t4311.a as t2.a, t4311.%TID% NOT NULL as t2.%TID% ] COUNT , -| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b, t4311.%TID% NOT NULL as t1.%TID% ] COUNT +| | table(sys.t4311) [ t4311.a as t2.a ] COUNT , +| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b ] COUNT | ) [ t1.a <= t2.a <= t1.b ] ) [ t2.a ] #drop table t4311; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
