MonetDB: xid - Use the decompressed variable

[Martin Kersten]

Changeset: 1dd5f16f9a93 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1dd5f16f9a93
Modified Files:
        monetdb5/optimizer/opt_xid.c
Branch: xid
Log Message:

Use the decompressed variable


diffs (20 lines):

diff --git a/monetdb5/optimizer/opt_xid.c b/monetdb5/optimizer/opt_xid.c
--- a/monetdb5/optimizer/opt_xid.c
+++ b/monetdb5/optimizer/opt_xid.c
@@ -56,13 +56,14 @@ OPTxidImplementation(Client cntxt, MalBl
                if( p->token == NOOPsymbol)
                        continue;
                /* decompress the arguments */
-               pushInstruction(mb,old[i]);
                for ( j =p->retc; j< p->argc; j++)
                if ( alias[getArg(p,j)]){
                        q = newStmt(mb,"xid","decompress");
                        q= pushArgument(mb,q, alias[getArg(p,j)]);
-                       getArg(q,0) = getArg(p,j);
+                       setVarType(mb, getArg(q,0), getVarType(mb, 
getArg(p,j)));
+                       getArg(p,j) = getArg(q,0);
                }
+               pushInstruction(mb,p);
 
                /* compress the result, if at least one column is :oid */
                for ( j =0, type= getVarType(mb,getArg(p,j)); j< p->retc; j++, 
type= getVarType(mb,getArg(p,j)))
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list