MonetDB: default - Merge with Jul2015 branch.

[Sjoerd Mullender]

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

Merge with Jul2015 branch.


diffs (16 lines):

diff --git a/monetdb5/optimizer/opt_pushselect.c 
b/monetdb5/optimizer/opt_pushselect.c
--- a/monetdb5/optimizer/opt_pushselect.c
+++ b/monetdb5/optimizer/opt_pushselect.c
@@ -217,10 +217,10 @@ OPTpushselectImplementation(Client cntxt
                                                        tid = getArg(q, 1);
                                        }
                                        break;
-                               } else if (isMapOp(q) && q->argc >= 2 && 
isaBatType(getArgType(mb, q, 1))) {
+                               } else if (isMapOp(q) && q->retc == 1 && 
q->argc >= 2 && isaBatType(getArgType(mb, q, 1))) {
                                        int i1 = getArg(q, 1);
                                        q = old[vars[i1]];
-                               } else if (isMapOp(q) && q->argc >= 3 && 
isaBatType(getArgType(mb, q, 2))) {
+                               } else if (isMapOp(q) && q->retc == 1 && 
q->argc >= 3 && isaBatType(getArgType(mb, q, 2))) {
                                        int i2 = getArg(q, 2);
                                        q = old[vars[i2]];
                                } else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list