Changeset: 459835ea538a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=459835ea538a
Modified Files:
        sql/test/mapi/Tests/sql_int128.stable.out.int128
        sql/test/mergetables/Tests/mergequery.stable.out
        sql/test/miscellaneous/Tests/simple_plans.stable.out
        sql/test/remote/Tests/partition_elim.stable.out
Branch: copybinary
Log Message:

Approve


diffs (truncated from 1114 to 300 lines):

diff --git a/sql/test/mapi/Tests/sql_int128.stable.out.int128 
b/sql/test/mapi/Tests/sql_int128.stable.out.int128
--- a/sql/test/mapi/Tests/sql_int128.stable.out.int128
+++ b/sql/test/mapi/Tests/sql_int128.stable.out.int128
@@ -15,13 +15,13 @@ stdout of test 'sql_int128` in directory
 % 118 # length
 function user.main():void;
     X_1:void := querylog.define("explain update mytest set a = 
1234567890987654321;":str, "default_pipe":str, 39:int);
-barrier X_110:bit := language.dataflow();
+barrier X_112:bit := language.dataflow();
     X_4:int := sql.mvc();
     C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
     X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str, 
0:int);
     X_47:bat[:hge] := algebra.projection(C_5:bat[:oid], X_17:bat[:hge]);
     X_54:bat[:hge] := algebra.project(X_47:bat[:hge], 1234567890987654321:hge);
-exit X_110:bit;
+exit X_112:bit;
     X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "a":str, 
C_5:bat[:oid], X_54:bat[:hge]);
     X_59:lng := aggr.count(C_5:bat[:oid]);
     sql.affectedRows(X_56:int, X_59:lng);
@@ -61,13 +61,13 @@ end user.main;
 % 110 # length
 function user.main():void;
     X_1:void := querylog.define("explain update mytest set b = 
10000000000;":str, "default_pipe":str, 39:int);
-barrier X_110:bit := language.dataflow();
+barrier X_112:bit := language.dataflow();
     X_4:int := sql.mvc();
     C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
     X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str, 
0:int);
     X_47:bat[:hge] := algebra.projection(C_5:bat[:oid], X_17:bat[:hge]);
     X_54:bat[:hge] := algebra.project(X_47:bat[:hge], 10000000000:hge);
-exit X_110:bit;
+exit X_112:bit;
     X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "b":str, 
C_5:bat[:oid], X_54:bat[:hge]);
     X_59:lng := aggr.count(C_5:bat[:oid]);
     sql.affectedRows(X_56:int, X_59:lng);
@@ -107,7 +107,7 @@ end user.main;
 % 104 # length
 function user.main():void;
     X_1:void := querylog.define("explain update mytest set c = a * b;":str, 
"default_pipe":str, 38:int);
-barrier X_111:bit := language.dataflow();
+barrier X_113:bit := language.dataflow();
     X_4:int := sql.mvc();
     C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
     X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str, 
0:int);
@@ -115,7 +115,7 @@ barrier X_111:bit := language.dataflow()
     X_22:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "b":str, 
0:int);
     X_48:bat[:hge] := algebra.projection(C_5:bat[:oid], X_22:bat[:hge]);
     X_52:bat[:hge] := batcalc.*(X_47:bat[:hge], X_48:bat[:hge], nil:BAT, 
nil:BAT);
-exit X_111:bit;
+exit X_113:bit;
     X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "c":str, 
C_5:bat[:oid], X_52:bat[:hge]);
     X_58:lng := aggr.count(C_5:bat[:oid]);
     sql.affectedRows(X_56:int, X_58:lng);
@@ -155,7 +155,7 @@ end user.main;
 % 104 # length
 function user.main():void;
     X_1:void := querylog.define("explain update mytest set d = c * b;":str, 
"default_pipe":str, 38:int);
-barrier X_111:bit := language.dataflow();
+barrier X_113:bit := language.dataflow();
     X_4:int := sql.mvc();
     C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
     X_28:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "c":str, 
0:int);
@@ -163,7 +163,7 @@ barrier X_111:bit := language.dataflow()
     X_22:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "b":str, 
0:int);
     X_48:bat[:hge] := algebra.projection(C_5:bat[:oid], X_22:bat[:hge]);
     X_52:bat[:hge] := batcalc.*(X_49:bat[:hge], X_48:bat[:hge], nil:BAT, 
nil:BAT);
-exit X_111:bit;
+exit X_113:bit;
     X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "d":str, 
C_5:bat[:oid], X_52:bat[:hge]);
     X_58:lng := aggr.count(C_5:bat[:oid]);
     sql.affectedRows(X_56:int, X_58:lng);
