Changeset: e56afa809911 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e56afa809911
Modified Files:
monetdb5/optimizer/opt_candidates.c
Branch: Jul2017
Log Message:
The functions are called bat.{merge,intersect}cand, not algebra.*.
diffs (24 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
@@ -54,10 +54,6 @@ OPTcandidatesImplementation(Client cntxt
setVarCList(mb,getArg(p,0));
else if(getFunctionId(p) == firstnRef )
setVarCList(mb,getArg(p,0));
- else if(getFunctionId(p) == mergecandRef )
- setVarCList(mb,getArg(p,0));
- else if(getFunctionId(p) == intersectcandRef )
- setVarCList(mb,getArg(p,0));
else if(getFunctionId(p) == subsliceRef )
setVarCList(mb,getArg(p,0));
}
@@ -73,6 +69,9 @@ OPTcandidatesImplementation(Client cntxt
if (getFunctionId(p) == subgroupRef || getFunctionId(p)
== subgroupdoneRef ||
getFunctionId(p) == groupRef || getFunctionId(p) ==
groupdoneRef)
setVarCList(mb, getArg(p, 1));
+ } else if (getModuleId(p) == batRef) {
+ if (getFunctionId(p) == mergecandRef ||
getFunctionId(p) == intersectcandRef)
+ setVarCList(mb,getArg(p,0));
}
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
