Changeset: 1abfcdd54759 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1abfcdd54759
Modified Files:
sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
Branch: Dec2016
Log Message:
Approve EXPLAIN output after changeset 9b7490e6a80f.
diffs (197 lines):
diff --git a/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
b/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
--- a/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
+++ b/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
@@ -62,8 +62,8 @@ Ready.
# (CASE WHEN station136 is NULL THEN 0 ELSE station136 END) +
# (CASE WHEN station136 is NULL THEN 0 ELSE station136 END) +
# (CASE WHEN station136 is NULL THEN 0 ELSE station136 END) +
-% sys.t2239, sys.L1 # table_name
-% station136, L1 # name
+% sys.t2239, sys.L3 # table_name
+% station136, L3 # name
% smallint, bigint # type
% 4, 5 # length
[ 1214, 38848 ]
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
@@ -44,39 +44,39 @@ project (
% clob # type
% 145 # length
function user.s8_1():void;
- X_0:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b) /
(select 2))) as f from dbg group by d;","sequential_pipe",34:int);
+ X_0:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b) /
(select 2))) as f from dbg group by d;","sequential_pipe",19:int);
X_29 := bat.new(nil:str);
- X_36 := bat.append(X_29,"sys.dbg");
- X_46 := bat.append(X_36,"sys.L4");
- X_55 := bat.append(X_46,"sys.L11");
+ X_35 := bat.new(nil:int);
+ X_33 := bat.new(nil:int);
+ X_32 := bat.new(nil:str);
X_31 := bat.new(nil:str);
- X_38 := bat.append(X_31,"d");
- X_48 := bat.append(X_38,"L3");
- X_57 := bat.append(X_48,"f");
- X_32 := bat.new(nil:str);
- X_40 := bat.append(X_32,"int");
- X_50 := bat.append(X_40,"bigint");
- X_59 := bat.append(X_50,"bigint");
- X_33 := bat.new(nil:int);
- X_42 := bat.append(X_33,32:int);
- X_52 := bat.append(X_42,64:int);
- X_60 := bat.append(X_52,63:int);
- X_35 := bat.new(nil:int);
- X_44 := bat.append(X_35,0:int);
- X_54 := bat.append(X_44,0:int);
- X_62 := bat.append(X_54,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","dbg");
+ X_17:bat[:int] := sql.bind(X_3,"sys","dbg","b",0:int);
+ X_19 := algebra.projection(C_4,X_17);
X_7:bat[:int] := sql.bind(X_3,"sys","dbg","a",0:int);
X_10 := algebra.projection(C_4,X_7);
(X_11,C1_14,r2_14) := group.subgroupdone(X_10);
X_14 := algebra.projection(C1_14,X_10);
- X_17:bat[:int] := sql.bind(X_3,"sys","dbg","b",0:int);
- X_19 := algebra.projection(C_4,X_17);
X_20:bat[:lng] := aggr.subsum(X_19,X_11,C1_14,true,true);
- X_15 := bat.setKey(X_14,true);
X_22:bat[:lng] := batcalc./(X_20,2:bte);
X_26:bat[:lng] := batcalc.*(X_22,2:bte);
+ X_15 := bat.setKey(X_14,true);
+ X_36 := bat.append(X_29,"sys.dbg");
+ X_38 := bat.append(X_31,"d");
+ X_40 := bat.append(X_32,"int");
+ X_42 := bat.append(X_33,32:int);
+ X_44 := bat.append(X_35,0:int);
+ X_46 := bat.append(X_36,"sys.L4");
+ X_48 := bat.append(X_38,"L3");
+ X_50 := bat.append(X_40,"bigint");
+ X_52 := bat.append(X_42,64:int);
+ X_54 := bat.append(X_44,0:int);
+ X_55 := bat.append(X_46,"sys.L11");
+ X_57 := bat.append(X_48,"f");
+ X_59 := bat.append(X_50,"bigint");
+ X_60 := bat.append(X_52,63:int);
+ X_62 := bat.append(X_54,0:int);
sql.resultSet(X_55,X_57,X_59,X_60,X_62,X_15,X_20,X_26);
end user.s8_1;
#inline actions= 0 time=4 usec
@@ -130,39 +130,39 @@ project (
% clob # type
% 150 # length
function user.s20_1():void;
- X_0:void := querylog.define("explain select a as d, sum(b) as e, (2 *
(sum(b) / (select 2))) as f from dbg group by d;","sequential_pipe",34:int);
+ X_0:void := querylog.define("explain select a as d, sum(b) as e, (2 *
(sum(b) / (select 2))) as f from dbg group by d;","sequential_pipe",19:int);
X_29 := bat.new(nil:str);
- X_36 := bat.append(X_29,"sys.dbg");
- X_46 := bat.append(X_36,"sys.L4");
- X_55 := bat.append(X_46,"sys.L11");
+ X_35 := bat.new(nil:int);
+ X_33 := bat.new(nil:int);
+ X_32 := bat.new(nil:str);
X_31 := bat.new(nil:str);
- X_38 := bat.append(X_31,"d");
- X_48 := bat.append(X_38,"e");
- X_57 := bat.append(X_48,"f");
- X_32 := bat.new(nil:str);
- X_40 := bat.append(X_32,"int");
- X_50 := bat.append(X_40,"bigint");
- X_59 := bat.append(X_50,"bigint");
- X_33 := bat.new(nil:int);
- X_42 := bat.append(X_33,32:int);
- X_52 := bat.append(X_42,64:int);
- X_60 := bat.append(X_52,63:int);
- X_35 := bat.new(nil:int);
- X_44 := bat.append(X_35,0:int);
- X_54 := bat.append(X_44,0:int);
- X_62 := bat.append(X_54,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","dbg");
+ X_17:bat[:int] := sql.bind(X_3,"sys","dbg","b",0:int);
+ X_19 := algebra.projection(C_4,X_17);
X_7:bat[:int] := sql.bind(X_3,"sys","dbg","a",0:int);
X_10 := algebra.projection(C_4,X_7);
(X_11,C1_14,r2_14) := group.subgroupdone(X_10);
X_14 := algebra.projection(C1_14,X_10);
- X_17:bat[:int] := sql.bind(X_3,"sys","dbg","b",0:int);
- X_19 := algebra.projection(C_4,X_17);
X_20:bat[:lng] := aggr.subsum(X_19,X_11,C1_14,true,true);
- X_15 := bat.setKey(X_14,true);
X_22:bat[:lng] := batcalc./(X_20,2:bte);
X_26:bat[:lng] := batcalc.*(X_22,2:bte);
+ X_15 := bat.setKey(X_14,true);
+ X_36 := bat.append(X_29,"sys.dbg");
+ X_38 := bat.append(X_31,"d");
+ X_40 := bat.append(X_32,"int");
+ X_42 := bat.append(X_33,32:int);
+ X_44 := bat.append(X_35,0:int);
+ X_46 := bat.append(X_36,"sys.L4");
+ X_48 := bat.append(X_38,"e");
+ X_50 := bat.append(X_40,"bigint");
+ X_52 := bat.append(X_42,64:int);
+ X_54 := bat.append(X_44,0:int);
+ X_55 := bat.append(X_46,"sys.L11");
+ X_57 := bat.append(X_48,"f");
+ X_59 := bat.append(X_50,"bigint");
+ X_60 := bat.append(X_52,63:int);
+ X_62 := bat.append(X_54,0:int);
sql.resultSet(X_55,X_57,X_59,X_60,X_62,X_15,X_20,X_26);
end user.s20_1;
#inline actions= 0 time=1 usec
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
@@ -48,23 +48,13 @@ Ready.
% clob # type
% 194 # length
function user.s6_1():void;
- X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","default_pipe",37:int);
+ X_0:void := querylog.define("explain\nselect t1.subject as id1, t2.subject
as id2\nfrom treeitems t1, treeitems t2\nwhere t2.pre between t1.pre and t1.pre
+ t1.size;","default_pipe",27:int);
barrier X_82 := language.dataflow();
X_37 := bat.new(nil:str);
- X_44 := bat.append(X_37,"sys.L2");
- X_54 := bat.append(X_44,"sys.L4");
+ X_43 := bat.new(nil:int);
+ X_41 := bat.new(nil:int);
+ X_40 := bat.new(nil:str);
X_39 := bat.new(nil:str);
- X_46 := bat.append(X_39,"id1");
- X_56 := bat.append(X_46,"id2");
- X_40 := bat.new(nil:str);
- X_48 := bat.append(X_40,"int");
- X_58 := bat.append(X_48,"int");
- X_41 := bat.new(nil:int);
- X_50 := bat.append(X_41,32:int);
- X_59 := bat.append(X_50,32:int);
- X_43 := bat.new(nil:int);
- X_52 := bat.append(X_43,0:int);
- X_60 := bat.append(X_52,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","treeitems");
X_7:bat[:lng] := sql.bind(X_3,"sys","treeitems","pre",0:int);
@@ -77,13 +67,23 @@ barrier X_82 := language.dataflow();
(X_22,r1_23) :=
algebra.subrangejoin(X_10,X_10,X_19,nil:BAT,nil:BAT,true,true,nil:lng);
X_29:bat[:int] := sql.bind(X_3,"sys","treeitems","subject",0:int);
X_31 := algebra.projection(C_4,X_29);
+ X_35 := algebra.projection(X_22,X_31);
X_32 := algebra.projection(r1_23,X_31);
- X_35 := algebra.projection(X_22,X_31);
language.pass(X_10);
language.pass(X_10);
language.pass(C_4);
language.pass(X_31);
exit X_82;
+ X_44 := bat.append(X_37,"sys.L2");
+ X_46 := bat.append(X_39,"id1");
+ X_48 := bat.append(X_40,"int");
+ X_50 := bat.append(X_41,32:int);
+ X_52 := bat.append(X_43,0:int);
+ X_54 := bat.append(X_44,"sys.L4");
+ X_56 := bat.append(X_46,"id2");
+ X_58 := bat.append(X_48,"int");
+ X_59 := bat.append(X_50,32:int);
+ X_60 := bat.append(X_52,0:int);
sql.resultSet(X_54,X_56,X_58,X_59,X_60,X_32,X_35);
end user.s6_1;
#inline actions= 0 time=3 usec
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
