Changeset: 61a1c21f923f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61a1c21f923f
Modified Files:
        monetdb5/mal/Tests/tst903.stable.out
        monetdb5/mal/Tests/tst904.stable.out
        monetdb5/mal/Tests/tst907.stable.out
        monetdb5/optimizer/Tests/Mexample.stable.out
        monetdb5/optimizer/Tests/inlineFunction2.stable.out
        monetdb5/optimizer/Tests/manifold2.stable.out
        monetdb5/optimizer/opt_multiplex.c
        sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
        sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_gencode.c
        sql/benchmarks/ssbm/Tests/04-explain.stable.out
        sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/05-explain.stable.out
        sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/06-explain.stable.out
        sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/07-explain.stable.out
        sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/08-explain.stable.out
        sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/09-explain.stable.out
        sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/10-explain.stable.out
        sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/11-explain.stable.out
        sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/12-explain.stable.out
        sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/13-explain.stable.out
        sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/01-explain.stable.out
        sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/02-explain.stable.out
        sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/04-explain.stable.out
        sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/05-explain.stable.out
        sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/07-explain.stable.out
        sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/09-explain.stable.out
        sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/10-explain.stable.out
        sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/11-explain.stable.out
        sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/12-explain.stable.out
        sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/13-explain.stable.out
        sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/16-explain.stable.out
        sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/20-explain.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/21-explain.stable.out
        sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/22-explain.stable.out
        sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
        sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
        
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
        
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
        sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
        sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
        
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
        sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
        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
        sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
        sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
        
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
        sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/mergetables/Tests/mergequery.stable.out
        sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:

More removal of old BAT statement creation.


diffs (truncated from 7377 to 300 lines):

diff --git a/monetdb5/mal/Tests/tst903.stable.out 
b/monetdb5/mal/Tests/tst903.stable.out
--- a/monetdb5/mal/Tests/tst903.stable.out
+++ b/monetdb5/mal/Tests/tst903.stable.out
@@ -139,13 +139,13 @@ exit i;
     cnt := aggr.count(z9);
     mdb.setDebug(dbgmsk_set);
     t0 := alarm.usec();
-    X_103 := bat.new(nil:oid,nil:lng);
-barrier (X_107,X_108) := iterator.new(b);
-    X_110 := algebra.fetch(c,X_107);
-    X_112 := calc.+(X_108,X_110);
-    bat.append(X_103,X_112);
-    redo (X_107,X_108) := iterator.next(b);
-exit (X_107,X_108);
+    X_103 := bat.new(nil:lng);
+barrier (X_106,X_107) := iterator.new(b);
+    X_109 := algebra.fetch(c,X_106);
+    X_111 := calc.+(X_107,X_109);
+    bat.append(X_103,X_111);
+    redo (X_106,X_107) := iterator.next(b);
+exit (X_106,X_107);
     x:bat[:lng] := X_103;
     t1 := alarm.usec();
     mdb.setDebug(dbgmsk_restore);
diff --git a/monetdb5/mal/Tests/tst904.stable.out 
b/monetdb5/mal/Tests/tst904.stable.out
--- a/monetdb5/mal/Tests/tst904.stable.out
+++ b/monetdb5/mal/Tests/tst904.stable.out
@@ -39,12 +39,12 @@ barrier i:lng := 0:lng;                 
 exit i:lng;                                    #[7] (0)  5 
     io.print(b:bat[:lng]);                     #[8] (0) IOprint_val 11 <- 3 
     c:int := 1:int;                            #[9] (0)  12 <- 13 
