Changeset: baf5d9575fa3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=baf5d9575fa3
Modified Files:
        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: nostmt
Log Message:

approved output


diffs (216 lines):

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,56 +45,56 @@ Ready.
 % clob # type
 % 206 # length
 function user.s10_1():void;
-    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",52);
-barrier X_128 := language.dataflow();
-    X_52 := bat.new(nil:str);
-    X_59 := bat.append(X_52,".L17");
-    X_69 := bat.append(X_59,".L17");
-    X_54 := bat.new(nil:str);
-    X_61 := bat.append(X_54,"L4");
-    X_70 := bat.append(X_61,"v");
+    X_79: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",52);
+barrier X_131 := language.dataflow();
+    X_53 := bat.new(nil:str);
+    X_60 := bat.append(X_53,".L17");
+    X_70 := bat.append(X_60,".L17");
     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);
+    X_62 := bat.append(X_55,"L4");
+    X_71 := bat.append(X_62,"v");
+    X_56 := bat.new(nil:str);
+    X_64 := bat.append(X_56,"sec_interval");
+    X_73 := bat.append(X_64,"decimal");
+    X_57 := bat.new(nil:int);
+    X_66 := bat.append(X_57,13);
+    X_75 := bat.append(X_66,18);
+    X_59 := bat.new(nil:int);
+    X_68 := bat.append(X_59,0);
+    X_77 := bat.append(X_68,9);
+    X_45:bat[:lng] := bat.new(nil:lng);
     X_0 := sql.mvc();
-    C_96:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec",0,2);
-    X_99:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0,0,2);
-    X_104 := algebra.projection(C_96,X_99);
-    X_106 := mal.manifold("mtime","diff",X_104,"1970-01-01 00:00:00.000");
-    C_98:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec",1,2);
-    X_100:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0,1,2);
-    X_105 := algebra.projection(C_98,X_100);
-    X_107 := mal.manifold("mtime","diff",X_105,"1970-01-01 00:00:00.000");
-    X_119 := mat.packIncrement(X_106,2);
-    X_19:bat[:lng] := mat.packIncrement(X_119,X_107);
-    X_22 := bat.append(X_1,X_19,true);
-    C_24:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec");
-    X_25:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0);
-    X_30 := algebra.projection(C_24,X_25);
-    X_33:bat[:lng] := mal.manifold("mtime","diff",X_30,"1970-01-01 
00:00:00.000");
-    X_34 := bat.append(X_22,X_33,true);
-    X_35:bat[:lng] := bat.new(nil:lng);
-    X_101:bat[:lng] := sql.bind(X_0,"sys","foo_nil_2dec","v",0,0,2);
-    X_108 := algebra.projection(C_96,X_101);
-    X_102:bat[:lng] := sql.bind(X_0,"sys","foo_nil_2dec","v",0,1,2);
-    X_109 := algebra.projection(C_98,X_102);
-    X_122 := mat.packIncrement(X_108,2);
-    X_43 := mat.packIncrement(X_122,X_109);
-    X_44 := bat.append(X_35,X_43,true);
-    X_49 := algebra.project(X_33,nil:lng);
-    X_50 := bat.append(X_44,X_49,true);
-    language.pass(C_96);
-    language.pass(C_98);
-    language.pass(X_33);
-exit X_128;
-    sql.resultSet(X_69,X_70,X_72,X_74,X_75,X_34,X_50);
+    C_99:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec",0,2);
+    X_102:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0,0,2);
+    X_107 := algebra.projection(C_99,X_102);
+    X_111 := mal.manifold("mtime","diff",X_107,"1970-01-01 00:00:00.000");
+    C_101:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec",1,2);
+    X_103:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0,1,2);
+    X_108 := algebra.projection(C_101,X_103);
+    X_112 := mal.manifold("mtime","diff",X_108,"1970-01-01 00:00:00.000");
+    X_122 := mat.packIncrement(X_111,2);
+    X_24:bat[:lng] := mat.packIncrement(X_122,X_112);
+    X_46 := bat.append(X_45,X_24,true);
+    C_27:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec");
+    X_28:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0);
+    X_33 := algebra.projection(C_27,X_28);
+    X_36:bat[:lng] := mal.manifold("mtime","diff",X_33,"1970-01-01 
00:00:00.000");
+    X_48 := bat.append(X_46,X_36,true);
+    X_49:bat[:lng] := bat.new(nil:lng);
+    X_104:bat[:lng] := sql.bind(X_0,"sys","foo_nil_2dec","v",0,0,2);
+    X_109 := algebra.projection(C_99,X_104);
+    X_105:bat[:lng] := sql.bind(X_0,"sys","foo_nil_2dec","v",0,1,2);
+    X_110 := algebra.projection(C_101,X_105);
+    X_125 := mat.packIncrement(X_109,2);
+    X_20 := mat.packIncrement(X_125,X_110);
+    X_50 := bat.append(X_49,X_20,true);
+    X_44 := algebra.project(X_36,nil:lng);
+    X_51 := bat.append(X_50,X_44,true);
+    language.pass(C_99);
+    language.pass(C_101);
+    language.pass(X_36);
+exit X_131;
+    sql.resultSet(X_70,X_71,X_73,X_75,X_77,X_48,X_51);
 end user.s10_1;
 #inline               actions= 0 time=2 usec 
 #remap                actions= 2 time=11 usec 
diff --git 
a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single 
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
@@ -45,56 +45,56 @@ Ready.
 % clob # type
 % 206 # length
 function user.s10_1():void;
-    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",52);
-barrier X_128 := language.dataflow();
-    X_52 := bat.new(nil:str);
-    X_59 := bat.append(X_52,".L17");
-    X_69 := bat.append(X_59,".L17");
-    X_54 := bat.new(nil:str);
-    X_61 := bat.append(X_54,"L4");
-    X_70 := bat.append(X_61,"v");
+    X_79: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",52);
+barrier X_131 := language.dataflow();
+    X_53 := bat.new(nil:str);
+    X_60 := bat.append(X_53,".L17");
+    X_70 := bat.append(X_60,".L17");
     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);
