Changeset: c273e8871101 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c273e8871101
Modified Files:
        sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
        sql/test/mergetables/Tests/mergequery.stable.out
Branch: opt_pushoptimizer
Log Message:

approved output


diffs (truncated from 336 to 300 lines):

diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out 
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -34,12 +34,12 @@ Operation successful
 |     X_4:int := sql.mvc();                                                    
                                          |
 |     X_22:bat[:sht] := sql.bind(X_4:int, "sys":str, "_tables":str, 
"type":str, 0:int);                              |
 |     C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "_tables":str);             
                                      |
-|     C_90:bat[:oid] := algebra.thetaselect(X_22:bat[:sht], C_5:bat[:oid], 
2:sht, "!=":str);                         |
+|     C_91:bat[:oid] := algebra.thetaselect(X_22:bat[:sht], C_5:bat[:oid], 
2:sht, "!=":str);                              |
 |     (X_25:bat[:oid], X_26:bat[:sht]) := sql.bind(X_4:int, "sys":str, 
"_tables":str, "type":str, 2:int);            |
-|     C_91:bat[:oid] := algebra.thetaselect(X_26:bat[:sht], nil:bat[:oid], 
2:sht, "!=":str);                         |
+|     C_92:bat[:oid] := algebra.thetaselect(X_26:bat[:sht], nil:bat[:oid], 
2:sht, "!=":str);                              |
 |     X_24:bat[:sht] := sql.bind(X_4:int, "sys":str, "_tables":str, 
"type":str, 1:int);                              |
-|     C_93:bat[:oid] := algebra.thetaselect(X_24:bat[:sht], C_5:bat[:oid], 
2:sht, "!=":str);                         |
-|     C_30:bat[:oid] := sql.subdelta(C_90:bat[:oid], C_5:bat[:oid], 
X_25:bat[:oid], C_91:bat[:oid], C_93:bat[:oid]); |
+|     C_94:bat[:oid] := algebra.thetaselect(X_24:bat[:sht], C_5:bat[:oid], 
2:sht, "!=":str);                              |
+|     C_30:bat[:oid] := sql.subdelta(C_91:bat[:oid], C_5:bat[:oid], 
X_25:bat[:oid], C_92:bat[:oid], C_94:bat[:oid]);      |
 |     X_17:bat[:str] := sql.bind(X_4:int, "sys":str, "_tables":str, 
"name":str, 0:int);                              |
 |     (X_19:bat[:oid], X_20:bat[:str]) := sql.bind(X_4:int, "sys":str, 
"_tables":str, "name":str, 2:int);            |
 |     X_18:bat[:str] := sql.bind(X_4:int, "sys":str, "_tables":str, 
"name":str, 1:int);                              |
@@ -57,33 +57,34 @@ Operation successful
 |     sql.resultSet(X_45:bat[:str], X_46:bat[:str], X_47:bat[:str], 
X_48:bat[:int], X_49:bat[:int], X_43:bat[:str]); |
 | end user.main;                                                               
                                           |
 | #inline               actions= 0 time=0 usec                                 
                                           |
-| #remap                actions= 0 time=1 usec                                 
                                      |
-| #costmodel            actions= 1 time=2 usec                                 
                                           |
-| #coercion             actions= 1 time=5 usec                                 
                                           |
-| #aliases              actions= 1 time=5 usec                                 
                                           |
-| #evaluate             actions= 0 time=5 usec                                 
                                           |
+| #remap                actions= 0 time=0 usec                                 
                                           |
+| #costmodel            actions= 1 time=0 usec                                 
                                           |
+| #coercion             actions= 0 time=0 usec                                 
                                           |
+| #aliases              actions= 1 time=0 usec                                 
                                           |
+| #evaluate             actions= 0 time=0 usec                                 
                                           |
 | #emptybind            actions= 0 time=0 usec                                 
                                           |
-| #pushselect           actions= 2 time=21 usec                                
                                           |
+| #pushselect           actions= 2 time=1000 usec                              
                                           |
 | #aliases              actions= 0 time=0 usec                                 
                                      |
-| #mergetable           actions= 0 time=31 usec                                
                                           |
-| #deadcode             actions= 8 time=9 usec                                 
                                           |
+| #mergetable           actions= 0 time=0 usec                                 
                                           |
+| #deadcode             actions= 8 time=0 usec                                 
                                           |
 | #aliases              actions= 0 time=0 usec                                 
                                      |
-| #constants            actions= 2 time=6 usec                                 
                                           |
-| #commonTerms          actions= 0 time=8 usec                                 
                                           |
-| #projectionpath       actions= 0 time=3 usec                                 
                                           |
-| #deadcode             actions= 0 time=6 usec                                 
                                           |
-| #reorder              actions= 1 time=19 usec                                
                                           |
