Changeset: bb98cf766654 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb98cf766654
Modified Files:
monetdb5/optimizer/opt_support.c
Branch: Jan2014
Log Message:
Slightly degeneralized isMatOp.
This is a refinement of changeset fbef2821e2a1. Now don't recognize
functions in module bat itself as eligible. This fixes the errors
that are happening in mat00 and mat01 tests in monetdb5/optimizer.
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
@@ -828,9 +828,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
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
