Changeset: aa903735f71d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa903735f71d
Modified Files:
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
Branch: Jul2017
Log Message:
Approve some more test outputs after merge
diffs (truncated from 345 to 300 lines):
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,24 +61,25 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 49 # length
+% 51 # length
project (
| distinct union (
| | project (
| | | group by (
-| | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | | ) [ "t2606a"."a" ]
-| | ) [ "t2606a"."a" ] [ "t2606a"."a" ],
-| | | ) [ t2606a.a ] [ t2606a.a ]
-| | ) [ t2606a.a as L5.a ],
-| | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | | ) [ "t2606b"."a" ]
-| | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "L11"."a" ]
+| | | | project (
+| | | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | | | ) [ "t2606a"."a" ]
+| | | ) [ "t2606a"."a" ] [ "t2606a"."a" ]
+| | ) [ "t2606a"."a" as "L5"."a" ],
+| | project (
+| | | group by (
+| | | | project (
+| | | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | | | ) [ "t2606b"."a" ]
+| | | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
-| | | ) [ t2606b.a ] [ t2606b.a ]
-| | ) [ t2606b.a as L6.a ]
-| ) [ L5.a as L11.a ]
#select * from t2606a union select * from t2606b order by a;
% .L11 # table_name
% a # name
@@ -97,24 +98,25 @@ project (
% .plan # table_name
% rel # name
% clob # type
-% 49 # length
+% 51 # length
project (
| distinct union (
| | project (
| | | group by (
-| | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | | ) [ "t2606a"."a" ]
-| | ) [ "t2606a"."a" ] [ "t2606a"."a" ],
-| | | ) [ t2606a.a ] [ t2606a.a ]
-| | ) [ t2606a.a as L5.a ],
-| | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | | ) [ "t2606b"."a" ]
-| | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "L11"."a" ]
+| | | | project (
+| | | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | | | ) [ "t2606a"."a" ]
+| | | ) [ "t2606a"."a" ] [ "t2606a"."a" ]
+| | ) [ "t2606a"."a" as "L5"."a" ],
+| | project (
+| | | group by (
+| | | | project (
+| | | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | | | ) [ "t2606b"."a" ]
+| | | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
-| | | ) [ t2606b.a ] [ t2606b.a ]
-| | ) [ t2606b.a as L6.a ]
-| ) [ L5.a as L11.a ]
#( select * from t2606a union select * from t2606b ) order by a;
% .L11 # table_name
% a # name
@@ -133,24 +135,25 @@ project (
% .plan # table_name
% rel # name
% clob # type
-% 49 # length
+% 51 # length
project (
| distinct union (
| | project (
| | | group by (
-| | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | | ) [ "t2606a"."a" ]
-| | ) [ "t2606a"."a" ] [ "t2606a"."a" ],
-| | | ) [ t2606a.a ] [ t2606a.a ]
-| | ) [ t2606a.a as L5.a ],
-| | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | | ) [ "t2606b"."a" ]
-| | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "L11"."a" ]
+| | | | project (
+| | | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | | | ) [ "t2606a"."a" ]
+| | | ) [ "t2606a"."a" ] [ "t2606a"."a" ]
+| | ) [ "t2606a"."a" as "L5"."a" ],
+| | project (
+| | | group by (
+| | | | project (
+| | | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | | | ) [ "t2606b"."a" ]
+| | | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
-| | | ) [ t2606b.a ] [ t2606b.a ]
-| | ) [ t2606b.a as L6.a ]
-| ) [ L5.a as L11.a ]
#( select * from t2606a ) union ( select * from t2606b ) order by a;
% .L11 # table_name
% a # name
@@ -174,11 +177,11 @@ project (
| distinct except (
| | project (
| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | ) [ "t2606a"."a" ],
+| | ) [ "t2606a"."a" as "L5"."a" ],
| | project (
| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | ) [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "L11"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
#select * from t2606a except select * from t2606b order by a;
% sys.L11 # table_name
@@ -197,11 +200,11 @@ project (
| distinct except (
| | project (
| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | ) [ "t2606a"."a" ],
+| | ) [ "t2606a"."a" as "L5"."a" ],
| | project (
| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | ) [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "L11"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
#( select * from t2606a except select * from t2606b ) order by a;
% sys.L11 # table_name
@@ -220,11 +223,11 @@ project (
| distinct except (
| | project (
| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | ) [ "t2606a"."a" ],
+| | ) [ "t2606a"."a" as "L5"."a" ],
| | project (
| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | ) [ t2606b.a as L6.a ]
-| ) [ L5.a as L11.a ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
#( select * from t2606a ) except ( select * from t2606b ) order by a;
% sys.L11 # table_name
@@ -243,11 +246,11 @@ project (
| distinct intersect (
| | project (
| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | ) [ "t2606a"."a" ],
+| | ) [ "t2606a"."a" as "L5"."a" ],
| | project (
| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | ) [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "L11"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
#select * from t2606a intersect select * from t2606b order by a;
% sys.L11 # table_name
@@ -266,11 +269,11 @@ project (
| distinct intersect (
| | project (
| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | ) [ "t2606a"."a" ],
+| | ) [ "t2606a"."a" as "L5"."a" ],
| | project (
| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | ) [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "L11"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
#( select * from t2606a intersect select * from t2606b ) order by a;
% sys.L11 # table_name
@@ -289,11 +292,11 @@ project (
| distinct intersect (
| | project (
| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | ) [ "t2606a"."a" ],
+| | ) [ "t2606a"."a" as "L5"."a" ],
| | project (
| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | ) [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "L11"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "L11"."a" ]
) [ "L11"."a" ] [ "L11"."a" ASC ]
#( select * from t2606a ) intersect ( select * from t2606b ) order by a;
% sys.L11 # table_name
@@ -307,24 +310,25 @@ project (
% .plan # table_name
% rel # name
% clob # type
-% 49 # length
+% 51 # length
project (
| distinct union (
| | project (
| | | group by (
-| | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | | ) [ "t2606a"."a" ]
-| | ) [ "t2606a"."a" ] [ "t2606a"."a" ],
-| | | ) [ t2606a.a ] [ t2606a.a ]
-| | ) [ t2606a.a as L5.a ],
-| | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | | ) [ "t2606b"."a" ]
-| | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "t"."a" ]
+| | | | project (
+| | | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | | | ) [ "t2606a"."a" ]
+| | | ) [ "t2606a"."a" ] [ "t2606a"."a" ]
+| | ) [ "t2606a"."a" as "L5"."a" ],
+| | project (
+| | | group by (
+| | | | project (
+| | | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | | | ) [ "t2606b"."a" ]
+| | | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "t"."a" ]
) [ "t"."a" ] [ "t"."a" ASC ]
-| | | ) [ t2606b.a ] [ t2606b.a ]
-| | ) [ t2606b.a as L6.a ]
-| ) [ L5.a as t.a ]
#select * from (select * from t2606a union select * from t2606b) as t order by
a;
% .t # table_name
% a # name
@@ -348,11 +352,11 @@ project (
| distinct except (
| | project (
| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | ) [ "t2606a"."a" ],
+| | ) [ "t2606a"."a" as "L5"."a" ],
| | project (
| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | ) [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "t"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "t"."a" ]
) [ "t"."a" ] [ "t"."a" ASC ]
#select * from (select * from t2606a except select * from t2606b) as t order
by a;
% sys.t # table_name
@@ -371,11 +375,11 @@ project (
| distinct intersect (
| | project (
| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
-| | ) [ "t2606a"."a" ],
+| | ) [ "t2606a"."a" as "L5"."a" ],
| | project (
| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
-| | ) [ "t2606b"."a" ]
-| ) [ "t2606a"."a" as "t"."a" ]
+| | ) [ "t2606b"."a" as "L6"."a" ]
+| ) [ "L5"."a" as "t"."a" ]
) [ "t"."a" ] [ "t"."a" ASC ]
#select * from (select * from t2606a intersect select * from t2606b) as t
order by a;
% sys.t # table_name
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -74,28 +74,28 @@ Operation successful
| sql.resultSet(".L42", "L41", "bigint", 64:int, 0:int, 7:int, X_43);
|
| end user.s4_1;
|
| #inline actions= 0 time=0 usec
|
-| #remap actions= 0 time=2 usec
|
-| #costmodel actions= 1 time=2 usec
|
-| #coercion actions= 1 time=5 usec
|
-| #evaluate actions= 0 time=3 usec
|
-| #emptybind actions= 0 time=6 usec
|
-| #pushselect actions= 4 time=25 usec
|
-| #aliases actions= 2 time=7 usec
|
-| #mergetable actions= 0 time=30 usec
|
-| #deadcode actions= 2 time=7 usec
|
-| #aliases actions= 0 time=5 usec
|
-| #constants actions= 1 time=6 usec
|
-| #commonTerms actions= 0 time=6 usec
|
-| #projectionpath actions= 0 time=3 usec
|
-| #reorder actions= 1 time=22 usec
|
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