+| #constants            actions= 2 time=0 usec                                 
                                           |
+| #commonTerms          actions= 0 time=0 usec                                 
                                           |
+| #projectionpath       actions= 0 time=0 usec                                 
                                           |
+| #deadcode             actions= 0 time=0 usec                                 
                                           |
+| #reorder              actions= 1 time=0 usec                                 
                                           |
 | #matpack              actions= 0 time=0 usec                                 
                                      |
-| #multiplex            actions= 0 time=1 usec                                 
                                           |
-| #profiler             actions= 1 time=1 usec                                 
                                           |
-| #candidates           actions= 1 time=1 usec                                 
                                           |
-| #deadcode             actions= 0 time=6 usec                                 
                                           |
-| #postfix              actions= 0 time=4 usec                                 
                                           |
+| #multiplex            actions= 0 time=0 usec                                 
                                           |
+| #profiler             actions= 1 time=0 usec                                 
                                           |
+| #candidates           actions= 1 time=0 usec                                 
                                           |
+| #pushproject          actions= 0 time=0 usec                                 
                                           |
+| #deadcode             actions= 0 time=0 usec                                 
                                           |
+| #postfix              actions= 0 time=0 usec                                 
                                           |
 | #wlc                  actions= 0 time=0 usec                                 
                                          |
-| #garbagecollector     actions= 1 time=23 usec                                
                                           |
-| #total                actions=27 time=226 usec                               
                                           |
+| #garbagecollector     actions= 1 time=0 usec                                 
                                           |
+| #total                actions=28 time=1000 usec                              
                                           |
 
+-------------------------------------------------------------------------------------------------------------------------+
-54 rows
+55 rows
 
 # 17:52:43 >  
 # 17:52:43 >  "Done."
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_240: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_160:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 0:int, 4:int);
+    C_141:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 0:int, 4:int);
+    C_202:bat[:oid] := algebra.select(X_160:bat[:dbl], C_141: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, 1:int, 4:int);
+    C_143:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 1:int, 4:int);
+    C_203:bat[:oid] := algebra.select(X_161:bat[:dbl], C_143: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, 2:int, 4:int);
+    C_145:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 2:int, 4:int);
+    C_204:bat[:oid] := algebra.select(X_162:bat[:dbl], C_145: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, 3:int, 4:int);
+    C_147:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 3:int, 4:int);
+    C_205:bat[:oid] := algebra.select(X_163:bat[:dbl], C_147: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_226:bat[:dbl] := mat.packIncrement(X_206:bat[:dbl], 4:int);
+    X_228:bat[:dbl] := mat.packIncrement(X_226:bat[:dbl], X_207:bat[:dbl]);
+    X_229:bat[:dbl] := mat.packIncrement(X_228:bat[:dbl], X_208:bat[:dbl]);
+    X_42:bat[:dbl] := mat.packIncrement(X_229:bat[:dbl], X_209: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,49 +121,49 @@ 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_192:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 3: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, 2: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, 1: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_189:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 0: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_180:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 3:int, 4:int);
+    X_213:bat[:dbl] := algebra.projection(C_205:bat[:oid], X_180:bat[:dbl]);
+    X_178:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 2:int, 4:int);
+    X_212:bat[:dbl] := algebra.projection(C_204:bat[:oid], X_178:bat[:dbl]);
+    X_176:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 1:int, 4:int);
+    X_211:bat[:dbl] := algebra.projection(C_203:bat[:oid], X_176:bat[:dbl]);
+    X_174:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 0:int, 4:int);
+    X_210:bat[:dbl] := algebra.projection(C_202:bat[:oid], X_174: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_231:bat[:dbl] := mat.packIncrement(X_210:bat[:dbl], 4:int);
     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_233:bat[:dbl] := mat.packIncrement(X_232:bat[:dbl], X_212:bat[:dbl]);
+    X_43:bat[:dbl] := mat.packIncrement(X_233:bat[:dbl], X_213: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_235:bat[:dbl] := mat.packIncrement(X_214:bat[:dbl], 4:int);
     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_237:bat[:dbl] := mat.packIncrement(X_236:bat[:dbl], X_216:bat[:dbl]);
+    X_44:bat[:dbl] := mat.packIncrement(X_237:bat[:dbl], X_217: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(C_71:bat[:oid]);
     language.pass(X_52:bat[:dbl]);
+    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;
+exit X_240: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]);
@@ -209,37 +209,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_252: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_182:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 0:int, 4:int);
+    X_168:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 0:int, 4:int);
+    C_149:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 0:int, 4:int);
+    C_210:bat[:oid] := algebra.select(X_168:bat[:dbl], C_149:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    C_214:bat[:oid] := algebra.select(X_182: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_184:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 1:int, 4:int);
+    X_169:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 1:int, 4:int);
+    C_151:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 1:int, 4:int);
+    C_211:bat[:oid] := algebra.select(X_169:bat[:dbl], C_151:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    C_215:bat[:oid] := algebra.select(X_184: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_186:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 2:int, 4:int);
+    X_170:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 2:int, 4:int);
+    C_153:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 2:int, 4:int);
+    C_212:bat[:oid] := algebra.select(X_170:bat[:dbl], C_153:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    C_216:bat[:oid] := algebra.select(X_186: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_188:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "y":str, 
0:int, 3:int, 4:int);
+    X_171:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "x":str, 
0:int, 3:int, 4:int);
+    C_155:bat[:oid] := sql.tid(X_4:int, "sys":str, "part1":str, 3:int, 4:int);
+    C_213:bat[:oid] := algebra.select(X_171:bat[:dbl], C_155:bat[:oid], 0:dbl, 
2:dbl, true:bit, true:bit, false:bit, true:bit);
+    C_217:bat[:oid] := algebra.select(X_188: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_238:bat[:dbl] := mat.packIncrement(X_218:bat[:dbl], 4:int);
+    X_240:bat[:dbl] := mat.packIncrement(X_238:bat[:dbl], X_219:bat[:dbl]);
+    X_241:bat[:dbl] := mat.packIncrement(X_240:bat[:dbl], X_220:bat[:dbl]);
+    X_45:bat[:dbl] := mat.packIncrement(X_241:bat[:dbl], X_221: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,50 +249,50 @@ 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_200:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 3:int, 4:int);
+    X_229:bat[:dbl] := algebra.projection(C_217:bat[:oid], X_200:bat[:dbl]);
+    X_199:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 2:int, 4:int);
     X_228:bat[:dbl] := algebra.projection(C_216:bat[:oid], X_199:bat[:dbl]);