-    X_18:bat[:lng] := bat.new(nil:oid,nil:lng);        #[10] (0) CMDBATnew 18 
<- 19 20 
-barrier (X_22:oid,X_23:lng) := iterator.new(b:bat[:lng]);      #[11] (0) 
ITRbunIterator 22 23 <- 3 
-    X_25:lng := calc.+(X_23:lng,c:int);        #[12] (0) CMDvarADDsignal 25 <- 
23 12 
-    bat.append(X_18:bat[:lng],X_25:lng);       #[13] (0) BKCappend_val_wrap 26 
<- 18 25 
-    redo (X_22:oid,X_23:lng) := iterator.next(b:bat[:lng]);    #[14] (0) 
ITRbunNext 22 23 <- 3 
-exit (X_22:oid,X_23:lng);                      #[15] (0)  22 23 
+    X_18:bat[:lng] := bat.new(nil:lng);        #[10] (0) CMDBATnewColumn 18 <- 
19 
+barrier (X_21:oid,X_22:lng) := iterator.new(b:bat[:lng]);      #[11] (0) 
ITRbunIterator 21 22 <- 3 
+    X_24:lng := calc.+(X_22:lng,c:int);        #[12] (0) CMDvarADDsignal 24 <- 
22 12 
+    bat.append(X_18:bat[:lng],X_24:lng);       #[13] (0) BKCappend_val_wrap 25 
<- 18 24 
+    redo (X_21:oid,X_22:lng) := iterator.next(b:bat[:lng]);    #[14] (0) 
ITRbunNext 21 22 <- 3 
+exit (X_21:oid,X_22:lng);                      #[15] (0)  21 22 
     xz:bat[:lng] := X_18:bat[:lng];            #[16] (0)  14 <- 18 
     io.print(xz:bat[:lng]);                    #[17] (0) IOprint_val 17 <- 14 
 end user.foo;                                  #[18] (0)  
diff --git a/monetdb5/mal/Tests/tst907.stable.out 
b/monetdb5/mal/Tests/tst907.stable.out
--- a/monetdb5/mal/Tests/tst907.stable.out
+++ b/monetdb5/mal/Tests/tst907.stable.out
@@ -36,29 +36,29 @@ function user.foo():void;               
     b:bat[:int] := bat.new(:int);              #[4] (0) CMDBATnewColumn 7 <- 8 
     bat.append(b:bat[:int],1:int);             #[5] (0) BKCappend_val_wrap 9 
<- 7 2 
     io.print("do multiplex three test":str);   #[6] (0) IOprint_val 10 <- 11 
-    X_22:bat[:int] := bat.new(nil:oid,nil:int);        #[7] (0) CMDBATnew 22 
<- 23 24 
-barrier (X_26:oid,X_27:int) := iterator.new(b:bat[:int]);      #[8] (0) 
ITRbunIterator 26 27 <- 7 
-    X_29:int := user.three(X_27:int,2:int,3:int);      #[9] (0)  29 <- 27 4 5 
-    bat.append(X_22:bat[:int],X_29:int);       #[10] (0) BKCappend_val_wrap 30 
<- 22 29 
-    redo (X_26:oid,X_27:int) := iterator.next(b:bat[:int]);    #[11] (0) 
ITRbunNext 26 27 <- 7 
-exit (X_26:oid,X_27:int);                      #[12] (0)  26 27 
+    X_22:bat[:int] := bat.new(nil:int);        #[7] (0) CMDBATnewColumn 22 <- 
23 
+barrier (X_25:oid,X_26:int) := iterator.new(b:bat[:int]);      #[8] (0) 
ITRbunIterator 25 26 <- 7 
+    X_28:int := user.three(X_26:int,2:int,3:int);      #[9] (0)  28 <- 26 4 5 
+    bat.append(X_22:bat[:int],X_28:int);       #[10] (0) BKCappend_val_wrap 29 
<- 22 28 
+    redo (X_25:oid,X_26:int) := iterator.next(b:bat[:int]);    #[11] (0) 
ITRbunNext 25 26 <- 7 
+exit (X_25:oid,X_26:int);                      #[12] (0)  25 26 
     z:bat[:int] := X_22:bat[:int];             #[13] (0)  12 <- 22 
     io.print("do multiplex one test":str);     #[14] (0) IOprint_val 15 <- 16 
-    X_34:bat[:int] := bat.new(nil:oid,nil:int);        #[15] (0) CMDBATnew 34 
<- 23 24 
-barrier (X_36:oid,X_37:int) := iterator.new(b:bat[:int]);      #[16] (0) 
ITRbunIterator 36 37 <- 7 
-    X_39:int := user.one(X_37:int);            #[17] (0)  39 <- 37 
-    bat.append(X_34:bat[:int],X_39:int);       #[18] (0) BKCappend_val_wrap 40 
<- 34 39 
-    redo (X_36:oid,X_37:int) := iterator.next(b:bat[:int]);    #[19] (0) 
ITRbunNext 36 37 <- 7 
-exit (X_36:oid,X_37:int);                      #[20] (0)  36 37 
-    z:bat[:int] := X_34:bat[:int];             #[21] (0)  12 <- 34 
+    X_33:bat[:int] := bat.new(nil:int);        #[15] (0) CMDBATnewColumn 33 <- 
23 
+barrier (X_35:oid,X_36:int) := iterator.new(b:bat[:int]);      #[16] (0) 
ITRbunIterator 35 36 <- 7 
+    X_38:int := user.one(X_36:int);            #[17] (0)  38 <- 36 
+    bat.append(X_33:bat[:int],X_38:int);       #[18] (0) BKCappend_val_wrap 39 
<- 33 38 
+    redo (X_35:oid,X_36:int) := iterator.next(b:bat[:int]);    #[19] (0) 
ITRbunNext 35 36 <- 7 
+exit (X_35:oid,X_36:int);                      #[20] (0)  35 36 
+    z:bat[:int] := X_33:bat[:int];             #[21] (0)  12 <- 33 
     io.print("do multiplex pow test":str);     #[22] (0) IOprint_val 18 <- 19 