+    X_62 := bat.append(X_55,"L4");
+    X_71 := bat.append(X_62,"v");
+    X_56 := bat.new(nil:str);
+    X_64 := bat.append(X_56,"sec_interval");
+    X_73 := bat.append(X_64,"decimal");
+    X_57 := bat.new(nil:int);
+    X_66 := bat.append(X_57,13);
+    X_75 := bat.append(X_66,18);
+    X_59 := bat.new(nil:int);
+    X_68 := bat.append(X_59,0);
+    X_77 := bat.append(X_68,9);
+    X_45:bat[:lng] := bat.new(nil:lng);
     X_0 := sql.mvc();
-    C_96:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec",0,2);
-    X_99:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0,0,2);
-    X_104 := algebra.projection(C_96,X_99);
-    X_106 := mal.manifold("mtime","diff",X_104,"1970-01-01 00:00:00.000");
-    C_98:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec",1,2);
-    X_100:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0,1,2);
-    X_105 := algebra.projection(C_98,X_100);
-    X_107 := mal.manifold("mtime","diff",X_105,"1970-01-01 00:00:00.000");
-    X_119 := mat.packIncrement(X_106,2);
-    X_19:bat[:lng] := mat.packIncrement(X_119,X_107);
-    X_22 := bat.append(X_1,X_19,true);
-    C_24:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec");
-    X_25:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0);
-    X_30 := algebra.projection(C_24,X_25);
-    X_33:bat[:lng] := mal.manifold("mtime","diff",X_30,"1970-01-01 
00:00:00.000");
-    X_34 := bat.append(X_22,X_33,true);
-    X_35:bat[:lng] := bat.new(nil:lng);
-    X_101:bat[:lng] := sql.bind(X_0,"sys","foo_nil_2dec","v",0,0,2);
-    X_108 := algebra.projection(C_96,X_101);
-    X_102:bat[:lng] := sql.bind(X_0,"sys","foo_nil_2dec","v",0,1,2);
-    X_109 := algebra.projection(C_98,X_102);
-    X_122 := mat.packIncrement(X_108,2);
-    X_43 := mat.packIncrement(X_122,X_109);
-    X_44 := bat.append(X_35,X_43,true);
-    X_49 := algebra.project(X_33,nil:lng);
-    X_50 := bat.append(X_44,X_49,true);
-    language.pass(C_96);
-    language.pass(C_98);
-    language.pass(X_33);
-exit X_128;
-    sql.resultSet(X_69,X_70,X_72,X_74,X_75,X_34,X_50);
+    C_99:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec",0,2);
+    X_102:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0,0,2);
+    X_107 := algebra.projection(C_99,X_102);
+    X_111 := mal.manifold("mtime","diff",X_107,"1970-01-01 00:00:00.000");
+    C_101:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec",1,2);
+    X_103:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0,1,2);
+    X_108 := algebra.projection(C_101,X_103);
+    X_112 := mal.manifold("mtime","diff",X_108,"1970-01-01 00:00:00.000");
+    X_122 := mat.packIncrement(X_111,2);
+    X_24:bat[:lng] := mat.packIncrement(X_122,X_112);
+    X_46 := bat.append(X_45,X_24,true);
+    C_27:bat[:oid] := sql.tid(X_0,"sys","foo_nil_2dec");
+    X_28:bat[:timestamp] := sql.bind(X_0,"sys","foo_nil_2dec","t",0);
+    X_33 := algebra.projection(C_27,X_28);
+    X_36:bat[:lng] := mal.manifold("mtime","diff",X_33,"1970-01-01 
00:00:00.000");
+    X_48 := bat.append(X_46,X_36,true);
+    X_49:bat[:lng] := bat.new(nil:lng);
+    X_104:bat[:lng] := sql.bind(X_0,"sys","foo_nil_2dec","v",0,0,2);
+    X_109 := algebra.projection(C_99,X_104);
+    X_105:bat[:lng] := sql.bind(X_0,"sys","foo_nil_2dec","v",0,1,2);
+    X_110 := algebra.projection(C_101,X_105);
+    X_125 := mat.packIncrement(X_109,2);
+    X_20 := mat.packIncrement(X_125,X_110);
+    X_50 := bat.append(X_49,X_20,true);
+    X_44 := algebra.project(X_36,nil:lng);
+    X_51 := bat.append(X_50,X_44,true);
+    language.pass(C_99);
+    language.pass(C_101);
+    language.pass(X_36);
+exit X_131;
+    sql.resultSet(X_70,X_71,X_73,X_75,X_77,X_48,X_51);
 end user.s10_1;
 #inline               actions= 0 time=2 usec 
 #remap                actions= 2 time=11 usec 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to