MonetDB: jit - Check for double returns in emptycolumnidx

[Martin Kersten]

Changeset: 9e6bc7e76f6b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e6bc7e76f6b
Modified Files:
        monetdb5/optimizer/opt_emptycolumn.c
Branch: jit
Log Message:

Check for double returns in emptycolumnidx


diffs (23 lines):

diff --git a/monetdb5/optimizer/opt_emptycolumn.c 
b/monetdb5/optimizer/opt_emptycolumn.c
--- a/monetdb5/optimizer/opt_emptycolumn.c
+++ b/monetdb5/optimizer/opt_emptycolumn.c
@@ -178,11 +178,14 @@ OPTemptycolumnImplementation(Client cntx
                                }
                        }
                        if( marked[getArg(p,0)]){
-                               int tpe = 
getColumnType(getVarType(mb,getArg(p,1)));
-                               q= newStmt(mb,batRef,newRef);
-                               q = pushType(mb,q, TYPE_oid);
-                               q = pushType(mb,q,tpe);
-                               getArg(q,0)= getArg(p,1);
+                               int tpe;
+                               if( p->retc == 2){
+                                       tpe = 
getColumnType(getVarType(mb,getArg(p,1)));
+                                       q= newStmt(mb,batRef,newRef);
+                                       q = pushType(mb,q, TYPE_oid);
+                                       q = pushType(mb,q,tpe);
+                                       getArg(q,0)= getArg(p,1);
+                               }
                                
                                tpe = getColumnType(getVarType(mb,getArg(p,0)));
                                clrFunction(p);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list