@@ -200,7 +200,7 @@ end user.main;
 % 104 # length
 function user.main():void;
     X_1:void := querylog.define("explain update mytest set e = d + a;":str, 
"default_pipe":str, 38:int);
-barrier X_111:bit := language.dataflow();
+barrier X_113:bit := language.dataflow();
     X_4:int := sql.mvc();
     C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "mytest":str);
     X_34:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "d":str, 
0:int);
@@ -208,7 +208,7 @@ barrier X_111:bit := language.dataflow()
     X_17:bat[:hge] := sql.bind(X_4:int, "sys":str, "mytest":str, "a":str, 
0:int);
     X_47:bat[:hge] := algebra.projection(C_5:bat[:oid], X_17:bat[:hge]);
     X_52:bat[:hge] := batcalc.+(X_50:bat[:hge], X_47:bat[:hge], nil:BAT, 
nil:BAT);
-exit X_111:bit;
+exit X_113:bit;
     X_56:int := sql.update(X_4:int, "sys":str, "mytest":str, "e":str, 
C_5:bat[:oid], X_52:bat[:hge]);
     X_58:lng := aggr.count(C_5:bat[:oid]);
     sql.affectedRows(X_56:int, X_58:lng);
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,29 +90,29 @@ stdout of test 'mergequery` in directory
 % 142 # length
 function user.main():void;
     X_1:void := querylog.define("explain insert into answ\nselect * from 
complete where x>=1.0 and x <=2.0;":str, "default_pipe":str, 63:int);
-barrier X_239:bit := language.dataflow();
+barrier X_252:bit := language.dataflow();
     X_75:bat[:dbl] := bat.new(nil:dbl);
     X_4:int := sql.mvc();
-    X_159:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 0:int, 4:int);
-    C_140:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 0:int, 4:int);
-    C_201:bat[:oid] := algebra.select(X_159:bat[:dbl], C_140:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
-    X_205:bat[:dbl] := algebra.projection(C_201:bat[:oid], X_159:bat[:dbl]);
-    X_160:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 1:int, 4:int);
-    C_142:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 1:int, 4:int);
-    C_202:bat[:oid] := algebra.select(X_160:bat[:dbl], C_142:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
-    X_206:bat[:dbl] := algebra.projection(C_202:bat[:oid], X_160:bat[:dbl]);
-    X_161:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 2:int, 4:int);
-    C_144:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 2:int, 4:int);
-    C_203:bat[:oid] := algebra.select(X_161:bat[:dbl], C_144:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    X_161:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 0:int, 4:int);
+    C_142:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 0:int, 4:int);
+    C_203:bat[:oid] := algebra.select(X_161:bat[:dbl], C_142:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
     X_207:bat[:dbl] := algebra.projection(C_203:bat[:oid], X_161:bat[:dbl]);
-    X_162:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 3:int, 4:int);
-    C_146:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 3:int, 4:int);
-    C_204:bat[:oid] := algebra.select(X_162:bat[:dbl], C_146:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    X_162:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 1:int, 4:int);
+    C_144:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 1:int, 4:int);
+    C_204:bat[:oid] := algebra.select(X_162:bat[:dbl], C_144:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
     X_208:bat[:dbl] := algebra.projection(C_204:bat[:oid], X_162:bat[:dbl]);
-    X_225:bat[:dbl] := mat.packIncrement(X_205:bat[:dbl], 4:int);
-    X_227:bat[:dbl] := mat.packIncrement(X_225:bat[:dbl], X_206:bat[:dbl]);
-    X_228:bat[:dbl] := mat.packIncrement(X_227:bat[:dbl], X_207:bat[:dbl]);
-    X_42:bat[:dbl] := mat.packIncrement(X_228:bat[:dbl], X_208:bat[:dbl]);
+    X_163:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 2:int, 4:int);
+    C_146:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 2:int, 4:int);
+    C_205:bat[:oid] := algebra.select(X_163:bat[:dbl], C_146:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    X_209:bat[:dbl] := algebra.projection(C_205:bat[:oid], X_163:bat[:dbl]);
+    X_164:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 3:int, 4:int);
+    C_148:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 3:int, 4:int);
+    C_206:bat[:oid] := algebra.select(X_164:bat[:dbl], C_148:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    X_210:bat[:dbl] := algebra.projection(C_206:bat[:oid], X_164:bat[:dbl]);
+    X_238:bat[:dbl] := mat.packIncrement(X_207:bat[:dbl], 4:int);
+    X_240:bat[:dbl] := mat.packIncrement(X_238:bat[:dbl], X_208:bat[:dbl]);
+    X_241:bat[:dbl] := mat.packIncrement(X_240:bat[:dbl], X_209:bat[:dbl]);
+    X_42:bat[:dbl] := mat.packIncrement(X_241:bat[:dbl], X_210:bat[:dbl]);
     X_52:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part2":str, "x":str, 
0:int);
     C_45:bat[:oid] := sql.tid(X_4:int, "sys":str, "part2":str);
     C_71:bat[:oid] := algebra.select(X_52:bat[:dbl], C_45:bat[:oid], 1:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
@@ -121,53 +121,57 @@ barrier X_239:bit := language.dataflow()
     X_57:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part2":str, "y":str, 
0:int);
     X_73:bat[:dbl] := algebra.projection(C_71:bat[:oid], X_57:bat[:dbl]);
     X_72:bat[:dbl] := algebra.projection(C_71:bat[:oid], X_52:bat[:dbl]);
