Changeset: fbef2821e2a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbef2821e2a1
Modified Files:
monetdb5/optimizer/opt_support.c
Branch: Jan2014
Log Message:
generalized isMatOp
diffs (20 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,13 +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)== batmtimeRef) ||
- (getModuleId(p)== batstrRef) ||
- (getModuleId(p)== batmmathRef) ||
- (getModuleId(p)== batxmlRef) ||
- (strcmp(getModuleId(p),"batsql") == 0) ||
- (getModuleId(p)== mkeyRef));
+ (getModuleId(p) == batcalcRef && getFunctionId(p) !=
mark_grpRef && getFunctionId(p) != rank_grpRef) ||
+ (getModuleId(p) != batcalcRef && 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
