MonetDB: default - Merge with Jan2014 branch.

[Sjoerd Mullender]

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

Merge with Jan2014 branch.


diffs (16 lines):

diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -840,9 +840,9 @@ int isAllScalar(MalBlkPtr mb, InstrPtr p
 int isMapOp(InstrPtr p){
        return  getModuleId(p) &&
                ((getModuleId(p) == malRef && getFunctionId(p) == multiplexRef) 
||
-               (getModuleId(p) == batcalcRef && getFunctionId(p) != 
mark_grpRef && getFunctionId(p) != rank_grpRef) ||
-               (getModuleId(p) != batcalcRef && strncmp(getModuleId(p), "bat", 
3) == 0) ||
-               (getModuleId(p) == mkeyRef));
+                (getModuleId(p) == batcalcRef && getFunctionId(p) != 
mark_grpRef && getFunctionId(p) != rank_grpRef) ||
+                (getModuleId(p) != batcalcRef && getModuleId(p) != batRef && 
strncmp(getModuleId(p), "bat", 3) == 0) ||
+                (getModuleId(p) == mkeyRef));
 }
 
 int isLikeOp(InstrPtr p){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list