Changeset: a3851430a534 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3851430a534 Modified Files: sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out Branch: default Log Message:
approved output diffs (truncated from 385 to 300 lines): diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out --- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out +++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out @@ -28,12 +28,12 @@ Ready. % .plan # table_name % rel # name % clob # type -% 182 # length +% 189 # length insert( | table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ] | union ( -| | table sys.copyfrom(varchar "sys", varchar "cm_tmp", varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "/file1", bigint "-1", bigint "0", int "0"), [ cm_tmp.i ], -| | table sys.copyfrom(varchar "sys", varchar "cm_tmp", varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "/file2", bigint "-1", bigint "0", int "0"), [ cm_tmp.i ] +| | table sys.copyfrom(varchar "sys", varchar "cm_tmp", varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "/file1", bigint "-1", bigint "0", int "0"), [ cm_tmp.i ] COUNT , +| | table sys.copyfrom(varchar "sys", varchar "cm_tmp", varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "/file2", bigint "-1", bigint "0", int "0"), [ cm_tmp.i ] COUNT | ) [ ] ) diff --git a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out --- a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out +++ b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out @@ -49,19 +49,19 @@ Ready. % .plan # table_name % rel # name % clob # type -% 67 # length +% 74 # length project ( | group by ( -| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ] +| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ] COUNT | ) [ sorted.a, sorted.b ] [ sorted.a, sorted.b ] ) [ sorted.a, sorted.b ] % .plan # table_name % rel # name % clob # type -% 67 # length +% 74 # length project ( | group by ( -| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ] +| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ] COUNT | ) [ sorted.a, sorted.b ] [ sorted.b, sorted.a ] ) [ sorted.a, sorted.b ] diff --git a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out --- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out +++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out @@ -32,96 +32,96 @@ Ready. % .plan # table_name % rel # name % clob # type -% 49 # length +% 56 # length project ( -| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT ) [ oblo.a ] #PLAN select * from oblo OFFSET 2; % .plan # table_name % rel # name % clob # type -% 51 # length +% 58 # length top N ( | project ( -| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT | ) [ oblo.a ] ) [ wrd "2" ] #PLAN select * from oblo LIMIT 2; % .plan # table_name % rel # name % clob # type -% 51 # length +% 58 # length top N ( | project ( -| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT | ) [ oblo.a ] ) [ wrd "2" ] #PLAN select * from oblo LIMIT 1 OFFSET 2; % .plan # table_name % rel # name % clob # type -% 51 # length +% 58 # length top N ( | project ( -| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT | ) [ oblo.a ] ) [ wrd "1", wrd "2" ] #PLAN select * from oblo LIMIT 2 OFFSET 1; % .plan # table_name % rel # name % clob # type -% 51 # length +% 58 # length top N ( | project ( -| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT | ) [ oblo.a ] ) [ wrd "2", wrd "1" ] #PLAN select * from oblo ORDER BY a; % .plan # table_name % rel # name % clob # type -% 49 # length +% 56 # length project ( -| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT ) [ oblo.a ] [ oblo.a ASC ] #PLAN select * from oblo ORDER BY a OFFSET 2; % .plan # table_name % rel # name % clob # type -% 51 # length +% 58 # length top N ( | project ( -| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT | ) [ oblo.a ] [ oblo.a ASC ] ) [ wrd "2" ] #PLAN select * from oblo ORDER BY a LIMIT 2; % .plan # table_name % rel # name % clob # type -% 51 # length +% 58 # length top N ( | project ( -| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT | ) [ oblo.a ] [ oblo.a ASC ] ) [ wrd "2" ] #PLAN select * from oblo ORDER BY a LIMIT 2 OFFSET 1; % .plan # table_name % rel # name % clob # type -% 51 # length +% 58 # length top N ( | project ( -| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT | ) [ oblo.a ] [ oblo.a ASC ] ) [ wrd "2", wrd "1" ] #PLAN select * from oblo ORDER BY a LIMIT 1 OFFSET 2; % .plan # table_name % rel # name % clob # type -% 51 # length +% 58 # length top N ( | project ( -| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] +| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ] COUNT | ) [ oblo.a ] [ oblo.a ASC ] ) [ wrd "1", wrd "2" ] #EXPLAIN select * from oblo; diff --git a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out --- a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out +++ b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out @@ -61,14 +61,14 @@ Ready. % .plan # table_name % rel # name % clob # type -% 59 # length +% 66 # length project ( | distinct union ( | | distinct project ( -| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] +| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] COUNT | | ) [ t2606a.a ], | | distinct project ( -| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] +| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] COUNT | | ) [ t2606b.a ] | ) [ a ] ) [ a ] [ a ASC ] @@ -90,14 +90,14 @@ project ( % .plan # table_name % rel # name % clob # type -% 59 # length +% 66 # length project ( | distinct union ( | | distinct project ( -| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] +| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] COUNT | | ) [ t2606a.a ], | | distinct project ( -| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] +| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] COUNT | | ) [ t2606b.a ] | ) [ a ] ) [ a ] [ a ASC ] @@ -119,14 +119,14 @@ project ( % .plan # table_name % rel # name % clob # type -% 59 # length +% 66 # length project ( | distinct union ( | | distinct project ( -| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] +| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] COUNT | | ) [ t2606a.a ], | | distinct project ( -| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] +| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] COUNT | | ) [ t2606b.a ] | ) [ a ] ) [ a ] [ a ASC ] @@ -148,14 +148,14 @@ project ( % .plan # table_name % rel # name % clob # type -% 59 # length +% 66 # length project ( | except ( | | distinct project ( -| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] +| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] COUNT | | ) [ t2606a.a ], | | project ( -| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] +| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] COUNT | | ) [ t2606b.a ] | ) [ a ] ) [ a ] [ a ASC ] @@ -171,14 +171,14 @@ project ( % .plan # table_name % rel # name % clob # type -% 59 # length +% 66 # length project ( | except ( | | distinct project ( -| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] +| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] COUNT | | ) [ t2606a.a ], | | project ( -| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] +| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] COUNT | | ) [ t2606b.a ] | ) [ a ] ) [ a ] [ a ASC ] @@ -194,14 +194,14 @@ project ( % .plan # table_name % rel # name % clob # type -% 59 # length +% 66 # length project ( | except ( | | distinct project ( -| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] +| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] COUNT | | ) [ t2606a.a ], | | project ( -| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] +| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] COUNT | | ) [ t2606b.a ] | ) [ a ] ) [ a ] [ a ASC ] @@ -217,14 +217,14 @@ project ( % .plan # table_name % rel # name % clob # type -% 59 # length +% 66 # length project ( | intersect ( | | distinct project ( -| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] +| | | table(sys.t2606a) [ t2606a.a, t2606a.%TID% NOT NULL ] COUNT | | ) [ t2606a.a ], | | project ( -| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] +| | | table(sys.t2606b) [ t2606b.a, t2606b.%TID% NOT NULL ] COUNT | | ) [ t2606b.a ] | ) [ a ] ) [ a ] [ a ASC ] @@ -240,14 +240,14 @@ project ( % .plan # table_name % rel # name % clob # type -% 59 # length _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
