MonetDB: Dec2016 - Properly copy candidate list property in mult...

[Sjoerd Mullender]

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

Properly copy candidate list property in multiple assignment.


diffs (18 lines):

diff --git a/monetdb5/optimizer/opt_candidates.c 
b/monetdb5/optimizer/opt_candidates.c
--- a/monetdb5/optimizer/opt_candidates.c
+++ b/monetdb5/optimizer/opt_candidates.c
@@ -27,8 +27,12 @@ OPTcandidatesImplementation(Client cntxt
        (void) stk;             /* to fool compilers */
        for (i = 0; i < mb->stop; i++) {
                p = getInstrPtr(mb,i);
-               if( p->token == ASSIGNsymbol && isVarCList(mb,getArg(p,1)))
-                       setVarCList(mb,getArg(p,0));
+               if( p->token == ASSIGNsymbol) {
+                       int j;
+                       for (j = 0; j < p->retc && j + p->retc < p->argc; j++)
+                               if (isVarCList(mb,getArg(p,p->retc + j)))
+                                       setVarCList(mb,getArg(p,j));
+               }
                if( getModuleId(p) == sqlRef){
                        if(getFunctionId(p) == tidRef) 
                                setVarCList(mb,getArg(p,0));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list