MonetDB: default - Headless type used

[Martin Kersten]

Changeset: eca27b53abf1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eca27b53abf1
Modified Files:
        monetdb5/optimizer/opt_multiplex.c
Branch: default
Log Message:

Headless type used


diffs (45 lines):

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
@@ -38,15 +38,12 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
        str mod, fcn;
        int *alias, *resB;
        InstrPtr q;
-       int ht, tt;
+       int tt;
        int bat = (getModuleId(pci) == batmalRef) ;
 
        (void) cntxt;
        (void) stk;
        for (i = 0; i < pci->retc; i++) {
-               ht = getHeadType(getArgType(mb, pci, i));
-               if (ht != TYPE_oid)
-                       throw(MAL, "optimizer.multiplex", "Target head type is 
missing");
                tt = getColumnType(getArgType(mb, pci, i));
                if (tt== TYPE_any)
                        throw(MAL, "optimizer.multiplex", "Target tail type is 
missing");
@@ -102,11 +99,9 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
                q = newFcnCall(mb, batRef, newRef);
                resB[i] = getArg(q, 0);
 
-               ht = getHeadType(getArgType(mb, pci, i));
                tt = getColumnType(getArgType(mb, pci, i));
-
-               setVarType(mb, getArg(q, 0), newBatType(ht, tt));
-               q = pushType(mb, q, ht);
+               setVarType(mb, getArg(q, 0), newBatType(TYPE_void, tt));
+               q = pushType(mb, q, TYPE_void);
                q = pushType(mb, q, tt);
        }
 
@@ -135,9 +130,8 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
        for (i = 0; i < pci->retc; i++) {
                int nvar = 0;
                if (bat) {
-                       ht = getHeadType(getArgType(mb, pci, i));
                        tt = getColumnType(getArgType(mb, pci, i));
-                       nvar = newTmpVariable(mb, newBatType(ht, tt));
+                       nvar = newTmpVariable(mb, newBatType(TYPE_void, tt));
                } else {
                        nvar = newTmpVariable(mb, TYPE_any);
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list