-    X_191:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 3:int, 4:int);
+    X_193:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 3:int, 4:int);
+    X_218:bat[:dbl] := algebra.projection(C_206:bat[:oid], X_193:bat[:dbl]);
+    X_192:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 2:int, 4:int);
+    X_217:bat[:dbl] := algebra.projection(C_205:bat[:oid], X_192:bat[:dbl]);
+    X_191:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 1:int, 4:int);
     X_216:bat[:dbl] := algebra.projection(C_204:bat[:oid], X_191:bat[:dbl]);
-    X_190:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 2:int, 4:int);
+    X_190:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 0:int, 4:int);
     X_215:bat[:dbl] := algebra.projection(C_203:bat[:oid], X_190:bat[:dbl]);
-    X_189:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 1:int, 4:int);
-    X_214:bat[:dbl] := algebra.projection(C_202:bat[:oid], X_189:bat[:dbl]);
-    X_188:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 0:int, 4:int);
-    X_213:bat[:dbl] := algebra.projection(C_201:bat[:oid], X_188:bat[:dbl]);
-    X_179:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 3:int, 4:int);
-    X_212:bat[:dbl] := algebra.projection(C_204:bat[:oid], X_179:bat[:dbl]);
-    X_177:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 2:int, 4:int);
-    X_211:bat[:dbl] := algebra.projection(C_203:bat[:oid], X_177:bat[:dbl]);
-    X_175:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 1:int, 4:int);
-    X_210:bat[:dbl] := algebra.projection(C_202:bat[:oid], X_175:bat[:dbl]);
-    X_173:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 0:int, 4:int);
-    X_209:bat[:dbl] := algebra.projection(C_201:bat[:oid], X_173:bat[:dbl]);
+    X_181:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 3:int, 4:int);
+    X_214:bat[:dbl] := algebra.projection(C_206:bat[:oid], X_181:bat[:dbl]);
+    X_179:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 2:int, 4:int);
+    X_213:bat[:dbl] := algebra.projection(C_205:bat[:oid], X_179:bat[:dbl]);
+    X_177:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 1:int, 4:int);
+    X_212:bat[:dbl] := algebra.projection(C_204:bat[:oid], X_177:bat[:dbl]);
+    X_175:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 0:int, 4:int);
+    X_211:bat[:dbl] := algebra.projection(C_203:bat[:oid], X_175:bat[:dbl]);
     X_77:bat[:dbl] := bat.append(X_75:bat[:dbl], X_42:bat[:dbl], true:bit);
     X_79:bat[:dbl] := bat.append(X_77:bat[:dbl], X_72:bat[:dbl], true:bit);
     X_80:bat[:dbl] := bat.new(nil:dbl);
-    X_230:bat[:dbl] := mat.packIncrement(X_209:bat[:dbl], 4:int);
-    X_231:bat[:dbl] := mat.packIncrement(X_230:bat[:dbl], X_210:bat[:dbl]);
-    X_232:bat[:dbl] := mat.packIncrement(X_231:bat[:dbl], X_211:bat[:dbl]);
-    X_43:bat[:dbl] := mat.packIncrement(X_232:bat[:dbl], X_212:bat[:dbl]);
+    X_243:bat[:dbl] := mat.packIncrement(X_211:bat[:dbl], 4:int);
+    X_244:bat[:dbl] := mat.packIncrement(X_243:bat[:dbl], X_212:bat[:dbl]);
+    X_245:bat[:dbl] := mat.packIncrement(X_244:bat[:dbl], X_213:bat[:dbl]);
+    X_43:bat[:dbl] := mat.packIncrement(X_245:bat[:dbl], X_214:bat[:dbl]);
     X_81:bat[:dbl] := bat.append(X_80:bat[:dbl], X_43:bat[:dbl], true:bit);
     X_82:bat[:dbl] := bat.append(X_81:bat[:dbl], X_73:bat[:dbl], true:bit);
     X_83:bat[:dbl] := bat.new(nil:dbl);