-    X_44:bat[:int] := bat.new(nil:oid,nil:int);        #[23] (0) CMDBATnew 44 
<- 23 24 
-barrier (X_46:oid,X_47:int) := iterator.new(b:bat[:int]);      #[24] (0) 
ITRbunIterator 46 47 <- 7 
-    X_49:int := user.pow(X_47:int,2:int);      #[25] (0)  49 <- 47 4 
-    bat.append(X_44:bat[:int],X_49:int);       #[26] (0) BKCappend_val_wrap 50 
<- 44 49 
-    redo (X_46:oid,X_47:int) := iterator.next(b:bat[:int]);    #[27] (0) 
ITRbunNext 46 47 <- 7 
-exit (X_46:oid,X_47:int);                      #[28] (0)  46 47 
-    z:bat[:int] := X_44:bat[:int];             #[29] (0)  12 <- 44 
+    X_43:bat[:int] := bat.new(nil:int);        #[23] (0) CMDBATnewColumn 43 <- 
23 
+barrier (X_45:oid,X_46:int) := iterator.new(b:bat[:int]);      #[24] (0) 
ITRbunIterator 45 46 <- 7 
+    X_48:int := user.pow(X_46:int,2:int);      #[25] (0)  48 <- 46 4 
+    bat.append(X_43:bat[:int],X_48:int);       #[26] (0) BKCappend_val_wrap 49 
<- 43 48 
+    redo (X_45:oid,X_46:int) := iterator.next(b:bat[:int]);    #[27] (0) 
ITRbunNext 45 46 <- 7 
+exit (X_45:oid,X_46:int);                      #[28] (0)  45 46 
+    z:bat[:int] := X_43:bat[:int];             #[29] (0)  12 <- 43 
     io.print(z:bat[:int]);                     #[30] (0) IOprint_val 21 <- 12 
 end user.foo;                                  #[31] (0)  
 [ 1 ]
diff --git a/monetdb5/optimizer/Tests/Mexample.stable.out 
b/monetdb5/optimizer/Tests/Mexample.stable.out
--- a/monetdb5/optimizer/Tests/Mexample.stable.out
+++ b/monetdb5/optimizer/Tests/Mexample.stable.out
@@ -30,12 +30,12 @@ Ready.
 function user.foo():void;                      #[0] (0)  0 
     b:bat[:int] := bat.new(:int);              #[1] (0) CMDBATnewColumn 1 <- 2 
     bat.append(b:bat[:int],1:int);             #[2] (0) BKCappend_val_wrap 3 
<- 1 4 
-    X_8:bat[:int] := bat.new(nil:oid,nil:int); #[3] (0) CMDBATnew 8 <- 9 10 
-barrier (X_12:oid,X_13:int) := iterator.new(b:bat[:int]);      #[4] (0) 
ITRbunIterator 12 13 <- 1 
-    X_15:int := calc.+(X_13:int,1:int);        #[5] (0) CMDvarADDsignal 15 <- 
13 4 
-    bat.append(X_8:bat[:int],X_15:int);        #[6] (0) BKCappend_val_wrap 16 
<- 8 15 
-    redo (X_12:oid,X_13:int) := iterator.next(b:bat[:int]);    #[7] (0) 
ITRbunNext 12 13 <- 1 
-exit (X_12:oid,X_13:int);                      #[8] (0)  12 13 
+    X_8:bat[:int] := bat.new(nil:int);         #[3] (0) CMDBATnewColumn 8 <- 9 
+barrier (X_11:oid,X_12:int) := iterator.new(b:bat[:int]);      #[4] (0) 
ITRbunIterator 11 12 <- 1 
+    X_14:int := calc.+(X_12:int,1:int);        #[5] (0) CMDvarADDsignal 14 <- 
12 4 
+    bat.append(X_8:bat[:int],X_14:int);        #[6] (0) BKCappend_val_wrap 15 
<- 8 14 
+    redo (X_11:oid,X_12:int) := iterator.next(b:bat[:int]);    #[7] (0) 
ITRbunNext 11 12 <- 1 
+exit (X_11:oid,X_12:int);                      #[8] (0)  11 12 
     c:bat[:int] := X_8:bat[:int];              #[9] (0)  5 <- 8 
 end user.foo;                                  #[10] (0)  
 