-    X_198:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 2:int, 4:int);
+    X_198:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 1:int, 4:int);
     X_227:bat[:dbl] := algebra.projection(C_215:bat[:oid], X_198:bat[:dbl]);
-    X_197:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 1:int, 4:int);
+    X_197:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 0:int, 4:int);
     X_226:bat[:dbl] := algebra.projection(C_214:bat[:oid], X_197:bat[:dbl]);
-    X_196:bat[:dbl] := sql.bind(X_4:int, "sys":str, "part1":str, "z":str, 
0:int, 0:int, 4:int);
-    X_225:bat[:dbl] := algebra.projection(C_213:bat[:oid], X_196:bat[:dbl]);
-    X_224:bat[:dbl] := algebra.projection(C_216:bat[:oid], X_187:bat[:dbl]);
-    X_223:bat[:dbl] := algebra.projection(C_215:bat[:oid], X_185:bat[:dbl]);
-    X_222:bat[:dbl] := algebra.projection(C_214:bat[:oid], X_183:bat[:dbl]);
-    X_221:bat[:dbl] := algebra.projection(C_213:bat[:oid], X_181:bat[:dbl]);
+    X_225:bat[:dbl] := algebra.projection(C_217:bat[:oid], X_188:bat[:dbl]);
+    X_224:bat[:dbl] := algebra.projection(C_216:bat[:oid], X_186:bat[:dbl]);
+    X_223:bat[:dbl] := algebra.projection(C_215:bat[:oid], X_184:bat[:dbl]);
+    X_222:bat[:dbl] := algebra.projection(C_214:bat[:oid], X_182:bat[:dbl]);
     X_86:bat[:dbl] := bat.append(X_84:bat[:dbl], X_45:bat[:dbl], true:bit);
     X_87:bat[:dbl] := bat.append(X_86:bat[:dbl], X_81:bat[:dbl], true:bit);
     X_88:bat[:dbl] := bat.new(nil:dbl);
-    X_242:bat[:dbl] := mat.packIncrement(X_221:bat[:dbl], 4:int);
-    X_243:bat[:dbl] := mat.packIncrement(X_242:bat[:dbl], X_222:bat[:dbl]);
+    X_243:bat[:dbl] := mat.packIncrement(X_222:bat[:dbl], 4:int);
     X_244:bat[:dbl] := mat.packIncrement(X_243:bat[:dbl], X_223:bat[:dbl]);
-    X_46:bat[:dbl] := mat.packIncrement(X_244:bat[:dbl], X_224:bat[:dbl]);
+    X_245:bat[:dbl] := mat.packIncrement(X_244:bat[:dbl], X_224:bat[:dbl]);
+    X_46:bat[:dbl] := mat.packIncrement(X_245:bat[:dbl], X_225:bat[:dbl]);
     X_89:bat[:dbl] := bat.append(X_88:bat[:dbl], X_46:bat[:dbl], true:bit);
     X_90:bat[:dbl] := bat.append(X_89:bat[:dbl], X_82:bat[:dbl], true:bit);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to