-    X_234:bat[:dbl] := mat.packIncrement(X_213:bat[:dbl], 4:int);
-    X_235:bat[:dbl] := mat.packIncrement(X_234:bat[:dbl], X_214:bat[:dbl]);
-    X_236:bat[:dbl] := mat.packIncrement(X_235:bat[:dbl], X_215:bat[:dbl]);
-    X_44:bat[:dbl] := mat.packIncrement(X_236:bat[:dbl], X_216:bat[:dbl]);
+    X_247:bat[:dbl] := mat.packIncrement(X_215:bat[:dbl], 4:int);
+    X_248:bat[:dbl] := mat.packIncrement(X_247:bat[:dbl], X_216:bat[:dbl]);
+    X_249:bat[:dbl] := mat.packIncrement(X_248:bat[:dbl], X_217:bat[:dbl]);
+    X_44:bat[:dbl] := mat.packIncrement(X_249:bat[:dbl], X_218:bat[:dbl]);
     X_84:bat[:dbl] := bat.append(X_83:bat[:dbl], X_44:bat[:dbl], true:bit);
     X_85:bat[:dbl] := bat.append(X_84:bat[:dbl], X_74:bat[:dbl], true:bit);
-    language.pass(X_159:bat[:dbl]);
-    language.pass(X_160:bat[:dbl]);
     language.pass(X_161:bat[:dbl]);
     language.pass(X_162:bat[:dbl]);
+    language.pass(X_163:bat[:dbl]);
+    language.pass(X_164:bat[:dbl]);
     language.pass(C_71:bat[:oid]);
     language.pass(X_52:bat[:dbl]);
+    language.pass(C_206:bat[:oid]);
+    language.pass(C_205:bat[:oid]);
     language.pass(C_204:bat[:oid]);
     language.pass(C_203:bat[:oid]);
-    language.pass(C_202:bat[:oid]);
-    language.pass(C_201:bat[:oid]);
-exit X_239:bit;
-    X_87:int := sql.append(X_4:int, "sys":str, "answ":str, "x":str, 
X_79:bat[:dbl]);
-    X_91:int := sql.append(X_87:int, "sys":str, "answ":str, "y":str, 
X_82:bat[:dbl]);
-    X_94:int := sql.append(X_91:int, "sys":str, "answ":str, "z":str, 
X_85:bat[:dbl]);
+exit X_252:bit;
+    (X_221:int, X_220:ptr, X_225:ptr, X_228:ptr) := sql.append_prep(X_4:int, 
"sys":str, "answ":str, "x":str, "y":str, "z":str);
+barrier X_265:bit := language.dataflow();
+    X_223:ptr := sql.append_exec(X_220:ptr, X_79:bat[:dbl]);
+    X_226:ptr := sql.append_exec(X_225:ptr, X_82:bat[:dbl]);
+    X_229:ptr := sql.append_exec(X_228:ptr, X_85:bat[:dbl]);
     X_96:lng := aggr.count(X_85:bat[:dbl]);
+exit X_265:bit;
+    X_94:int := sql.append_finish(X_221:int, X_223:ptr, X_226:ptr, X_229:ptr);
     sql.affectedRows(X_94:int, X_96:lng);
 end user.main;
 #inline               actions= 0 time=1 usec 
@@ -209,37 +213,37 @@ end user.main;
 % 164 # length
 function user.main():void;
     X_1:void := querylog.define("explain insert into answ\nselect * from 
complete\nwhere x between 0 and 2 and y between 0 and 2;":str, 
"default_pipe":str, 69:int);
-barrier X_251:bit := language.dataflow();
+barrier X_264:bit := language.dataflow();
     X_84:bat[:dbl] := bat.new(nil:dbl);
     X_4:int := sql.mvc();
