Changeset: dbed55a1ad58 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbed55a1ad58
Modified Files:
        sql/test/mergetables/Tests/mergequery.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 891 to 300 lines):

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
@@ -90,226 +90,200 @@ Ready.
 % clob # type
 % 127 # length
 function user.s13_1{autoCommit=true}(A0:dbl,A1:dbl):void;
-    X_83:void  := querylog.define("explain insert into answ\nselect * from 
complete where x>=1.0 and x <=2.0;","default_pipe");
-barrier X_290 := language.dataflow();
+    X_61:void  := querylog.define("explain insert into answ\nselect * from 
complete where x>=1.0 and x <=2.0;","default_pipe");
+barrier X_295 := language.dataflow();
     X_4 := sql.mvc();
     X_5:bat[:oid,:dbl]  := bat.new(nil:oid,nil:dbl);
-    X_8:bat[:oid,:oid]  := sql.tid(X_4,"sys","part1");
-    X_11:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0);
-    X_107:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,0,4);
-    X_109:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,1,4);
-    X_111:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,2,4);
-    X_113:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,3,4);
-    (X_14,r1_14) := sql.bind(X_4,"sys","part1","x",2);
-    (X_114:bat[:oid,:oid] ,X_115:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,0,4);
-    (X_116:bat[:oid,:oid] ,X_117:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,1,4);
-    (X_118:bat[:oid,:oid] ,X_119:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,2,4);
-    (X_120:bat[:oid,:oid] ,X_121:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,3,4);
-    X_17:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",1);
-    X_208 := mat.packIncrement(X_107,4);
-    X_209 := mat.packIncrement(X_208,X_109);
-    X_210 := mat.packIncrement(X_209,X_111);
-exit X_290;
-barrier X_302 := language.dataflow();
-    X_11:bat[:oid,:dbl]  := mat.packIncrement(X_210,X_113);
-    X_97 := algebra.subselect(X_11,X_8,A0,A1,true,true,false);
-    X_192 := algebra.subselect(X_115,nil:bat[:oid,:oid],A0,A1,true,true,false);
-    X_193 := algebra.subselect(X_117,nil:bat[:oid,:oid],A0,A1,true,true,false);
-    X_194 := algebra.subselect(X_119,nil:bat[:oid,:oid],A0,A1,true,true,false);
-    X_195 := algebra.subselect(X_121,nil:bat[:oid,:oid],A0,A1,true,true,false);
-    X_100 := algebra.subselect(X_17,X_8,A0,A1,true,true,false);
-    X_212 := mat.packIncrement(X_114,4);
-    X_213 := mat.packIncrement(X_212,X_116);
-    X_214 := mat.packIncrement(X_213,X_118);
-    X_14 := mat.packIncrement(X_214,X_120);
-    X_216 := mat.packIncrement(X_192,4);
-    X_217 := mat.packIncrement(X_216,X_193);
-    X_218 := mat.packIncrement(X_217,X_194);
-    X_98 := mat.packIncrement(X_218,X_195);
-    X_19 := sql.subdelta(X_97,X_8,X_14,X_98,X_100);
-    X_220 := mat.packIncrement(X_115,4);
-    X_221 := mat.packIncrement(X_220,X_117);
-    X_222 := mat.packIncrement(X_221,X_119);
-    r1_14 := mat.packIncrement(X_222,X_121);
-    X_21 := sql.projectdelta(X_19,X_11,X_14,r1_14,X_17);
-    X_22 := bat.append(X_5,X_21,true);
-    X_23:bat[:oid,:oid]  := sql.tid(X_4,"sys","part2");
-    X_25:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0);
-    X_122:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0,0,4);
-    X_123:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0,1,4);
-    X_124:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0,2,4);
-    X_125:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0,3,4);
-    (X_26,r1_30) := sql.bind(X_4,"sys","part2","x",2);
-    (X_126:bat[:oid,:oid] ,X_127:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part2","x",2,0,4);
-    (X_128:bat[:oid,:oid] ,X_129:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part2","x",2,1,4);
-    (X_130:bat[:oid,:oid] ,X_131:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part2","x",2,2,4);
-    (X_132:bat[:oid,:oid] ,X_133:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part2","x",2,3,4);
-    X_28:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",1);
-    X_224 := mat.packIncrement(X_122,4);
-    X_225 := mat.packIncrement(X_224,X_123);
-    X_226 := mat.packIncrement(X_225,X_124);
+    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_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_16 := mat.packIncrement(X_236,X_193);
+    X_17 := bat.append(X_5,X_16,true);
+    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_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_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_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_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_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_8);
+    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_104);
+    language.pass(X_108);
+    language.pass(X_109);
+    language.pass(X_101);
+    language.pass(X_105);
+    language.pass(X_110);
+    language.pass(X_111);
+    language.pass(X_102);
+    language.pass(X_106);
+    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_115);
-    language.pass(X_117);
-    language.pass(X_119);
-    language.pass(X_121);
-    language.pass(X_11);
-    language.pass(X_14);
-    language.pass(X_17);
-exit X_302;
-barrier X_314 := language.dataflow();
-    X_25:bat[:oid,:dbl]  := mat.packIncrement(X_226,X_125);
-    X_101 := algebra.subselect(X_25,X_23,A0,A1,true,true,false);
-    X_197 := algebra.subselect(X_127,nil:bat[:oid,:oid],A0,A1,true,true,false);
-    X_199 := algebra.subselect(X_129,nil:bat[:oid,:oid],A0,A1,true,true,false);
-    X_201 := algebra.subselect(X_131,nil:bat[:oid,:oid],A0,A1,true,true,false);
-    X_203 := algebra.subselect(X_133,nil:bat[:oid,:oid],A0,A1,true,true,false);
-    X_104 := algebra.subselect(X_28,X_23,A0,A1,true,true,false);
-    X_228 := mat.packIncrement(X_126,4);
-    X_229 := mat.packIncrement(X_228,X_128);
-    X_230 := mat.packIncrement(X_229,X_130);
-    X_26 := mat.packIncrement(X_230,X_132);
-    X_232 := mat.packIncrement(X_197,4);
-    X_233 := mat.packIncrement(X_232,X_199);
-    X_234 := mat.packIncrement(X_233,X_201);
-    X_102 := mat.packIncrement(X_234,X_203);
-    X_29 := sql.subdelta(X_101,X_23,X_26,X_102,X_104);
-    X_236 := mat.packIncrement(X_127,4);
-    X_238 := mat.packIncrement(X_236,X_129);
-    X_239 := mat.packIncrement(X_238,X_131);
-    r1_30 := mat.packIncrement(X_239,X_133);
-    X_31 := sql.projectdelta(X_29,X_25,X_26,r1_30,X_28);
-    X_32 := bat.append(X_22,X_31,true);
-    language.pass(nil:bat[:oid,:oid]);
-    language.pass(X_23);
-    language.pass(X_127);
-    language.pass(X_129);
-    language.pass(X_131);
-    language.pass(X_133);
-    language.pass(X_25);
-    language.pass(X_26);
-    language.pass(X_28);
-exit X_314;
-    X_33 := sql.append(X_4,"sys","answ","x",X_32);
-barrier X_317 := language.dataflow();
-    X_37:bat[:oid,:dbl]  := bat.new(nil:oid,nil:dbl);
-    X_40:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part1","y",0);
-    X_134:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part1","y",0,0,4);
-    X_135:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part1","y",0,1,4);
-    X_136:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part1","y",0,2,4);
-    X_137:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part1","y",0,3,4);
-    (X_44,r1_53) := sql.bind(X_33,"sys","part1","y",2);
-    (X_140:bat[:oid,:oid] ,X_141:bat[:oid,:dbl] ) := 
sql.bind(X_33,"sys","part1","y",2,0,4);
-    (X_143:bat[:oid,:oid] ,X_144:bat[:oid,:dbl] ) := 
sql.bind(X_33,"sys","part1","y",2,1,4);
-    (X_146:bat[:oid,:oid] ,X_147:bat[:oid,:dbl] ) := 
sql.bind(X_33,"sys","part1","y",2,2,4);
-    (X_149:bat[:oid,:oid] ,X_150:bat[:oid,:dbl] ) := 
sql.bind(X_33,"sys","part1","y",2,3,4);
-    X_47:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part1","y",1);
-    X_241 := mat.packIncrement(X_134,4);
-    X_242 := mat.packIncrement(X_241,X_135);
-    X_243 := mat.packIncrement(X_242,X_136);
-exit X_317;
-barrier X_320 := language.dataflow();
-    X_40:bat[:oid,:dbl]  := mat.packIncrement(X_243,X_137);
-    X_245 := mat.packIncrement(X_140,4);
-    X_246 := mat.packIncrement(X_245,X_143);
-    X_247 := mat.packIncrement(X_246,X_146);
-    X_44 := mat.packIncrement(X_247,X_149);
-    X_249 := mat.packIncrement(X_141,4);
-    X_250 := mat.packIncrement(X_249,X_144);
-    X_251 := mat.packIncrement(X_250,X_147);
-    r1_53 := mat.packIncrement(X_251,X_150);
-    X_49 := sql.projectdelta(X_19,X_40,X_44,r1_53,X_47);
-    X_50 := bat.append(X_37,X_49,true);
-    X_51:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part2","y",0);
-    X_151:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part2","y",0,0,4);
-    X_152:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part2","y",0,1,4);
-    X_153:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part2","y",0,2,4);
-    X_154:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part2","y",0,3,4);
-    (X_53,r1_64) := sql.bind(X_33,"sys","part2","y",2);
-    (X_155:bat[:oid,:oid] ,X_156:bat[:oid,:dbl] ) := 
sql.bind(X_33,"sys","part2","y",2,0,4);
-    (X_157:bat[:oid,:oid] ,X_158:bat[:oid,:dbl] ) := 
sql.bind(X_33,"sys","part2","y",2,1,4);
-    (X_159:bat[:oid,:oid] ,X_160:bat[:oid,:dbl] ) := 
sql.bind(X_33,"sys","part2","y",2,2,4);
-    (X_161:bat[:oid,:oid] ,X_162:bat[:oid,:dbl] ) := 
sql.bind(X_33,"sys","part2","y",2,3,4);
-    X_55:bat[:oid,:dbl]  := sql.bind(X_33,"sys","part2","y",1);
-    X_253 := mat.packIncrement(X_151,4);
-    X_254 := mat.packIncrement(X_253,X_152);
-    X_255 := mat.packIncrement(X_254,X_153);
-exit X_320;
-barrier X_323 := language.dataflow();
-    X_51:bat[:oid,:dbl]  := mat.packIncrement(X_255,X_154);
-    X_257 := mat.packIncrement(X_155,4);
-    X_258 := mat.packIncrement(X_257,X_157);
-    X_259 := mat.packIncrement(X_258,X_159);
-    X_53 := mat.packIncrement(X_259,X_161);
-    X_261 := mat.packIncrement(X_156,4);
-    X_262 := mat.packIncrement(X_261,X_158);
-    X_263 := mat.packIncrement(X_262,X_160);
-    r1_64 := mat.packIncrement(X_263,X_162);
-    X_56 := sql.projectdelta(X_29,X_51,X_53,r1_64,X_55);
-    X_57 := bat.append(X_50,X_56,true);
-exit X_323;
-    X_59 := sql.append(X_33,"sys","answ","y",X_57);
-barrier X_326 := language.dataflow();
-    X_60:bat[:oid,:dbl]  := bat.new(nil:oid,nil:dbl);
-    X_61:bat[:oid,:dbl]  := sql.bind(X_59,"sys","part1","z",0);
-    X_163:bat[:oid,:dbl]  := sql.bind(X_59,"sys","part1","z",0,0,4);
-    X_164:bat[:oid,:dbl]  := sql.bind(X_59,"sys","part1","z",0,1,4);
-    X_165:bat[:oid,:dbl]  := sql.bind(X_59,"sys","part1","z",0,2,4);
-    X_166:bat[:oid,:dbl]  := sql.bind(X_59,"sys","part1","z",0,3,4);
-    (X_64,r1_78) := sql.bind(X_59,"sys","part1","z",2);
-    (X_167:bat[:oid,:oid] ,X_168:bat[:oid,:dbl] ) := 
sql.bind(X_59,"sys","part1","z",2,0,4);
-    (X_169:bat[:oid,:oid] ,X_170:bat[:oid,:dbl] ) := 
sql.bind(X_59,"sys","part1","z",2,1,4);
-    (X_171:bat[:oid,:oid] ,X_172:bat[:oid,:dbl] ) := 
sql.bind(X_59,"sys","part1","z",2,2,4);
-    (X_174:bat[:oid,:oid] ,X_175:bat[:oid,:dbl] ) := 
sql.bind(X_59,"sys","part1","z",2,3,4);
-    X_66:bat[:oid,:dbl]  := sql.bind(X_59,"sys","part1","z",1);
-    X_265 := mat.packIncrement(X_163,4);
-    X_266 := mat.packIncrement(X_265,X_164);
-    X_267 := mat.packIncrement(X_266,X_165);
-exit X_326;
-barrier X_329 := language.dataflow();
-    X_61:bat[:oid,:dbl]  := mat.packIncrement(X_267,X_166);
-    X_269 := mat.packIncrement(X_167,4);
-    X_271 := mat.packIncrement(X_269,X_169);
-    X_272 := mat.packIncrement(X_271,X_171);
-    X_64 := mat.packIncrement(X_272,X_174);
-    X_274 := mat.packIncrement(X_168,4);
-    X_275 := mat.packIncrement(X_274,X_170);
-    X_276 := mat.packIncrement(X_275,X_172);
-    r1_78 := mat.packIncrement(X_276,X_175);
-    X_67 := sql.projectdelta(X_19,X_61,X_64,r1_78,X_66);
-    X_68 := bat.append(X_60,X_67,true);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to