Changeset: 5a578eedfea2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a578eedfea2
Modified Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
Branch: default
Log Message:
Approvals.
diffs (280 lines):
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
@@ -46,42 +46,42 @@ project (
% clob # type
% 142 # length
function user.s4_1(A0:lng,A1:bte):void;
- X_60:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b)
/ (select 2))) as f from dbg group by d;","sequential_pipe",38);
+ X_59:void := querylog.define("explain select a as d, sum(b), (2 * (sum(b)
/ (select 2))) as f from dbg group by d;","sequential_pipe",38);
X_26 := bat.new(nil:oid,nil:str);
X_34 := bat.append(X_26,"sys.dbg");
- X_44 := bat.append(X_34,"sys.L1");
- X_53 := bat.append(X_44,".L3");
+ X_43 := bat.append(X_34,"sys.L1");
+ X_52 := bat.append(X_43,".L3");
X_29 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_29,"d");
- X_46 := bat.append(X_36,"L1");
- X_55 := bat.append(X_46,"f");
+ X_45 := bat.append(X_36,"L1");
+ X_54 := bat.append(X_45,"f");
X_30 := bat.new(nil:oid,nil:str);
X_38 := bat.append(X_30,"int");
- X_48 := bat.append(X_38,"bigint");
- X_57 := bat.append(X_48,"bigint");
+ X_47 := bat.append(X_38,"bigint");
+ X_56 := bat.append(X_47,"bigint");
X_31 := bat.new(nil:oid,nil:int);
X_40 := bat.append(X_31,32);
- X_50 := bat.append(X_40,64);
- X_58 := bat.append(X_50,64);
+ X_49 := bat.append(X_40,64);
+ X_57 := bat.append(X_49,64);
X_33 := bat.new(nil:oid,nil:int);
X_42 := bat.append(X_33,0);
- X_52 := bat.append(X_42,0);
- X_59 := bat.append(X_52,0);
+ X_51 := bat.append(X_42,0);
+ X_58 := bat.append(X_51,0);
X_3 := sql.mvc();
- X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","dbg");
+ C_4:bat[:oid,:oid] := sql.tid(X_3,"sys","dbg");
X_7:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","a",0);
- X_10 := algebra.leftfetchjoin(X_4,X_7);
+ X_10 := algebra.leftfetchjoin(C_4,X_7);
(X_11,r1_11,r2_11) := group.subgroupdone(X_10);
X_14 := algebra.leftfetchjoin(r1_11,X_10);
X_15:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","b",0);
- X_17 := algebra.leftfetchjoin(X_4,X_15);
+ X_17 := algebra.leftfetchjoin(C_4,X_15);
X_18:bat[:oid,:lng] := aggr.subsum(X_17,X_11,r1_11,true,true);
X_20 := algebra.project(X_10,A1);
X_21 := algebra.leftfetchjoin(r1_11,X_20);
X_22 := batcalc.lng(X_21);
X_23:bat[:oid,:lng] := batcalc./(X_18,X_22);
X_24:bat[:oid,:lng] := batcalc.*(A0,X_23);
- sql.resultSet(X_53,X_55,X_57,X_58,X_59,X_14,X_18,X_24);
+ sql.resultSet(X_52,X_54,X_56,X_57,X_58,X_14,X_18,X_24);
end user.s4_1;
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
@@ -114,42 +114,42 @@ project (
% clob # type
% 147 # length
function user.s10_1(A0:lng,A1:bte):void;
- X_60: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",38);
+ X_59: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",38);
X_26 := bat.new(nil:oid,nil:str);
X_34 := bat.append(X_26,"sys.dbg");
- X_44 := bat.append(X_34,"sys.L1");
- X_53 := bat.append(X_44,".L3");
+ X_43 := bat.append(X_34,"sys.L1");
+ X_52 := bat.append(X_43,".L3");
X_29 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_29,"d");
- X_46 := bat.append(X_36,"e");
- X_55 := bat.append(X_46,"f");
+ X_45 := bat.append(X_36,"e");
+ X_54 := bat.append(X_45,"f");
X_30 := bat.new(nil:oid,nil:str);
X_38 := bat.append(X_30,"int");
- X_48 := bat.append(X_38,"bigint");
- X_57 := bat.append(X_48,"bigint");
+ X_47 := bat.append(X_38,"bigint");
+ X_56 := bat.append(X_47,"bigint");
X_31 := bat.new(nil:oid,nil:int);
X_40 := bat.append(X_31,32);
- X_50 := bat.append(X_40,64);
- X_58 := bat.append(X_50,64);
+ X_49 := bat.append(X_40,64);
+ X_57 := bat.append(X_49,64);
X_33 := bat.new(nil:oid,nil:int);
X_42 := bat.append(X_33,0);
- X_52 := bat.append(X_42,0);
- X_59 := bat.append(X_52,0);
+ X_51 := bat.append(X_42,0);
+ X_58 := bat.append(X_51,0);
X_3 := sql.mvc();
- X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","dbg");
+ C_4:bat[:oid,:oid] := sql.tid(X_3,"sys","dbg");
X_7:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","a",0);
- X_10 := algebra.leftfetchjoin(X_4,X_7);
+ X_10 := algebra.leftfetchjoin(C_4,X_7);
(X_11,r1_11,r2_11) := group.subgroupdone(X_10);
X_14 := algebra.leftfetchjoin(r1_11,X_10);
X_15:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","b",0);
- X_17 := algebra.leftfetchjoin(X_4,X_15);
+ X_17 := algebra.leftfetchjoin(C_4,X_15);
X_18:bat[:oid,:lng] := aggr.subsum(X_17,X_11,r1_11,true,true);
X_20 := algebra.project(X_10,A1);
X_21 := algebra.leftfetchjoin(r1_11,X_20);
X_22 := batcalc.lng(X_21);
X_23:bat[:oid,:lng] := batcalc./(X_18,X_22);
X_24:bat[:oid,:lng] := batcalc.*(A0,X_23);
- sql.resultSet(X_53,X_55,X_57,X_58,X_59,X_14,X_18,X_24);
+ sql.resultSet(X_52,X_54,X_56,X_57,X_58,X_14,X_18,X_24);
end user.s10_1;
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP
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
@@ -46,41 +46,41 @@ Ready.
% clob # type
% 192 # length
function user.s2_1():void;
- X_48: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);
-barrier X_62 := language.dataflow();
+ X_47: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);
+barrier X_60 := language.dataflow();
X_24 := bat.new(nil:oid,nil:str);
X_32 := bat.append(X_24,"sys.L");
- X_42 := bat.append(X_32,"sys.L");
+ X_41 := bat.append(X_32,"sys.L");
X_27 := bat.new(nil:oid,nil:str);
X_34 := bat.append(X_27,"id1");
- X_43 := bat.append(X_34,"id2");
+ X_42 := bat.append(X_34,"id2");
X_28 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_28,"int");
- X_45 := bat.append(X_36,"int");
+ X_44 := bat.append(X_36,"int");
X_29 := bat.new(nil:oid,nil:int);
X_38 := bat.append(X_29,32);
- X_46 := bat.append(X_38,32);
+ X_45 := bat.append(X_38,32);
X_31 := bat.new(nil:oid,nil:int);
X_40 := bat.append(X_31,0);
- X_47 := bat.append(X_40,0);
+ X_46 := bat.append(X_40,0);
X_1 := sql.mvc();
- X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
+ C_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
- X_8 := algebra.leftfetchjoin(X_2,X_5);
+ X_8 := algebra.leftfetchjoin(C_2,X_5);
X_9:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","size",0);
- X_11 := algebra.leftfetchjoin(X_2,X_9);
+ X_11 := algebra.leftfetchjoin(C_2,X_9);
X_12:bat[:oid,:lng] := batcalc.+(X_8,X_11);
(X_13,r1_18) :=
algebra.subrangejoin(X_8,X_8,X_12,nil:BAT,nil:BAT,true,true,nil:lng);
X_18:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
- X_20 := algebra.leftfetchjoin(X_2,X_18);
+ X_20 := algebra.leftfetchjoin(C_2,X_18);
X_21 := algebra.leftfetchjoin(r1_18,X_20);
X_22 := algebra.leftfetchjoin(X_13,X_20);
language.pass(X_8);
language.pass(X_8);
- language.pass(X_2);
+ language.pass(C_2);
language.pass(X_20);
-exit X_62;
- sql.resultSet(X_42,X_43,X_45,X_46,X_47,X_21,X_22);
+exit X_60;
+ sql.resultSet(X_41,X_42,X_44,X_45,X_46,X_21,X_22);
end user.s2_1;
#ROLLBACK;
diff --git
a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
@@ -46,37 +46,37 @@ Ready.
% clob # type
% 192 # length
function user.s2_1():void;
- X_50: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",33);
+ X_49: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",33);
X_26 := bat.new(nil:oid,nil:str);
X_34 := bat.append(X_26,"sys.L");
- X_44 := bat.append(X_34,"sys.L");
+ X_43 := bat.append(X_34,"sys.L");
X_29 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_29,"id1");
- X_45 := bat.append(X_36,"id2");
+ X_44 := bat.append(X_36,"id2");
X_30 := bat.new(nil:oid,nil:str);
X_38 := bat.append(X_30,"int");
- X_47 := bat.append(X_38,"int");
+ X_46 := bat.append(X_38,"int");
X_31 := bat.new(nil:oid,nil:int);
X_40 := bat.append(X_31,32);
- X_48 := bat.append(X_40,32);
+ X_47 := bat.append(X_40,32);
X_33 := bat.new(nil:oid,nil:int);
X_42 := bat.append(X_33,0);
- X_49 := bat.append(X_42,0);
+ X_48 := bat.append(X_42,0);
X_1 := sql.mvc();
- X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
+ C_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
- X_8 := algebra.leftfetchjoin(X_2,X_5);
+ X_8 := algebra.leftfetchjoin(C_2,X_5);
X_9 := batcalc.hge(X_8);
X_10:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","size",0);
- X_12 := algebra.leftfetchjoin(X_2,X_10);
+ X_12 := algebra.leftfetchjoin(C_2,X_10);
X_13 := batcalc.hge(X_12);
X_14:bat[:oid,:hge] := batcalc.+(X_9,X_13);
(X_15,r1_22) :=
algebra.subrangejoin(X_9,X_9,X_14,nil:BAT,nil:BAT,true,true,nil:lng);
X_20:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
- X_22 := algebra.leftfetchjoin(X_2,X_20);
+ X_22 := algebra.leftfetchjoin(C_2,X_20);
X_23 := algebra.leftfetchjoin(r1_22,X_22);
X_24 := algebra.leftfetchjoin(X_15,X_22);
- sql.resultSet(X_44,X_45,X_47,X_48,X_49,X_23,X_24);
+ sql.resultSet(X_43,X_44,X_46,X_47,X_48,X_23,X_24);
end user.s2_1;
#ROLLBACK;
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
@@ -46,35 +46,35 @@ Ready.
% clob # type
% 192 # length
function user.s2_1():void;
- X_48: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",31);
+ X_47: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",31);
X_24 := bat.new(nil:oid,nil:str);
X_32 := bat.append(X_24,"sys.L");
- X_42 := bat.append(X_32,"sys.L");
+ X_41 := bat.append(X_32,"sys.L");
X_27 := bat.new(nil:oid,nil:str);
X_34 := bat.append(X_27,"id1");
- X_43 := bat.append(X_34,"id2");
+ X_42 := bat.append(X_34,"id2");
X_28 := bat.new(nil:oid,nil:str);
X_36 := bat.append(X_28,"int");
- X_45 := bat.append(X_36,"int");
+ X_44 := bat.append(X_36,"int");
X_29 := bat.new(nil:oid,nil:int);
X_38 := bat.append(X_29,32);
- X_46 := bat.append(X_38,32);
+ X_45 := bat.append(X_38,32);
X_31 := bat.new(nil:oid,nil:int);
X_40 := bat.append(X_31,0);
- X_47 := bat.append(X_40,0);
+ X_46 := bat.append(X_40,0);
X_1 := sql.mvc();
- X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
+ C_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
- X_8 := algebra.leftfetchjoin(X_2,X_5);
+ X_8 := algebra.leftfetchjoin(C_2,X_5);
X_9:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","size",0);
- X_11 := algebra.leftfetchjoin(X_2,X_9);
+ X_11 := algebra.leftfetchjoin(C_2,X_9);
X_12:bat[:oid,:lng] := batcalc.+(X_8,X_11);
(X_13,r1_18) :=
algebra.subrangejoin(X_8,X_8,X_12,nil:BAT,nil:BAT,true,true,nil:lng);
X_18:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
- X_20 := algebra.leftfetchjoin(X_2,X_18);
+ X_20 := algebra.leftfetchjoin(C_2,X_18);
X_21 := algebra.leftfetchjoin(r1_18,X_20);
X_22 := algebra.leftfetchjoin(X_13,X_20);
- sql.resultSet(X_42,X_43,X_45,X_46,X_47,X_21,X_22);
+ sql.resultSet(X_41,X_42,X_44,X_45,X_46,X_21,X_22);
end user.s2_1;
#ROLLBACK;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