diff --git a/monetdb5/optimizer/Tests/inlineFunction2.stable.out 
b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
@@ -28,13 +28,13 @@ Ready.
 #result of inline
 function user.tst():void;
     b := bat.new(:int);
-    X_7 := bat.new(nil:oid,nil:int);
-barrier (X_11,X_12) := iterator.new(b);
-    X_23 := calc.+(X_12,1);
-    X_14 := X_23;
-    bat.append(X_7,X_14);
-    redo (X_11,X_12) := iterator.next(b);
-exit (X_11,X_12);
+    X_7 := bat.new(nil:int);
+barrier (X_10,X_11) := iterator.new(b);
+    X_22 := calc.+(X_11,1);
+    X_13 := X_22;
+    bat.append(X_7,X_13);
+    redo (X_10,X_11) := iterator.next(b);
+exit (X_10,X_11);
     z:bat[:int] := X_7;
 end user.tst;
 
diff --git a/monetdb5/optimizer/Tests/manifold2.stable.out 
b/monetdb5/optimizer/Tests/manifold2.stable.out
--- a/monetdb5/optimizer/Tests/manifold2.stable.out
+++ b/monetdb5/optimizer/Tests/manifold2.stable.out
@@ -31,13 +31,13 @@ barrier X_9:bit := language.dataflow(); 
     c:lng := aggr.count(b:bat[:dbl]);          #[2] (0) ALGcount_bat 3 <- 1 
     c2:lng := aggr.count(b2:bat[:dbl]);        #[3] (0) ALGcount_bat 4 <- 2 
 exit X_9:bit;                                  #[4] (0)  9 
-    X_13:bat[:dbl] := bat.new(nil:oid,nil:dbl);        #[5] (0) CMDBATnew 13 
<- 14 15 
-barrier (X_17:oid,X_18:dbl) := iterator.new(b:bat[:dbl]);      #[6] (0) 
ITRbunIterator 17 18 <- 1 
-    X_20:dbl := algebra.fetch(b2:bat[:dbl],X_17:oid);  #[7] (0) ALGfetchoid 20 
<- 2 17 
-    X_22:dbl := calc.max(X_18:dbl,X_20:dbl);   #[8] (0) CALCmax 22 <- 18 20 
-    bat.append(X_13:bat[:dbl],X_22:dbl);       #[9] (0) BKCappend_val_wrap 23 
<- 13 22 
-    redo (X_17:oid,X_18:dbl) := iterator.next(b:bat[:dbl]);    #[10] (0) 
ITRbunNext 17 18 <- 1 
-exit (X_17:oid,X_18:dbl);                      #[11] (0)  17 18 
+    X_13:bat[:dbl] := bat.new(nil:dbl);        #[5] (0) CMDBATnewColumn 13 <- 
14 
+barrier (X_16:oid,X_17:dbl) := iterator.new(b:bat[:dbl]);      #[6] (0) 
ITRbunIterator 16 17 <- 1 
+    X_19:dbl := algebra.fetch(b2:bat[:dbl],X_16:oid);  #[7] (0) ALGfetchoid 19 
<- 2 16 
+    X_21:dbl := calc.max(X_17:dbl,X_19:dbl);   #[8] (0) CALCmax 21 <- 17 19 
+    bat.append(X_13:bat[:dbl],X_21:dbl);       #[9] (0) BKCappend_val_wrap 22 
<- 13 21 
+    redo (X_16:oid,X_17:dbl) := iterator.next(b:bat[:dbl]);    #[10] (0) 
ITRbunNext 16 17 <- 1 
+exit (X_16:oid,X_17:dbl);                      #[11] (0)  16 17 
     z:bat[:dbl] := X_13:bat[:dbl];             #[12] (0)  5 <- 13 
     io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]);    #[13] (0) IOtable 8 <- 
