Changeset: 2a00d9cc1a9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a00d9cc1a9a
Modified Files:
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
Branch: jit
Log Message:
Approve
diffs (truncated from 484 to 300 lines):
diff --git a/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
b/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
--- a/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
+++ b/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
@@ -64,35 +64,35 @@ Ready.
% 193 # length
function user.s4_1():void;
X_51:void := querylog.define("explain select replace(a1,a2,a3), id\nfrom
(\n select name as a1, \\'a\\' as a2, \\'A\\' as a3, id as id \n from
sys.functions\n) as x;","sequential_pipe",32);
- X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"sys.L1");
- X_43 := bat.append(X_35,"sys.x");
+ X_27 := bat.new(nil:str);
+ X_34 := bat.append(X_27,"sys.L1");
+ X_43 := bat.append(X_34,"sys.x");
+ X_29 := bat.new(nil:str);
+ X_36 := bat.append(X_29,"L1");
+ X_45 := bat.append(X_36,"id");
X_30 := bat.new(nil:str);
- X_37 := bat.append(X_30,"L1");
- X_45 := bat.append(X_37,"id");
- X_31 := bat.new(nil:str);
- X_39 := bat.append(X_31,"varchar");
- X_46 := bat.append(X_39,"int");
- X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,0);
- X_48 := bat.append(X_41,32);
- X_34 := bat.new(nil:int);
- X_42 := bat.append(X_34,0);
+ X_38 := bat.append(X_30,"varchar");
+ X_46 := bat.append(X_38,"int");
+ X_31 := bat.new(nil:int);
+ X_40 := bat.append(X_31,0);
+ X_48 := bat.append(X_40,32);
+ X_33 := bat.new(nil:int);
+ X_42 := bat.append(X_33,0);
X_50 := bat.append(X_42,0);
- X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","functions");
- X_7:bat[:str] := sql.bind(X_3,"sys","functions","name",0);
- (C_10,r1_10) := sql.bind(X_3,"sys","functions","name",2);
- X_13:bat[:str] := sql.bind(X_3,"sys","functions","name",1);
- X_15 := sql.delta(X_7,C_10,r1_10,X_13);
- X_16 := algebra.projection(C_4,X_15);
- X_17:bat[:str] := mal.manifold("str","replace",X_16,"a","A");
- X_20:bat[:int] := sql.bind(X_3,"sys","functions","id",0);
- (C_22,r1_24) := sql.bind(X_3,"sys","functions","id",2);
- X_24:bat[:int] := sql.bind(X_3,"sys","functions","id",1);
- X_25 := sql.delta(X_20,C_22,r1_24,X_24);
- X_26 := algebra.projection(C_4,X_25);
- sql.resultSet(X_43,X_45,X_46,X_48,X_50,X_17,X_26);
+ X_0 := sql.mvc();
+ X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
+ (X_7,r1_10) := sql.bind(X_0,"sys","functions","name",2);
+ X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
+ X_12 := sql.delta(X_4,X_7,r1_10,X_10);
+ X_13 := algebra.projection(X_1,X_12);
+ X_16:bat[:str] := mal.manifold("str","replace",X_13,"a","A");
+ X_19:bat[:int] := sql.bind(X_0,"sys","functions","id",0);
+ (X_21,r1_24) := sql.bind(X_0,"sys","functions","id",2);
+ X_23:bat[:int] := sql.bind(X_0,"sys","functions","id",1);
+ X_24 := sql.delta(X_19,X_21,r1_24,X_23);
+ X_25 := algebra.projection(X_1,X_24);
+ sql.resultSet(X_43,X_45,X_46,X_48,X_50,X_16,X_25);
end user.s4_1;
#inline actions= 0 time=3 usec
#candidates actions= 1 time=21 usec
@@ -129,40 +129,40 @@ end user.s4_1;
% clob # type
% 197 # length
function user.s6_1():void;
- X_56:void := querylog.define("explain select replace(a1,a2,a3), id\nfrom
(\n select name as a1, \\'a\\' as a2, \\'A\\' as a3, id + 1 as id \n from
sys.functions\n) as x;","sequential_pipe",36);
- X_33 := bat.new(nil:str);
- X_40 := bat.append(X_33,"sys.L1");
- X_48 := bat.append(X_40,"sys.x");
- X_35 := bat.new(nil:str);
- X_42 := bat.append(X_35,"L1");
- X_50 := bat.append(X_42,"id");
+ X_59:void := querylog.define("explain select replace(a1,a2,a3), id\nfrom
(\n select name as a1, \\'a\\' as a2, \\'A\\' as a3, id + 1 as id \n from
sys.functions\n) as x;","sequential_pipe",36);
+ X_34 := bat.new(nil:str);
+ X_41 := bat.append(X_34,"sys.L1");
+ X_50 := bat.append(X_41,"sys.x");
X_36 := bat.new(nil:str);
- X_44 := bat.append(X_36,"varchar");
- X_51 := bat.append(X_44,"bigint");
- X_37 := bat.new(nil:int);
- X_46 := bat.append(X_37,0);
- X_53 := bat.append(X_46,64);
- X_39 := bat.new(nil:int);
- X_47 := bat.append(X_39,0);
- X_55 := bat.append(X_47,0);
- X_4 := sql.mvc();
- C_5:bat[:oid] := sql.tid(X_4,"sys","functions");
- X_8:bat[:str] := sql.bind(X_4,"sys","functions","name",0);
- (C_11,r1_11) := sql.bind(X_4,"sys","functions","name",2);
- X_14:bat[:str] := sql.bind(X_4,"sys","functions","name",1);
- X_16 := sql.delta(X_8,C_11,r1_11,X_14);
- X_17 := algebra.projection(C_5,X_16);
- X_18:bat[:int] := sql.bind(X_4,"sys","functions","id",0);
- (C_20,r1_20) := sql.bind(X_4,"sys","functions","id",2);
- X_22:bat[:int] := sql.bind(X_4,"sys","functions","id",1);
- X_23 := sql.delta(X_18,C_20,r1_20,X_22);
- X_24 := algebra.projection(C_5,X_23);
- X_25 := algebra.project(X_24,"a");
- X_26 := algebra.project(X_24,"A");
- X_27:bat[:str] := mal.manifold("str","replace",X_17,X_25,X_26);
- X_30 := batcalc.lng(X_24);
- X_31:bat[:lng] := batcalc.+(X_30,1);
- sql.resultSet(X_48,X_50,X_51,X_53,X_55,X_27,X_31);
+ X_43 := bat.append(X_36,"L1");
+ X_52 := bat.append(X_43,"id");
+ X_37 := bat.new(nil:str);
+ X_45 := bat.append(X_37,"varchar");
+ X_54 := bat.append(X_45,"bigint");
+ X_38 := bat.new(nil:int);
+ X_47 := bat.append(X_38,0);
+ X_56 := bat.append(X_47,64);
+ X_40 := bat.new(nil:int);
+ X_49 := bat.append(X_40,0);
+ X_58 := bat.append(X_49,0);
+ X_0 := sql.mvc();
+ X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
+ (X_7,r1_11) := sql.bind(X_0,"sys","functions","name",2);
+ X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
+ X_12 := sql.delta(X_4,X_7,r1_11,X_10);
+ X_13 := algebra.projection(X_1,X_12);
+ X_14:bat[:int] := sql.bind(X_0,"sys","functions","id",0);
+ (X_16,r1_20) := sql.bind(X_0,"sys","functions","id",2);
+ X_18:bat[:int] := sql.bind(X_0,"sys","functions","id",1);
+ X_19 := sql.delta(X_14,X_16,r1_20,X_18);
+ X_20 := algebra.projection(X_1,X_19);
+ X_22 := algebra.project(X_20,"a");
+ X_24 := algebra.project(X_20,"A");
+ X_25:bat[:str] := mal.manifold("str","replace",X_13,X_22,X_24);
+ X_28 := batcalc.lng(X_20);
+ X_30:bat[:lng] := batcalc.+(X_28,1);
+ sql.resultSet(X_50,X_52,X_54,X_56,X_58,X_25,X_30);
end user.s6_1;
#inline actions= 0 time=3 usec
#candidates actions= 1 time=23 usec
@@ -199,39 +199,39 @@ end user.s6_1;
% clob # type
% 198 # length
function user.s8_1():void;
- X_54:void := querylog.define("explain select replace(a1,a2,a3), id\nfrom
(\n select name as a1, \\'a\\' as a2, \\'A\\' as a3, abs(id) as id \n from
sys.functions\n) as x;","sequential_pipe",35);
- X_31 := bat.new(nil:str);
- X_38 := bat.append(X_31,"sys.L1");
- X_46 := bat.append(X_38,"sys.x");
- X_33 := bat.new(nil:str);
- X_40 := bat.append(X_33,"L1");
- X_48 := bat.append(X_40,"id");
+ X_57:void := querylog.define("explain select replace(a1,a2,a3), id\nfrom
(\n select name as a1, \\'a\\' as a2, \\'A\\' as a3, abs(id) as id \n from
sys.functions\n) as x;","sequential_pipe",35);
+ X_32 := bat.new(nil:str);
+ X_39 := bat.append(X_32,"sys.L1");
+ X_48 := bat.append(X_39,"sys.x");
X_34 := bat.new(nil:str);
- X_42 := bat.append(X_34,"varchar");
- X_49 := bat.append(X_42,"int");
- X_35 := bat.new(nil:int);
- X_44 := bat.append(X_35,0);
- X_51 := bat.append(X_44,32);
- X_37 := bat.new(nil:int);
- X_45 := bat.append(X_37,0);
- X_53 := bat.append(X_45,0);
- X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","functions");
- X_7:bat[:str] := sql.bind(X_3,"sys","functions","name",0);
- (C_10,r1_10) := sql.bind(X_3,"sys","functions","name",2);
- X_13:bat[:str] := sql.bind(X_3,"sys","functions","name",1);
- X_15 := sql.delta(X_7,C_10,r1_10,X_13);
- X_16 := algebra.projection(C_4,X_15);
- X_17:bat[:int] := sql.bind(X_3,"sys","functions","id",0);
- (C_19,r1_19) := sql.bind(X_3,"sys","functions","id",2);
- X_21:bat[:int] := sql.bind(X_3,"sys","functions","id",1);
- X_22 := sql.delta(X_17,C_19,r1_19,X_21);
- X_23 := algebra.projection(C_4,X_22);
- X_24 := algebra.project(X_23,"a");
- X_25 := algebra.project(X_23,"A");
- X_26:bat[:str] := mal.manifold("str","replace",X_16,X_24,X_25);
- X_29:bat[:int] := batcalc.abs(X_23);
- sql.resultSet(X_46,X_48,X_49,X_51,X_53,X_26,X_29);
+ X_41 := bat.append(X_34,"L1");
+ X_50 := bat.append(X_41,"id");
+ X_35 := bat.new(nil:str);
+ X_43 := bat.append(X_35,"varchar");
+ X_52 := bat.append(X_43,"int");
+ X_36 := bat.new(nil:int);
+ X_45 := bat.append(X_36,0);
+ X_54 := bat.append(X_45,32);
+ X_38 := bat.new(nil:int);
+ X_47 := bat.append(X_38,0);
+ X_56 := bat.append(X_47,0);
+ X_0 := sql.mvc();
+ X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
+ (X_7,r1_10) := sql.bind(X_0,"sys","functions","name",2);
+ X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
+ X_12 := sql.delta(X_4,X_7,r1_10,X_10);
+ X_13 := algebra.projection(X_1,X_12);
+ X_14:bat[:int] := sql.bind(X_0,"sys","functions","id",0);
+ (X_16,r1_19) := sql.bind(X_0,"sys","functions","id",2);
+ X_18:bat[:int] := sql.bind(X_0,"sys","functions","id",1);
+ X_19 := sql.delta(X_14,X_16,r1_19,X_18);
+ X_20 := algebra.projection(X_1,X_19);
+ X_22 := algebra.project(X_20,"a");
+ X_24 := algebra.project(X_20,"A");
+ X_25:bat[:str] := mal.manifold("str","replace",X_13,X_22,X_24);
+ X_28:bat[:int] := batcalc.abs(X_20);
+ sql.resultSet(X_48,X_50,X_52,X_54,X_56,X_25,X_28);
end user.s8_1;
#inline actions= 0 time=3 usec
#candidates actions= 1 time=20 usec
diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
@@ -45,69 +45,69 @@ Ready.
% clob # type
% 206 # length
function user.s10_1():void;
- X_57:void := querylog.define("explain select (t-(select timestamp
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",65);
-barrier X_119 := language.dataflow();
- X_35 := bat.new(nil:str);
- X_42 := bat.append(X_35,".L5");
- X_51 := bat.append(X_42,".L5");
- X_37 := bat.new(nil:str);
- X_44 := bat.append(X_37,"L2");
- X_52 := bat.append(X_44,"v");
- X_38 := bat.new(nil:str);
- X_46 := bat.append(X_38,"sec_interval");
- X_53 := bat.append(X_46,"decimal");
- X_39 := bat.new(nil:int);
- X_48 := bat.append(X_39,13);
- X_55 := bat.append(X_48,18);
- X_41 := bat.new(nil:int);
- X_50 := bat.append(X_41,0);
- X_56 := bat.append(X_50,9);
- X_3:bat[:lng] := bat.new(nil:lng);
- X_2 := sql.mvc();
- C_75:bat[:oid] := sql.tid(X_2,"sys","foo_nil_2dec",0,2);
- X_77:bat[:timestamp] := sql.bind(X_2,"sys","foo_nil_2dec","t",0,0,2);
- (C_79:bat[:oid],X_80:bat[:timestamp]) :=
sql.bind(X_2,"sys","foo_nil_2dec","t",2,0,2);
- X_90 := sql.delta(X_77,C_79,X_80);
- X_92 := algebra.projection(C_75,X_90);
- X_94 := mal.manifold("mtime","diff",X_92,"1970-01-01 00:00:00.000");
- C_76:bat[:oid] := sql.tid(X_2,"sys","foo_nil_2dec",1,2);
- X_78:bat[:timestamp] := sql.bind(X_2,"sys","foo_nil_2dec","t",0,1,2);
- (C_81:bat[:oid],X_82:bat[:timestamp]) :=
sql.bind(X_2,"sys","foo_nil_2dec","t",2,1,2);
- X_10:bat[:timestamp] := sql.bind(X_2,"sys","foo_nil_2dec","t",1);
- X_91 := sql.delta(X_78,C_81,X_82,X_10);
- X_93 := algebra.projection(C_76,X_91);
- X_95 := mal.manifold("mtime","diff",X_93,"1970-01-01 00:00:00.000");
- X_109 := mat.packIncrement(X_94,2);
- X_12:bat[:lng] := mat.packIncrement(X_109,X_95);
- X_15 := bat.append(X_3,X_12,true);
- C_17:bat[:oid] := sql.tid(X_2,"sys","foo_nil_2dec");
- X_18:bat[:timestamp] := sql.bind(X_2,"sys","foo_nil_2dec","t",0);
- (C_19,r1_30) := sql.bind(X_2,"sys","foo_nil_2dec","t",2);
- X_21 := sql.delta(X_18,C_19,r1_30,X_10);
- X_22 := algebra.projection(C_17,X_21);
- X_23:bat[:lng] := mal.manifold("mtime","diff",X_22,"1970-01-01
00:00:00.000");
- X_24 := bat.append(X_15,X_23,true);
- X_25:bat[:lng] := bat.new(nil:lng);
- X_83:bat[:lng] := sql.bind(X_2,"sys","foo_nil_2dec","v",0,0,2);
- (C_85:bat[:oid],X_86:bat[:lng]) :=
sql.bind(X_2,"sys","foo_nil_2dec","v",2,0,2);
- X_96 := sql.delta(X_83,C_85,X_86);
- X_98 := algebra.projection(C_75,X_96);
- X_84:bat[:lng] := sql.bind(X_2,"sys","foo_nil_2dec","v",0,1,2);
- (C_87:bat[:oid],X_88:bat[:lng]) :=
sql.bind(X_2,"sys","foo_nil_2dec","v",2,1,2);
- X_27:bat[:lng] := sql.bind(X_2,"sys","foo_nil_2dec","v",1);
- X_97 := sql.delta(X_84,C_87,X_88,X_27);
- X_99 := algebra.projection(C_76,X_97);
- X_112 := mat.packIncrement(X_98,2);
- X_28 := mat.packIncrement(X_112,X_99);
- X_29 := bat.append(X_25,X_28,true);
- X_32 := algebra.project(X_23,nil:lng);
- X_33 := bat.append(X_29,X_32,true);
- language.pass(X_10);
- language.pass(C_75);
- language.pass(C_76);
- language.pass(X_23);
-exit X_119;
- sql.resultSet(X_51,X_52,X_53,X_55,X_56,X_24,X_33);
+ X_76:void := querylog.define("explain select (t-(select timestamp
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",65);
+barrier X_136 := language.dataflow();
+ X_52 := bat.new(nil:str);
+ X_59 := bat.append(X_52,".L5");
+ X_69 := bat.append(X_59,".L5");
+ X_54 := bat.new(nil:str);
+ X_61 := bat.append(X_54,"L2");
+ X_70 := bat.append(X_61,"v");
+ X_55 := bat.new(nil:str);
+ X_63 := bat.append(X_55,"sec_interval");
+ X_72 := bat.append(X_63,"decimal");
+ X_56 := bat.new(nil:int);
+ X_65 := bat.append(X_56,13);
+ X_74 := bat.append(X_65,18);
+ X_58 := bat.new(nil:int);
+ X_67 := bat.append(X_58,0);
+ X_75 := bat.append(X_67,9);
+ X_1:bat[:lng] := bat.new(nil:lng);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
