Changeset: 026943ff604a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/026943ff604a Modified Files: sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test sql/test/BugTracker-2015/Tests/crash.Bug-3736.test sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.test sql/test/SQLancer/Tests/sqlancer17.test sql/test/astro/Tests/astro.test sql/test/bugs/Tests/rtrim_bug.test sql/test/merge-partitions/Tests/mergepart31.test sql/test/miscellaneous/Tests/groupby_prepare.stable.out sql/test/miscellaneous/Tests/simple_selects.test sql/test/prepare/Tests/prepare-complex.stable.out sql/test/prepare/Tests/rename_exps.Bug-3974.stable.out sql/test/prepare/Tests/sqlancer_prepare.stable.out Branch: label Log Message:
approved output diffs (truncated from 691 to 300 lines): diff --git a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test --- a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test +++ b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test @@ -73,12 +73,12 @@ project ( | distinct union ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort select * from t2606a union select * from t2606b order by a @@ -100,12 +100,12 @@ project ( | distinct union ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort ( select * from t2606a union select * from t2606b ) order by a @@ -127,12 +127,12 @@ project ( | distinct union ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort ( select * from t2606a ) union ( select * from t2606b ) order by a @@ -154,12 +154,12 @@ project ( | distinct except ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort select * from t2606a except select * from t2606b order by a @@ -175,12 +175,12 @@ project ( | distinct except ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort ( select * from t2606a except select * from t2606b ) order by a @@ -196,12 +196,12 @@ project ( | distinct except ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort ( select * from t2606a ) except ( select * from t2606b ) order by a @@ -217,12 +217,12 @@ project ( | distinct intersect ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort select * from t2606a intersect select * from t2606b order by a @@ -238,12 +238,12 @@ project ( | distinct intersect ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort ( select * from t2606a intersect select * from t2606b ) order by a @@ -259,12 +259,12 @@ project ( | distinct intersect ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "%5"."a" ] -) [ "%5"."a" NOT NULL UNIQUE ] [ "%5"."a" ASC NOT NULL UNIQUE ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE ] +) [ "t2606a"."a" NOT NULL UNIQUE ] [ "t2606a"."a" ASC NOT NULL UNIQUE ] query I rowsort ( select * from t2606a ) intersect ( select * from t2606b ) order by a @@ -280,11 +280,11 @@ project ( | distinct union ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "t"."a" ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE as "t"."a" ] ) [ "t"."a" NOT NULL UNIQUE ] [ "t"."a" ASC NOT NULL UNIQUE ] query I rowsort @@ -307,11 +307,11 @@ project ( | distinct except ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "t"."a" ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE as "t"."a" ] ) [ "t"."a" NOT NULL UNIQUE ] [ "t"."a" ASC NOT NULL UNIQUE ] query I rowsort @@ -328,11 +328,11 @@ project ( | distinct intersect ( | | project ( | | | table("sys"."t2606a") [ "t2606a"."a" NOT NULL UNIQUE ] -| | ) [ "t2606a"."a" NOT NULL UNIQUE as "%1"."a" ], +| | ) [ "t2606a"."a" NOT NULL UNIQUE ], | | project ( | | | table("sys"."t2606b") [ "t2606b"."a" NOT NULL UNIQUE ] -| | ) [ "t2606b"."a" NOT NULL UNIQUE as "%2"."a" ] -| ) [ "%1"."a" NOT NULL UNIQUE as "t"."a" ] +| | ) [ "t2606b"."a" NOT NULL UNIQUE ] +| ) [ "t2606a"."a" NOT NULL UNIQUE as "t"."a" ] ) [ "t"."a" NOT NULL UNIQUE ] [ "t"."a" ASC NOT NULL UNIQUE ] query I rowsort diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test --- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test +++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test @@ -123,20 +123,22 @@ single left outer join ( | | join ( | | | project ( | | | | table("sys"."bidder") [ "bidder"."id" NOT NULL UNIQUE HASHCOL as "b3"."id", "bidder"."increase" NOT NULL as "b3"."increase", "bidder"."%TID%" NOT NULL UNIQUE as "b3"."%TID%" ] -| | | ) [ "b3"."id" NOT NULL UNIQUE HASHCOL , "b3"."increase" NOT NULL, "b3"."%TID%" NOT NULL UNIQUE, "b3"."increase" NOT NULL as "%2"."%2" ], -| | | group by ( -| | | | join ( -| | | | | table("sys"."bidder") [ "bidder"."id" NOT NULL UNIQUE HASHCOL as "b3a"."id", "bidder"."open_auction_id" NOT NULL as "b3a"."open_auction_id", "bidder"."%TID%" NOT NULL UNIQUE as "b3a"."%TID%" ], -| | | | | group by ( -| | | | | | project ( -| | | | | | | & REF 1 -| | | | | | ) [ "o"."open_auction_id" NOT NULL ] -| | | | | ) [ "o"."open_auction_id" NOT NULL ] [ "o"."open_auction_id" NOT NULL ] -| | | | ) [ ("b3a"."open_auction_id" NOT NULL) = ("o"."open_auction_id" NOT NULL UNIQUE) ] -| | | ) [ "o"."open_auction_id" NOT NULL ] [ "sys"."min" no nil ("b3a"."id" NOT NULL HASHCOL ) NOT NULL as "%1"."%1", "o"."open_auction_id" NOT NULL ] -| | ) [ ("b3"."id" NOT NULL UNIQUE HASHCOL ) = ("%1"."%1" NOT NULL) ] -| ) [ "b3"."id" NOT NULL HASHCOL , "b3"."increase" NOT NULL, "b3"."%TID%" NOT NULL, "%1"."%1" NOT NULL, "%2"."%2" NOT NULL, "o"."open_auction_id" NOT NULL as "%5"."%5" ] -) [ ("o"."open_auction_id" NOT NULL) * = ("%5"."%5" NOT NULL) ] +| | | ) [ "b3"."id" NOT NULL UNIQUE HASHCOL , "b3"."increase" NOT NULL, "b3"."%TID%" NOT NULL UNIQUE, "b3"."increase" NOT NULL as "%3"."%3" ], +| | | project ( +| | | | group by ( +| | | | | join ( +| | | | | | table("sys"."bidder") [ "bidder"."id" NOT NULL UNIQUE HASHCOL as "b3a"."id", "bidder"."open_auction_id" NOT NULL as "b3a"."open_auction_id", "bidder"."%TID%" NOT NULL UNIQUE as "b3a"."%TID%" ], +| | | | | | group by ( +| | | | | | | project ( +| | | | | | | | & REF 1 +| | | | | | | ) [ "o"."open_auction_id" NOT NULL ] +| | | | | | ) [ "o"."open_auction_id" NOT NULL ] [ "o"."open_auction_id" NOT NULL ] +| | | | | ) [ ("b3a"."open_auction_id" NOT NULL) = ("o"."open_auction_id" NOT NULL UNIQUE) ] +| | | | ) [ "o"."open_auction_id" NOT NULL ] [ "sys"."min" no nil ("b3a"."id" NOT NULL HASHCOL ) NOT NULL as "%1"."%1", "o"."open_auction_id" NOT NULL ] +| | | ) [ "o"."open_auction_id" NOT NULL UNIQUE, "%1"."%1" NOT NULL as "%2"."%2" ] +| | ) [ ("b3"."id" NOT NULL UNIQUE HASHCOL ) = ("%2"."%2" NOT NULL) ] +| ) [ "b3"."id" NOT NULL HASHCOL , "b3"."increase" NOT NULL, "b3"."%TID%" NOT NULL, "%2"."%2" NOT NULL, "%3"."%3" NOT NULL, "o"."open_auction_id" NOT NULL as "%7"."%7" ] +) [ ("o"."open_auction_id" NOT NULL) * = ("%7"."%7" NOT NULL) ] project ( | select ( | | single project ( @@ -146,22 +148,24 @@ project ( | | | | | join ( | | | | | | project ( | | | | | | | table("sys"."bidder") [ "bidder"."id" NOT NULL UNIQUE HASHCOL as "b2"."id", "bidder"."increase" NOT NULL as "b2"."increase" ] -| | | | | | ) [ "b2"."id" NOT NULL UNIQUE HASHCOL , "b2"."increase" NOT NULL as "%4"."%4" ], -| | | | | | group by ( -| | | | | | | join ( -| | | | | | | | table("sys"."bidder") [ "bidder"."id" NOT NULL UNIQUE HASHCOL as "b2a"."id", "bidder"."open_auction_id" NOT NULL as "b2a"."open_auction_id" ], -| | | | | | | | single group by ( -| | | | | | | | | single project ( -| | | | | | | | | | & REF 2 -| | | | | | | | | ) [ "o"."open_auction_id" NOT NULL ] -| | | | | | | | ) [ "o"."open_auction_id" NOT NULL ] [ "o"."open_auction_id" NOT NULL ] -| | | | | | | ) [ ("b2a"."open_auction_id" NOT NULL) = ("o"."open_auction_id" NOT NULL UNIQUE) ] -| | | | | | ) [ "o"."open_auction_id" NOT NULL ] [ "sys"."max" no nil ("b2a"."id" NOT NULL HASHCOL ) NOT NULL as "%3"."%3", "o"."open_auction_id" NOT NULL ] -| | | | | ) [ ("b2"."id" NOT NULL UNIQUE HASHCOL ) = ("%3"."%3" NOT NULL) ] -| | | | ) [ "%4"."%4" NOT NULL, "o"."open_auction_id" NOT NULL as "%6"."%6" ] -| | | ) [ ("o"."open_auction_id" NOT NULL) * = ("%6"."%6" NOT NULL) ] -| | ) [ "b"."id" NOT NULL HASHCOL , "b"."open_auction_id" NOT NULL, "b"."date" NOT NULL, "b"."time" NOT NULL, "b"."personref" NOT NULL, "b"."increase" NOT NULL, "%2"."%2", "%4"."%4" ] -| ) [ ("sys"."<="("sys"."sql_mul"("%2"."%2", double(53) "2"), "%4"."%4")) = (boolean(1) "true") ] +| | | | | | ) [ "b2"."id" NOT NULL UNIQUE HASHCOL , "b2"."increase" NOT NULL as "%6"."%6" ], +| | | | | | project ( +| | | | | | | group by ( +| | | | | | | | join ( +| | | | | | | | | table("sys"."bidder") [ "bidder"."id" NOT NULL UNIQUE HASHCOL as "b2a"."id", "bidder"."open_auction_id" NOT NULL as "b2a"."open_auction_id" ], +| | | | | | | | | single group by ( +| | | | | | | | | | single project ( +| | | | | | | | | | | & REF 2 +| | | | | | | | | | ) [ "o"."open_auction_id" NOT NULL ] +| | | | | | | | | ) [ "o"."open_auction_id" NOT NULL ] [ "o"."open_auction_id" NOT NULL ] +| | | | | | | | ) [ ("b2a"."open_auction_id" NOT NULL) = ("o"."open_auction_id" NOT NULL UNIQUE) ] +| | | | | | | ) [ "o"."open_auction_id" NOT NULL ] [ "sys"."max" no nil ("b2a"."id" NOT NULL HASHCOL ) NOT NULL as "%4"."%4", "o"."open_auction_id" NOT NULL ] +| | | | | | ) [ "o"."open_auction_id" NOT NULL UNIQUE, "%4"."%4" NOT NULL as "%5"."%5" ] +| | | | | ) [ ("b2"."id" NOT NULL UNIQUE HASHCOL ) = ("%5"."%5" NOT NULL) ] +| | | | ) [ "%6"."%6" NOT NULL, "o"."open_auction_id" NOT NULL as "%10"."%10" ] +| | | ) [ ("o"."open_auction_id" NOT NULL) * = ("%10"."%10" NOT NULL) ] +| | ) [ "b"."id" NOT NULL HASHCOL , "b"."open_auction_id" NOT NULL, "b"."date" NOT NULL, "b"."time" NOT NULL, "b"."personref" NOT NULL, "b"."increase" NOT NULL, "%3"."%3", "%6"."%6" ] +| ) [ ("sys"."<="("sys"."sql_mul"("%3"."%3", double(53) "2"), "%6"."%6")) = (boolean(1) "true") ] ) [ "b"."id" NOT NULL UNIQUE HASHCOL , "b"."open_auction_id" NOT NULL, "b"."date" NOT NULL, "b"."time" NOT NULL, "b"."personref" NOT NULL, "b"."increase" NOT NULL ] query ITTTTR rowsort diff --git a/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.test b/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.test --- a/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.test +++ b/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.test @@ -45,26 +45,24 @@ PLAN select * from r ---- project ( | project ( -| | project ( -| | | crossproduct ( -| | | | table("sys"."v") [ "v"."a1" UNIQUE, "v"."a2" ], -| | | | project ( -| | | | | crossproduct ( -| | | | | | project ( -| | | | | | | select ( -| | | | | | | | table("sys"."input_double") [ "input_double"."a1" UNIQUE, "input_double"."a2" UNIQUE ] -| | | | | | | ) [ ("input_double"."a1" UNIQUE) = (varchar "latitude") ] -| | | | | | ) [ "input_double"."a2" UNIQUE as "tmp_2"."a2" ], -| | | | | | project ( _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org