5 1 2 
 end user.tst;                                  #[14] (0)  
@@ -59,13 +59,13 @@ barrier X_9:bit := language.dataflow(); 
     c:lng := aggr.count(b:bat[:dbl]);          #[2] (0) ALGcount_bat 3 <- 1 
     c2:lng := aggr.count(b2:bat[:dbl]);        #[3] (0) ALGcount_bat 4 <- 2 
 exit X_9:bit;                                  #[4] (0)  9 
-    X_13:bat[:dbl] := bat.new(nil:oid,nil:dbl);        #[5] (0) CMDBATnew 13 
<- 14 15 
-barrier (X_17:oid,X_18:dbl) := iterator.new(b:bat[:dbl]);      #[6] (0) 
ITRbunIterator 17 18 <- 1 
-    X_20:dbl := algebra.fetch(b2:bat[:dbl],X_17:oid);  #[7] (0) ALGfetchoid 20 
<- 2 17 
-    X_22:dbl := calc.max(X_18:dbl,X_20:dbl);   #[8] (0) CALCmax 22 <- 18 20 
-    bat.append(X_13:bat[:dbl],X_22:dbl);       #[9] (0) BKCappend_val_wrap 23 
<- 13 22 
-    redo (X_17:oid,X_18:dbl) := iterator.next(b:bat[:dbl]);    #[10] (0) 
ITRbunNext 17 18 <- 1 
-exit (X_17:oid,X_18:dbl);                      #[11] (0)  17 18 
+    X_13:bat[:dbl] := bat.new(nil:dbl);        #[5] (0) CMDBATnewColumn 13 <- 
14 
+barrier (X_16:oid,X_17:dbl) := iterator.new(b:bat[:dbl]);      #[6] (0) 
ITRbunIterator 16 17 <- 1 
+    X_19:dbl := algebra.fetch(b2:bat[:dbl],X_16:oid);  #[7] (0) ALGfetchoid 19 
<- 2 16 
+    X_21:dbl := calc.max(X_17:dbl,X_19:dbl);   #[8] (0) CALCmax 21 <- 17 19 
+    bat.append(X_13:bat[:dbl],X_21:dbl);       #[9] (0) BKCappend_val_wrap 22 
<- 13 21 
+    redo (X_16:oid,X_17:dbl) := iterator.next(b:bat[:dbl]);    #[10] (0) 
ITRbunNext 16 17 <- 1 
+exit (X_16:oid,X_17:dbl);                      #[11] (0)  16 17 
     z:bat[:dbl] := X_13:bat[:dbl];             #[12] (0)  5 <- 13 
     io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]);    #[13] (0) IOtable 8 <- 
5 1 2 
 end user.tst;                                  #[14] (0)  
diff --git a/monetdb5/optimizer/opt_multiplex.c 
b/monetdb5/optimizer/opt_multiplex.c
--- a/monetdb5/optimizer/opt_multiplex.c
+++ b/monetdb5/optimizer/opt_multiplex.c
@@ -100,7 +100,6 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
                tt = getColumnType(getArgType(mb, pci, i));
 
                setVarType(mb, getArg(q, 0), newBatType(TYPE_oid, tt));
-               q = pushType(mb, q, TYPE_oid);
                q = pushType(mb, q, tt);
        }
 
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out 
b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
@@ -95,17 +95,17 @@ end user.s4_1;
 % clob # type
 % 97 # length
 function user.s8_1():void;