-    X_181:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 0:int, 4:int);
-    X_167:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 0:int, 4:int);
-    C_148:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 0:int, 4:int);
-    C_209:bat[:oid] := algebra.select(X_167:bat[:dbl], C_148:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
-    C_213:bat[:oid] := algebra.select(X_181:bat[:dbl], C_209:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
-    X_217:bat[:dbl] := algebra.projection(C_213:bat[:oid], X_167:bat[:dbl]);
-    X_183:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 1:int, 4:int);
-    X_168:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 1:int, 4:int);
-    C_150:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 1:int, 4:int);
-    C_210:bat[:oid] := algebra.select(X_168:bat[:dbl], C_150:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
-    C_214:bat[:oid] := algebra.select(X_183:bat[:dbl], C_210:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
-    X_218:bat[:dbl] := algebra.projection(C_214:bat[:oid], X_168:bat[:dbl]);
-    X_185:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 2:int, 4:int);
-    X_169:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 2:int, 4:int);
-    C_152:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 2:int, 4:int);
-    C_211:bat[:oid] := algebra.select(X_169:bat[:dbl], C_152:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
-    C_215:bat[:oid] := algebra.select(X_185:bat[:dbl], C_211:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    X_183:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 0:int, 4:int);
+    X_169:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 0:int, 4:int);
+    C_150:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 0:int, 4:int);
+    C_211:bat[:oid] := algebra.select(X_169:bat[:dbl], C_150:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    C_215:bat[:oid] := algebra.select(X_183:bat[:dbl], C_211:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
     X_219:bat[:dbl] := algebra.projection(C_215:bat[:oid], X_169:bat[:dbl]);
-    X_187:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 3:int, 4:int);
-    X_170:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 3:int, 4:int);
-    C_154:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 3:int, 4:int);
-    C_212:bat[:oid] := algebra.select(X_170:bat[:dbl], C_154:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
-    C_216:bat[:oid] := algebra.select(X_187:bat[:dbl], C_212:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    X_185:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 1:int, 4:int);
+    X_170:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 1:int, 4:int);
+    C_152:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 1:int, 4:int);
+    C_212:bat[:oid] := algebra.select(X_170:bat[:dbl], C_152:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    C_216:bat[:oid] := algebra.select(X_185:bat[:dbl], C_212:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
     X_220:bat[:dbl] := algebra.projection(C_216:bat[:oid], X_170:bat[:dbl]);
-    X_237:bat[:dbl] := mat.packIncrement(X_217:bat[:dbl], 4:int);
-    X_239:bat[:dbl] := mat.packIncrement(X_237:bat[:dbl], X_218:bat[:dbl]);
-    X_240:bat[:dbl] := mat.packIncrement(X_239:bat[:dbl], X_219:bat[:dbl]);
-    X_45:bat[:dbl] := mat.packIncrement(X_240:bat[:dbl], X_220:bat[:dbl]);
+    X_187:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 2:int, 4:int);
+    X_171:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 2:int, 4:int);
+    C_154:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 2:int, 4:int);
+    C_213:bat[:oid] := algebra.select(X_171:bat[:dbl], C_154:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    C_217:bat[:oid] := algebra.select(X_187:bat[:dbl], C_213:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    X_221:bat[:dbl] := algebra.projection(C_217:bat[:oid], X_171:bat[:dbl]);
+    X_189:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 3:int, 4:int);
+    X_172:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 3:int, 4:int);
+    C_156:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 3:int, 4:int);
+    C_214:bat[:oid] := algebra.select(X_172:bat[:dbl], C_156:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    C_218:bat[:oid] := algebra.select(X_189:bat[:dbl], C_214:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    X_222:bat[:dbl] := algebra.projection(C_218:bat[:oid], X_172:bat[:dbl]);
+    X_250:bat[:dbl] := mat.packIncrement(X_219:bat[:dbl], 4:int);
+    X_252:bat[:dbl] := mat.packIncrement(X_250:bat[:dbl], X_220:bat[:dbl]);
+    X_253:bat[:dbl] := mat.packIncrement(X_252:bat[:dbl], X_221:bat[:dbl]);
+    X_45:bat[:dbl] := mat.packIncrement(X_253:bat[:dbl], X_222:bat[:dbl]);
     X_60:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part2":str, "y":str, 
0:int);
     X_55:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part2":str, "x":str, 
0:int);
     C_48:bat[:oid] := sql.tid(X_4:int, "sys":str, "part2":str);
@@ -249,54 +253,58 @@ barrier X_251:bit := language.dataflow()
     X_83:bat[:dbl] := algebra.projection(C_80:bat[:oid], X_65:bat[:dbl]);
     X_82:bat[:dbl] := algebra.projection(C_80:bat[:oid], X_60:bat[:dbl]);
     X_81:bat[:dbl] := algebra.projection(C_80:bat[:oid], X_55:bat[:dbl]);
-    X_199:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 3:int, 4:int);
+    X_201:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 3:int, 4:int);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to