Changeset: 8af8bc623d40 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8af8bc623d40
Modified Files:
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 864 to 300 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,57 +45,57 @@ Ready.
% 204 # length
function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
X_51: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");
-barrier X_110 := language.dataflow();
+barrier X_109 := language.dataflow();
X_6:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
X_5 := sql.mvc();
- X_67:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
- X_70:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
- (X_72:bat[:oid,:oid] ,X_73:bat[:oid,:timestamp] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
- X_82 := sql.delta(X_70,X_72,X_73);
- X_84 := algebra.leftfetchjoin(X_67,X_82);
+ X_66:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
+ X_69:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
+ (X_71:bat[:oid,:oid] ,X_72:bat[:oid,:timestamp] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
+ X_81 := sql.delta(X_69,X_71,X_72);
+ X_83 := algebra.leftfetchjoin(X_66,X_81);
X_16 := calc.timestamp(A0,7);
+ X_85 := algebra.project(X_83,X_16);
+ X_87 := batmtime.diff(X_83,X_85);
+ X_68:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
+ X_70:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
+ (X_73:bat[:oid,:oid] ,X_74:bat[:oid,:timestamp] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
+ X_14:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
+ X_82 := sql.delta(X_70,X_73,X_74,X_14);
+ X_84 := algebra.leftfetchjoin(X_68,X_82);
X_86 := algebra.project(X_84,X_16);
X_88 := batmtime.diff(X_84,X_86);
- X_69:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
- X_71:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
- (X_74:bat[:oid,:oid] ,X_75:bat[:oid,:timestamp] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
- X_14:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
- X_83 := sql.delta(X_71,X_74,X_75,X_14);
- X_85 := algebra.leftfetchjoin(X_69,X_83);
- X_87 := algebra.project(X_85,X_16);
- X_89 := batmtime.diff(X_85,X_87);
- X_100 := mat.packIncrement(X_88,2);
- X_18:bat[:oid,:lng] := mat.packIncrement(X_100,X_89);
+ X_99 := mat.packIncrement(X_87,2);
+ X_18:bat[:oid,:lng] := mat.packIncrement(X_99,X_88);
X_19 := bat.append(X_6,X_18,true);
X_20 := calc.timestamp(A1,7);
+ X_91 := algebra.project(X_83,X_20);
+ X_93 := batmtime.diff(X_83,X_91);
X_92 := algebra.project(X_84,X_20);
X_94 := batmtime.diff(X_84,X_92);
- X_93 := algebra.project(X_85,X_20);
- X_95 := batmtime.diff(X_85,X_93);
- X_102 := mat.packIncrement(X_94,2);
- X_21:bat[:oid,:lng] := mat.packIncrement(X_102,X_95);
+ X_101 := mat.packIncrement(X_93,2);
+ X_21:bat[:oid,:lng] := mat.packIncrement(X_101,X_94);
X_22 := bat.append(X_19,X_21,true);
X_24:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
- X_76:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
- (X_78:bat[:oid,:oid] ,X_79:bat[:oid,:lng] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
- X_96 := sql.delta(X_76,X_78,X_79);
- X_98 := algebra.leftfetchjoin(X_67,X_96);
- X_77:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
- (X_80:bat[:oid,:oid] ,X_81:bat[:oid,:lng] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
+ X_75:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
+ (X_77:bat[:oid,:oid] ,X_78:bat[:oid,:lng] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
+ X_95 := sql.delta(X_75,X_77,X_78);
+ X_97 := algebra.leftfetchjoin(X_66,X_95);
+ X_76:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
+ (X_79:bat[:oid,:oid] ,X_80:bat[:oid,:lng] ) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
X_32:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",1);
- X_97 := sql.delta(X_77,X_80,X_81,X_32);
- X_99 := algebra.leftfetchjoin(X_69,X_97);
- X_104 := mat.packIncrement(X_98,2);
- X_34 := mat.packIncrement(X_104,X_99);
+ X_96 := sql.delta(X_76,X_79,X_80,X_32);
+ X_98 := algebra.leftfetchjoin(X_68,X_96);
+ X_103 := mat.packIncrement(X_97,2);
+ X_34 := mat.packIncrement(X_103,X_98);
X_35 := bat.append(X_24,X_34,true);
X_36 := sql.single(nil:lng);
X_37:bat[:oid,:lng] := batcalc.lng(X_36,18,9);
X_40 := bat.append(X_35,X_37,true);
+ language.pass(X_83);
language.pass(X_84);
- language.pass(X_85);
- language.pass(X_67);
- language.pass(X_69);
-exit X_110;
+ language.pass(X_66);
+ language.pass(X_68);
+exit X_109;
X_41 := sql.resultSet(2,1,X_22);
sql.rsColumn(X_41,".L5","L2","bigint",64,0,X_22);
sql.rsColumn(X_41,".L5","v","decimal",18,9,X_40);
diff --git a/sql/test/mergetables/Tests/mergequery.stable.out
b/sql/test/mergetables/Tests/mergequery.stable.out
--- a/sql/test/mergetables/Tests/mergequery.stable.out
+++ b/sql/test/mergetables/Tests/mergequery.stable.out
@@ -91,196 +91,196 @@ Ready.
% 127 # length
function user.s13_1{autoCommit=true}(A0:dbl,A1:dbl):void;
X_61:void := querylog.define("explain insert into answ\nselect * from
complete where x>=1.0 and x <=2.0;","default_pipe");
-barrier X_296 := language.dataflow();
+barrier X_295 := language.dataflow();
X_4 := sql.mvc();
X_5:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);
- X_89:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0,0,4);
- X_82:bat[:oid,:oid] := sql.tid(X_4,"sys","part1",0,4);
- X_176 := algebra.subselect(X_89,X_82,A0,A1,true,true,false);
- (X_93:bat[:oid,:oid] ,X_94:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part1","x",2,0,4);
- X_180 := algebra.subselect(X_94,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_187 := sql.subdelta(X_176,X_82,X_93,X_180);
- X_191 := sql.projectdelta(X_187,X_89,X_93,X_94);
- X_90:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0,1,4);
- X_84:bat[:oid,:oid] := sql.tid(X_4,"sys","part1",1,4);
- X_177 := algebra.subselect(X_90,X_84,A0,A1,true,true,false);
- (X_95:bat[:oid,:oid] ,X_96:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part1","x",2,1,4);
- X_182 := algebra.subselect(X_96,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_188 := sql.subdelta(X_177,X_84,X_95,X_182);
- X_192 := sql.projectdelta(X_188,X_90,X_95,X_96);
- X_91:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0,2,4);
- X_86:bat[:oid,:oid] := sql.tid(X_4,"sys","part1",2,4);
- X_178 := algebra.subselect(X_91,X_86,A0,A1,true,true,false);
- (X_97:bat[:oid,:oid] ,X_98:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part1","x",2,2,4);
- X_184 := algebra.subselect(X_98,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_189 := sql.subdelta(X_178,X_86,X_97,X_184);
- X_193 := sql.projectdelta(X_189,X_91,X_97,X_98);
- X_92:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0,3,4);
- X_88:bat[:oid,:oid] := sql.tid(X_4,"sys","part1",3,4);
- X_179 := algebra.subselect(X_92,X_88,A0,A1,true,true,false);
- (X_99:bat[:oid,:oid] ,X_100:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part1","x",2,3,4);
- X_186 := algebra.subselect(X_100,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ X_88:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0,0,4);
+ X_81:bat[:oid,:oid] := sql.tid(X_4,"sys","part1",0,4);
+ X_175 := algebra.subselect(X_88,X_81,A0,A1,true,true,false);
+ (X_92:bat[:oid,:oid] ,X_93:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part1","x",2,0,4);
+ X_179 := algebra.subselect(X_93,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ X_186 := sql.subdelta(X_175,X_81,X_92,X_179);
+ X_190 := sql.projectdelta(X_186,X_88,X_92,X_93);
+ X_89:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0,1,4);
+ X_83:bat[:oid,:oid] := sql.tid(X_4,"sys","part1",1,4);
+ X_176 := algebra.subselect(X_89,X_83,A0,A1,true,true,false);
+ (X_94:bat[:oid,:oid] ,X_95:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part1","x",2,1,4);
+ X_181 := algebra.subselect(X_95,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ X_187 := sql.subdelta(X_176,X_83,X_94,X_181);
+ X_191 := sql.projectdelta(X_187,X_89,X_94,X_95);
+ X_90:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0,2,4);
+ X_85:bat[:oid,:oid] := sql.tid(X_4,"sys","part1",2,4);
+ X_177 := algebra.subselect(X_90,X_85,A0,A1,true,true,false);
+ (X_96:bat[:oid,:oid] ,X_97:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part1","x",2,2,4);
+ X_183 := algebra.subselect(X_97,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ X_188 := sql.subdelta(X_177,X_85,X_96,X_183);
+ X_192 := sql.projectdelta(X_188,X_90,X_96,X_97);
+ X_91:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0,3,4);
+ X_87:bat[:oid,:oid] := sql.tid(X_4,"sys","part1",3,4);
+ X_178 := algebra.subselect(X_91,X_87,A0,A1,true,true,false);
+ (X_98:bat[:oid,:oid] ,X_99:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part1","x",2,3,4);
+ X_185 := algebra.subselect(X_99,nil:bat[:oid,:oid],A0,A1,true,true,false);
X_13:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",1);
- X_77 := algebra.subselect(X_13,X_88,A0,A1,true,true,false);
- X_190 := sql.subdelta(X_179,X_88,X_99,X_186,X_77);
- X_194 := sql.projectdelta(X_190,X_92,X_99,X_100,X_13);
- X_235 := mat.packIncrement(X_191,4);
+ X_76 := algebra.subselect(X_13,X_87,A0,A1,true,true,false);
+ X_189 := sql.subdelta(X_178,X_87,X_98,X_185,X_76);
+ X_193 := sql.projectdelta(X_189,X_91,X_98,X_99,X_13);
+ X_234 := mat.packIncrement(X_190,4);
+ X_235 := mat.packIncrement(X_234,X_191);
X_236 := mat.packIncrement(X_235,X_192);
- X_237 := mat.packIncrement(X_236,X_193);
- X_16 := mat.packIncrement(X_237,X_194);
+ X_16 := mat.packIncrement(X_236,X_193);
X_17 := bat.append(X_5,X_16,true);
- X_105:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0,0,4);
- X_101:bat[:oid,:oid] := sql.tid(X_4,"sys","part2",0,4);
+ X_104:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0,0,4);
+ X_100:bat[:oid,:oid] := sql.tid(X_4,"sys","part2",0,4);
+ X_194 := algebra.subselect(X_104,X_100,A0,A1,true,true,false);
+ (X_108:bat[:oid,:oid] ,X_109:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part2","x",2,0,4);
+ X_198 := algebra.subselect(X_109,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ X_203 := sql.subdelta(X_194,X_100,X_108,X_198);
+ X_207 := sql.projectdelta(X_203,X_104,X_108,X_109);
+ X_105:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0,1,4);
+ X_101:bat[:oid,:oid] := sql.tid(X_4,"sys","part2",1,4);
X_195 := algebra.subselect(X_105,X_101,A0,A1,true,true,false);
- (X_109:bat[:oid,:oid] ,X_110:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part2","x",2,0,4);
- X_199 := algebra.subselect(X_110,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_204 := sql.subdelta(X_195,X_101,X_109,X_199);
- X_208 := sql.projectdelta(X_204,X_105,X_109,X_110);
- X_106:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0,1,4);
- X_102:bat[:oid,:oid] := sql.tid(X_4,"sys","part2",1,4);
+ (X_110:bat[:oid,:oid] ,X_111:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part2","x",2,1,4);
+ X_199 := algebra.subselect(X_111,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ X_204 := sql.subdelta(X_195,X_101,X_110,X_199);
+ X_209 := sql.projectdelta(X_204,X_105,X_110,X_111);
+ X_106:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0,2,4);
+ X_102:bat[:oid,:oid] := sql.tid(X_4,"sys","part2",2,4);
X_196 := algebra.subselect(X_106,X_102,A0,A1,true,true,false);
- (X_111:bat[:oid,:oid] ,X_112:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part2","x",2,1,4);
- X_200 := algebra.subselect(X_112,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_205 := sql.subdelta(X_196,X_102,X_111,X_200);
- X_210 := sql.projectdelta(X_205,X_106,X_111,X_112);
- X_107:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0,2,4);
- X_103:bat[:oid,:oid] := sql.tid(X_4,"sys","part2",2,4);
+ (X_112:bat[:oid,:oid] ,X_113:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part2","x",2,2,4);
+ X_200 := algebra.subselect(X_113,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ X_205 := sql.subdelta(X_196,X_102,X_112,X_200);
+ X_211 := sql.projectdelta(X_205,X_106,X_112,X_113);
+ X_107:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0,3,4);
+ X_103:bat[:oid,:oid] := sql.tid(X_4,"sys","part2",3,4);
X_197 := algebra.subselect(X_107,X_103,A0,A1,true,true,false);
- (X_113:bat[:oid,:oid] ,X_114:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part2","x",2,2,4);
- X_201 := algebra.subselect(X_114,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_206 := sql.subdelta(X_197,X_103,X_113,X_201);
- X_212 := sql.projectdelta(X_206,X_107,X_113,X_114);
- X_108:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0,3,4);
- X_104:bat[:oid,:oid] := sql.tid(X_4,"sys","part2",3,4);
- X_198 := algebra.subselect(X_108,X_104,A0,A1,true,true,false);
- (X_116:bat[:oid,:oid] ,X_117:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part2","x",2,3,4);
- X_202 := algebra.subselect(X_117,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ (X_115:bat[:oid,:oid] ,X_116:bat[:oid,:dbl] ) :=
sql.bind(X_4,"sys","part2","x",2,3,4);
+ X_201 := algebra.subselect(X_116,nil:bat[:oid,:oid],A0,A1,true,true,false);
X_19:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",1);
- X_79 := algebra.subselect(X_19,X_104,A0,A1,true,true,false);
- X_207 := sql.subdelta(X_198,X_104,X_116,X_202,X_79);
- X_214 := sql.projectdelta(X_207,X_108,X_116,X_117,X_19);
- X_239 := mat.packIncrement(X_208,4);
- X_240 := mat.packIncrement(X_239,X_210);
- X_241 := mat.packIncrement(X_240,X_212);
- X_21 := mat.packIncrement(X_241,X_214);
+ X_78 := algebra.subselect(X_19,X_103,A0,A1,true,true,false);
+ X_206 := sql.subdelta(X_197,X_103,X_115,X_201,X_78);
+ X_213 := sql.projectdelta(X_206,X_107,X_115,X_116,X_19);
+ X_238 := mat.packIncrement(X_207,4);
+ X_239 := mat.packIncrement(X_238,X_209);
+ X_240 := mat.packIncrement(X_239,X_211);
+ X_21 := mat.packIncrement(X_240,X_213);
X_22 := bat.append(X_17,X_21,true);
- language.pass(X_82);
- language.pass(X_89);
- language.pass(X_93);
- language.pass(X_94);
- language.pass(X_84);
- language.pass(X_90);
- language.pass(X_95);
- language.pass(X_96);
- language.pass(X_86);
- language.pass(X_91);
- language.pass(X_97);
- language.pass(X_98);
- language.pass(nil:bat[:oid,:oid]);
+ language.pass(X_81);
language.pass(X_88);
language.pass(X_92);
+ language.pass(X_93);
+ language.pass(X_83);
+ language.pass(X_89);
+ language.pass(X_94);
+ language.pass(X_95);
+ language.pass(X_85);
+ language.pass(X_90);
+ language.pass(X_96);
+ language.pass(X_97);
+ language.pass(nil:bat[:oid,:oid]);
+ language.pass(X_87);
+ language.pass(X_91);
+ language.pass(X_98);
language.pass(X_99);
+ language.pass(X_13);
language.pass(X_100);
- language.pass(X_13);
+ language.pass(X_104);
+ language.pass(X_108);
+ language.pass(X_109);
language.pass(X_101);
language.pass(X_105);
- language.pass(X_109);
language.pass(X_110);
+ language.pass(X_111);
language.pass(X_102);
language.pass(X_106);
- language.pass(X_111);
language.pass(X_112);
+ language.pass(X_113);
+ language.pass(nil:bat[:oid,:oid]);
language.pass(X_103);
language.pass(X_107);
- language.pass(X_113);
- language.pass(X_114);
- language.pass(nil:bat[:oid,:oid]);
- language.pass(X_104);
- language.pass(X_108);
+ language.pass(X_115);
language.pass(X_116);
- language.pass(X_117);
language.pass(X_19);
-exit X_296;
+exit X_295;
X_23 := sql.append(X_4,"sys","answ","x",X_22);
-barrier X_299 := language.dataflow();
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