-    X_41:void := querylog.define("explain select fuse(a,b) from 
udf_fuse;","sequential_pipe",27);
-    X_24 := bat.new(nil:oid,nil:str);
-    X_32 := bat.append(X_24,"sys.L");
-    X_27 := bat.new(nil:oid,nil:str);
-    X_34 := bat.append(X_27,"fuse_a");
-    X_28 := bat.new(nil:oid,nil:str);
-    X_36 := bat.append(X_28,"smallint");
-    X_29 := bat.new(nil:oid,nil:int);
-    X_38 := bat.append(X_29,16);
-    X_31 := bat.new(nil:oid,nil:int);
-    X_40 := bat.append(X_31,0);
+    X_40:void := querylog.define("explain select fuse(a,b) from 
udf_fuse;","sequential_pipe",27);
+    X_24 := bat.new(nil:str);
+    X_31 := bat.append(X_24,"sys.L");
+    X_26 := bat.new(nil:str);
+    X_33 := bat.append(X_26,"fuse_a");
+    X_27 := bat.new(nil:str);
+    X_35 := bat.append(X_27,"smallint");
+    X_28 := bat.new(nil:int);
+    X_37 := bat.append(X_28,16);
+    X_30 := bat.new(nil:int);
+    X_39 := bat.append(X_30,0);
     X_1 := sql.mvc();
     C_2:bat[:oid] := sql.tid(X_1,"sys","udf_fuse");
     X_5:bat[:bte] := sql.bind(X_1,"sys","udf_fuse","a",0);
@@ -119,7 +119,7 @@ function user.s8_1():void;
     X_20 := sql.delta(X_15,C_17,r1_17,X_19);
     X_21 := algebra.projection(C_2,X_20);
     X_22:bat[:sht] := batudf.fuse(X_14,X_21);
-    sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
+    sql.resultSet(X_31,X_33,X_35,X_37,X_39,X_22);
 end user.s8_1;
 #explain select fuse(c,d) from udf_fuse;
 % .explain # table_name
@@ -127,17 +127,17 @@ end user.s8_1;
 % clob # type
 % 97 # length
 function user.s9_1():void;
-    X_41:void := querylog.define("explain select fuse(c,d) from 
udf_fuse;","sequential_pipe",27);
-    X_24 := bat.new(nil:oid,nil:str);
-    X_32 := bat.append(X_24,"sys.L");
-    X_27 := bat.new(nil:oid,nil:str);
-    X_34 := bat.append(X_27,"fuse_c");
-    X_28 := bat.new(nil:oid,nil:str);
-    X_36 := bat.append(X_28,"int");
-    X_29 := bat.new(nil:oid,nil:int);
-    X_38 := bat.append(X_29,32);
-    X_31 := bat.new(nil:oid,nil:int);
-    X_40 := bat.append(X_31,0);
+    X_40:void := querylog.define("explain select fuse(c,d) from 
udf_fuse;","sequential_pipe",27);
+    X_24 := bat.new(nil:str);
+    X_31 := bat.append(X_24,"sys.L");
+    X_26 := bat.new(nil:str);
+    X_33 := bat.append(X_26,"fuse_c");
+    X_27 := bat.new(nil:str);
+    X_35 := bat.append(X_27,"int");
+    X_28 := bat.new(nil:int);
+    X_37 := bat.append(X_28,32);
+    X_30 := bat.new(nil:int);
+    X_39 := bat.append(X_30,0);
     X_1 := sql.mvc();
     C_2:bat[:oid] := sql.tid(X_1,"sys","udf_fuse");
     X_5:bat[:sht] := sql.bind(X_1,"sys","udf_fuse","c",0);
@@ -151,7 +151,7 @@ function user.s9_1():void;
     X_20 := sql.delta(X_15,C_17,r1_17,X_19);
     X_21 := algebra.projection(C_2,X_20);
     X_22:bat[:int] := batudf.fuse(X_14,X_21);
-    sql.resultSet(X_32,X_34,X_36,X_38,X_40,X_22);
+    sql.resultSet(X_31,X_33,X_35,X_37,X_39,X_22);
 end user.s9_1;
 #explain select fuse(e,f) from udf_fuse;
 % .explain # table_name
@@ -159,17 +159,17 @@ end user.s9_1;
 % clob # type
 % 97 # length
 function user.s10_1():void;
-    X_41:void := querylog.define("explain select fuse(e,f) from 
udf_fuse;","sequential_pipe",27);
-    X_24 := bat.new(nil:oid,nil:str);
-    X_32 := bat.append(X_24,"sys.L");
-    X_27 := bat.new(nil:oid,nil:str);
-    X_34 := bat.append(X_27,"fuse_e");
-    X_28 := bat.new(nil:oid,nil:str);
-    X_36 := bat.append(X_28,"bigint");
-    X_29 := bat.new(nil:oid,nil:int);
-    X_38 := bat.append(X_29,64);
-    X_31 := bat.new(nil:oid,nil:int);
-    X_40 := bat.append(X_31,0);
+    X_40:void := querylog.define("explain select fuse(e,f) from 
udf_fuse;","sequential_pipe",27);
+    X_24 := bat.new(nil:str);
+    X_31 := bat.append(X_24,"sys.L");
+    X_26 := bat.new(nil:str);
+    X_33 := bat.append(X_26,"fuse_e");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to