Changeset: 217fa448bbc6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=217fa448bbc6
Modified Files:
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: Dec2016
Log Message:
Approve EXPLAIN output after changeset 9b7490e6a80f.
diffs (truncated from 2298 to 300 lines):
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
@@ -170,17 +170,12 @@ end user.s8_1;
% clob # type
% 100 # length
function user.s16_1():void;
- X_0:void := querylog.define("explain select fuse(a,b) from
udf_fuse;","sequential_pipe",19:int);
+ X_0:void := querylog.define("explain select fuse(a,b) from
udf_fuse;","sequential_pipe",14:int);
X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"sys.L2");
+ X_34 := bat.new(nil:int);
+ X_32 := bat.new(nil:int);
+ X_31 := bat.new(nil:str);
X_30 := bat.new(nil:str);
- X_37 := bat.append(X_30,"L2");
- X_31 := bat.new(nil:str);
- X_39 := bat.append(X_31,"smallint");
- X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,16:int);
- X_34 := bat.new(nil:int);
- X_43 := bat.append(X_34,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","udf_fuse");
X_7:bat[:bte] := sql.bind(X_3,"sys","udf_fuse","a",0:int);
@@ -188,6 +183,11 @@ function user.s16_1():void;
X_17:bat[:bte] := sql.bind(X_3,"sys","udf_fuse","b",0:int);
X_23 := algebra.projection(C_4,X_17);
X_24:bat[:sht] := batudf.fuse(X_16,X_23);
+ X_35 := bat.append(X_28,"sys.L2");
+ X_37 := bat.append(X_30,"L2");
+ X_39 := bat.append(X_31,"smallint");
+ X_41 := bat.append(X_32,16:int);
+ X_43 := bat.append(X_34,0:int);
sql.resultSet(X_35,X_37,X_39,X_41,X_43,X_24);
end user.s16_1;
#inline actions= 0 time=4 usec
@@ -221,17 +221,12 @@ end user.s16_1;
% clob # type
% 100 # length
function user.s18_1():void;
- X_0:void := querylog.define("explain select fuse(c,d) from
udf_fuse;","sequential_pipe",19:int);
+ X_0:void := querylog.define("explain select fuse(c,d) from
udf_fuse;","sequential_pipe",14:int);
X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"sys.L2");
+ X_34 := bat.new(nil:int);
+ X_32 := bat.new(nil:int);
+ X_31 := bat.new(nil:str);
X_30 := bat.new(nil:str);
- X_37 := bat.append(X_30,"L2");
- X_31 := bat.new(nil:str);
- X_39 := bat.append(X_31,"int");
- X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,32:int);
- X_34 := bat.new(nil:int);
- X_43 := bat.append(X_34,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","udf_fuse");
X_7:bat[:sht] := sql.bind(X_3,"sys","udf_fuse","c",0:int);
@@ -239,6 +234,11 @@ function user.s18_1():void;
X_17:bat[:sht] := sql.bind(X_3,"sys","udf_fuse","d",0:int);
X_23 := algebra.projection(C_4,X_17);
X_24:bat[:int] := batudf.fuse(X_16,X_23);
+ X_35 := bat.append(X_28,"sys.L2");
+ X_37 := bat.append(X_30,"L2");
+ X_39 := bat.append(X_31,"int");
+ X_41 := bat.append(X_32,32:int);
+ X_43 := bat.append(X_34,0:int);
sql.resultSet(X_35,X_37,X_39,X_41,X_43,X_24);
end user.s18_1;
#inline actions= 0 time=2 usec
@@ -272,17 +272,12 @@ end user.s18_1;
% clob # type
% 100 # length
function user.s20_1():void;
- X_0:void := querylog.define("explain select fuse(e,f) from
udf_fuse;","sequential_pipe",19:int);
+ X_0:void := querylog.define("explain select fuse(e,f) from
udf_fuse;","sequential_pipe",14:int);
X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"sys.L2");
+ X_34 := bat.new(nil:int);
+ X_32 := bat.new(nil:int);
+ X_31 := bat.new(nil:str);
X_30 := bat.new(nil:str);
- X_37 := bat.append(X_30,"L2");
- X_31 := bat.new(nil:str);
- X_39 := bat.append(X_31,"bigint");
- X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,64:int);
- X_34 := bat.new(nil:int);
- X_43 := bat.append(X_34,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","udf_fuse");
X_7:bat[:int] := sql.bind(X_3,"sys","udf_fuse","e",0:int);
@@ -290,6 +285,11 @@ function user.s20_1():void;
X_17:bat[:int] := sql.bind(X_3,"sys","udf_fuse","f",0:int);
X_23 := algebra.projection(C_4,X_17);
X_24:bat[:lng] := batudf.fuse(X_16,X_23);
+ X_35 := bat.append(X_28,"sys.L2");
+ X_37 := bat.append(X_30,"L2");
+ X_39 := bat.append(X_31,"bigint");
+ X_41 := bat.append(X_32,64:int);
+ X_43 := bat.append(X_34,0:int);
sql.resultSet(X_35,X_37,X_39,X_41,X_43,X_24);
end user.s20_1;
#inline actions= 0 time=2 usec
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
@@ -109,22 +109,22 @@ end user.s4_1;
% clob # type
% 104 # length
function user.s12_1():void;
- X_0:void := querylog.define("explain select reverse(x) from
udf_reverse;","sequential_pipe",17:int);
+ X_0:void := querylog.define("explain select reverse(x) from
udf_reverse;","sequential_pipe",12:int);
X_21 := bat.new(nil:str);
- X_28 := bat.append(X_21,"sys.L2");
+ X_27 := bat.new(nil:int);
+ X_25 := bat.new(nil:int);
+ X_24 := bat.new(nil:str);
X_23 := bat.new(nil:str);
- X_30 := bat.append(X_23,"L2");
- X_24 := bat.new(nil:str);
- X_32 := bat.append(X_24,"clob");
- X_25 := bat.new(nil:int);
- X_34 := bat.append(X_25,0:int);
- X_27 := bat.new(nil:int);
- X_35 := bat.append(X_27,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","udf_reverse");
X_7:bat[:str] := sql.bind(X_3,"sys","udf_reverse","x",0:int);
X_16 := algebra.projection(C_4,X_7);
X_17:bat[:str] := batudf.reverse(X_16);
+ X_28 := bat.append(X_21,"sys.L2");
+ X_30 := bat.append(X_23,"L2");
+ X_32 := bat.append(X_24,"clob");
+ X_34 := bat.append(X_25,0:int);
+ X_35 := bat.append(X_27,0:int);
sql.resultSet(X_28,X_30,X_32,X_34,X_35,X_17);
end user.s12_1;
#inline actions= 0 time=4 usec
diff --git
a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
--- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
+++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
@@ -43,7 +43,7 @@ function user.s8_1():void;
X_22 := bat.new(nil:int);
C_25 := algebra.subselect(X_22,nil:int,nil:int,true,true,true);
X_28 := algebra.projection(C_25,X_22);
- (X_29,r1_30,r2_30) := group.subgroupdone(X_28);
+ (X_29,C1_30,r2_30) := group.subgroupdone(X_28);
X_32 := aggr.count(r2_30);
X_33:lng := aggr.sum(r2_30);
X_34:bit := calc.isnil(X_33);
@@ -85,7 +85,7 @@ function user.s10_1():void;
X_22 := bat.new(nil:int);
C_25 := algebra.subselect(X_22,nil:int,nil:int,true,true,true);
X_28 := algebra.projection(C_25,X_22);
- (X_29,r1_30,r2_30) := group.subgroupdone(X_28);
+ (X_29,C1_30,r2_30) := group.subgroupdone(X_28);
X_32 := aggr.count(r2_30);
X_33:lng := aggr.sum(r2_30);
X_34:bit := calc.isnil(X_33);
@@ -139,7 +139,7 @@ function user.s18_1():void;
X_22 := bat.new(nil:int);
C_25 := algebra.subselect(X_22,nil:int,nil:int,true,true,true);
X_28 := algebra.projection(C_25,X_22);
- (X_29,r1_30,r2_30) := group.subgroupdone(X_28);
+ (X_29,C1_30,r2_30) := group.subgroupdone(X_28);
X_32 := aggr.count(r2_30);
X_33:lng := aggr.sum(r2_30);
X_34:bit := calc.isnil(X_33);
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -21,8 +21,8 @@ Ready.
# 16:24:01 >
#debug select * from tables;
-mdb>#X_0=0@0:void := querylog.define("debug select * from
tables;","sequential_pipe",156:int);
-mdb>#X_198=nil:bat[:str] := bat.new(nil:str);
+mdb>#X_0=0@0:void := querylog.define("debug select * from
tables;","sequential_pipe",16:int);
+mdb>#X_4=nil:bat[:int] := bat.new(nil:int);
# 16:24:01 >
# 16:24:01 > "Done."
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
--- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
+++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
@@ -40,17 +40,12 @@ Ready.
% clob # type
% 116 # length
function user.s10_1():void;
- X_0:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe",24:int);
+ X_0:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe",19:int);
X_43 := bat.new(nil:str);
- X_50 := bat.append(X_43,"sys.L3");
+ X_49 := bat.new(nil:int);
+ X_47 := bat.new(nil:int);
+ X_46 := bat.new(nil:str);
X_45 := bat.new(nil:str);
- X_52 := bat.append(X_45,"L2");
- X_46 := bat.new(nil:str);
- X_54 := bat.append(X_46,"bigint");
- X_47 := bat.new(nil:int);
- X_56 := bat.append(X_47,64:int);
- X_49 := bat.new(nil:int);
- X_58 := bat.append(X_49,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","t2564");
X_7:bat[:int] := sql.bind(X_3,"sys","t2564","c3",0:int);
@@ -63,6 +58,11 @@ function user.s10_1():void;
(X_34,C1_35,r2_35) := group.subgroup(X_23,X_31);
(X_37,C1_38,r2_38) := group.subgroupdone(X_16,X_34);
X_40:bat[:lng] := aggr.subcount(X_37,X_37,C1_38,false);
+ X_50 := bat.append(X_43,"sys.L3");
+ X_52 := bat.append(X_45,"L2");
+ X_54 := bat.append(X_46,"bigint");
+ X_56 := bat.append(X_47,64:int);
+ X_58 := bat.append(X_49,0:int);
sql.resultSet(X_50,X_52,X_54,X_56,X_58,X_40);
end user.s10_1;
#inline actions= 0 time=2 usec
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
@@ -40,17 +40,12 @@ Ready.
% clob # type
% 116 # length
function user.s10_1():void;
- X_0:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe",24:int);
+ X_0:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe",19:int);
X_43 := bat.new(nil:str);
- X_50 := bat.append(X_43,"sys.L3");
+ X_49 := bat.new(nil:int);
+ X_47 := bat.new(nil:int);
+ X_46 := bat.new(nil:str);
X_45 := bat.new(nil:str);
- X_52 := bat.append(X_45,"L2");
- X_46 := bat.new(nil:str);
- X_54 := bat.append(X_46,"bigint");
- X_47 := bat.new(nil:int);
- X_56 := bat.append(X_47,64:int);
- X_49 := bat.new(nil:int);
- X_58 := bat.append(X_49,0:int);
X_3 := sql.mvc();
C_4:bat[:oid] := sql.tid(X_3,"sys","t2564");
X_7:bat[:int] := sql.bind(X_3,"sys","t2564","c3",0:int);
@@ -63,6 +58,11 @@ function user.s10_1():void;
(X_34,C1_35,r2_35) := group.subgroup(X_23,X_31);
(X_37,C1_38,r2_38) := group.subgroupdone(X_16,X_34);
X_40:bat[:lng] := aggr.subcount(X_37,X_37,C1_38,false);
+ X_50 := bat.append(X_43,"sys.L3");
+ X_52 := bat.append(X_45,"L2");
+ X_54 := bat.append(X_46,"bigint");
+ X_56 := bat.append(X_47,64:int);
+ X_58 := bat.append(X_49,0:int);
sql.resultSet(X_50,X_52,X_54,X_56,X_58,X_40);
end user.s10_1;
#inline actions= 0 time=1 usec
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
@@ -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,"hugeint");
- X_59 := bat.append(X_50,"hugeint");
- X_33 := bat.new(nil:int);
- X_42 := bat.append(X_33,32:int);
- X_52 := bat.append(X_42,128:int);
- X_60 := bat.append(X_52,127: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);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
