MonetDB: Jul2015 - fixed argument allocation problem in remap op...

[Niels Nes]

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

fixed argument allocation problem in remap optimizer when
remapping multi-result mal statements


diffs (15 lines):

diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -38,7 +38,10 @@ OPTremapDirect(Client cntxt, MalBlkPtr m
        setFunctionId(p,putName(fcn, strlen(fcn)));
 
        for(i=0; i<pci->retc; i++)
-               getArg(p,i)= getArg(pci,i);
+               if (i<1)
+                       getArg(p,i) = getArg(pci,i);
+               else
+                       p = pushReturn(mb, p, getArg(pci,i));
        p->retc= p->argc= pci->retc;
        for(i= pci->retc+2; i<pci->argc; i++)
                p= pushArgument(mb,p,getArg(pci,i));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list