Changeset: 62d5e7ce9ca3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62d5e7ce9ca3
Modified Files:
monetdb5/optimizer/opt_mergetable.c
Branch: Oct2014
Log Message:
fixes for mergetable after not so recent firstn introduction
diffs (18 lines):
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1529,12 +1529,12 @@ OPTmergetableImplementation(Client cntxt
continue;
}
- if (!distinct_topn && match == 1 && bats == 1 &&
(p->argc-p->retc) == 2 && isTopn(p) && ((m=is_a_mat(getArg(p,p->retc), mat,
mtop)) >= 0)) {
+ if (!distinct_topn && match == 1 && bats == 1 &&
(p->argc-p->retc) == 4 && isTopn(p) && ((m=is_a_mat(getArg(p,p->retc), mat,
mtop)) >= 0)) {
mtop = mat_topn(mb, p, mat, mtop, m, -1, -1);
actions++;
continue;
}
- if (!distinct_topn && match == 3 && bats == 3 &&
(p->argc-p->retc) == 4 && isTopn(p) &&
+ if (!distinct_topn && match == 3 && bats == 3 &&
(p->argc-p->retc) == 6 && isTopn(p) &&
((m=is_a_mat(getArg(p,p->retc), mat, mtop)) >= 0) &&
((n=is_a_mat(getArg(p,p->retc+1), mat, mtop)) >= 0) &&
((o=is_a_mat(getArg(p,p->retc+2), mat, mtop)) >= 0)) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
