Changeset: 60f2e3da83c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60f2e3da83c3
Modified Files:
sql/test/BugTracker-2009/Tests/correlated-selection-bug.stable.out
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out.int128
sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
Branch: subquery
Log Message:
approved output, small cleanup
diffs (149 lines):
diff --git a/sql/test/BugTracker-2009/Tests/correlated-selection-bug.stable.out
b/sql/test/BugTracker-2009/Tests/correlated-selection-bug.stable.out
--- a/sql/test/BugTracker-2009/Tests/correlated-selection-bug.stable.out
+++ b/sql/test/BugTracker-2009/Tests/correlated-selection-bug.stable.out
@@ -74,7 +74,7 @@ Ready.
# "warehouse_class" AS "warehouse_class"
# where
# "warehouse_class"."warehouse_class_id" =
"warehouse"."warehouse_class_id" and
-% .L2, .L13, .L25, .L40, .L43, .L46, .L51 # table_name
+% sys.L2, .L10, .L16, .L24, sys.L27, sys.L32, sys.L35
# table_name
% c0, m0, m1, m2, m3, m4, m5 # name
% varchar, bigint, bigint, bigint, bigint, bigint, bigint # type
% 0, 1, 1, 1, 1, 1, 1 # length
diff --git
a/sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out.int128
b/sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out.int128
--- a/sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out.int128
+++ b/sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out.int128
@@ -35,15 +35,16 @@ Ready.
[ 6, 4 ]
[ 7, 5 ]
#select ( select count( * )+1 from countt1 as tt3 where tt3.b < tt2.b ) from
countt1 as tt2;
-% .L6 # table_name
-% L6 # name
+% .L5 # table_name
+% L5 # name
% hugeint # type
% 1 # length
+[ 1 ]
[ 2 ]
[ 3 ]
[ 4 ]
[ 5 ]
-[ 1 ]
+#drop table countt1;
# 13:45:53 >
# 13:45:53 > Done.
diff --git
a/sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
b/sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
--- a/sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
+++ b/sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
@@ -29,8 +29,8 @@ Ready.
#insert into bug2739 values (1), (2);
[ 2 ]
#select avg(val - (select avg(val) from bug2739)) from bug2739;
-% sys.L10 # table_name
-% L7 # name
+% .L6 # table_name
+% L6 # name
% double # type
% 24 # length
[ 0 ]
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -31,18 +31,18 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 117 # length
+% 105 # length
project (
| project (
| | group by (
| | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT
| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as
"L3"."L3", "L3"."L3" as "L5"."L5" ]
-| ) [ "dbg"."d", "L3"."L3", sys.sql_mul(sys.sql_div("L5"."L5", tinyint "2" as
"L7"."L7"), tinyint "2") as "L10"."f" ]
-) [ "dbg"."d", "L3"."L3", "L10"."f" ]
+| ) [ "dbg"."d", "L3"."L3", sys.sql_mul(sys.sql_div("L5"."L5", tinyint "2"),
tinyint "2") as "L6"."f" ]
+) [ "dbg"."d", "L3"."L3", "L6"."f" ]
#set optimizer = 'sequential_pipe';
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
-% sys.dbg, sys.L3, sys.L10 # table_name
+% sys.dbg, sys.L3, sys.L6 # table_name
% d, L3, f # name
% int, bigint, bigint # type
% 2, 2, 2 # length
@@ -56,19 +56,19 @@ project (
% .plan # table_name
% rel # name
% clob # type
-% 131 # length
+% 115 # length
project (
| project (
| | group by (
| | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT
| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as
"L3"."L3", "L3"."L3" as "L6"."L6" ]
-| ) [ "dbg"."d", "L3"."L3" as "L4"."e", sys.sql_mul(sys.sql_div("L6"."L6",
tinyint "2" as "L10"."L10"), tinyint "2") as "L11"."f" ]
-) [ "dbg"."d", "L4"."e", "L11"."f" ]
+| ) [ "dbg"."d", "L3"."L3" as "L4"."e", sys.sql_mul(sys.sql_div("L6"."L6",
tinyint "2"), tinyint "2") as "L7"."f" ]
+) [ "dbg"."d", "L4"."e", "L7"."f" ]
#set optimizer = 'sequential_pipe';
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP
#BY d;
-% sys.dbg, sys.L4, sys.L11 # table_name
+% sys.dbg, sys.L4, sys.L7 # table_name
% d, e, f # name
% int, bigint, bigint # type
% 2, 2, 2 # length
diff --git
a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
@@ -31,18 +31,18 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 117 # length
+% 105 # length
project (
| project (
| | group by (
| | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT
| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as
"L3"."L3", "L3"."L3" as "L5"."L5" ]
-| ) [ "dbg"."d", "L3"."L3", sys.sql_mul(sys.sql_div("L5"."L5", tinyint "2" as
"L7"."L7"), tinyint "2") as "L10"."f" ]
-) [ "dbg"."d", "L3"."L3", "L10"."f" ]
+| ) [ "dbg"."d", "L3"."L3", sys.sql_mul(sys.sql_div("L5"."L5", tinyint "2"),
tinyint "2") as "L6"."f" ]
+) [ "dbg"."d", "L3"."L3", "L6"."f" ]
#set optimizer = 'sequential_pipe';
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
-% sys.dbg, sys.L3, sys.L10 # table_name
+% sys.dbg, sys.L3, sys.L6 # table_name
% d, L3, f # name
% int, hugeint, hugeint # type
% 2, 2, 2 # length
@@ -56,19 +56,19 @@ project (
% .plan # table_name
% rel # name
% clob # type
-% 131 # length
+% 115 # length
project (
| project (
| | group by (
| | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT
| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as
"L3"."L3", "L3"."L3" as "L6"."L6" ]
-| ) [ "dbg"."d", "L3"."L3" as "L4"."e", sys.sql_mul(sys.sql_div("L6"."L6",
tinyint "2" as "L10"."L10"), tinyint "2") as "L11"."f" ]
-) [ "dbg"."d", "L4"."e", "L11"."f" ]
+| ) [ "dbg"."d", "L3"."L3" as "L4"."e", sys.sql_mul(sys.sql_div("L6"."L6",
tinyint "2"), tinyint "2") as "L7"."f" ]
+) [ "dbg"."d", "L4"."e", "L7"."f" ]
#set optimizer = 'sequential_pipe';
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP
#BY d;
-% sys.dbg, sys.L4, sys.L11 # table_name
+% sys.dbg, sys.L4, sys.L7 # table_name
% d, e, f # name
% int, hugeint, hugeint # type
% 2, 2, 2 # length
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
