Changeset: 0306967a1af0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0306967a1af0 Modified Files: sql/server/rel_optimizer.c Branch: Oct2020 Log Message:
Forgot the other case diffs (15 lines): diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c --- a/sql/server/rel_optimizer.c +++ b/sql/server/rel_optimizer.c @@ -1553,9 +1553,9 @@ rel_push_func_down(visitor *v, sql_rel * sql_rel *l = pl->l, *r = pl->r; list *nexps = new_exp_list(v->sql->sa); - if (push_left && !is_simple_project(l->op)) + if (push_left && (!is_simple_project(l->op) || !l->l)) pl->l = l = rel_project(v->sql->sa, l, rel_projections(v->sql, l, NULL, 1, 1)); - if (push_right && !is_simple_project(r->op)) + if (push_right && (!is_simple_project(r->op)|| !r->l)) pl->r = r = rel_project(v->sql->sa, r, rel_projections(v->sql, r, NULL, 1, 1)); for (node *n = rel->exps->h; n; n = n->next) { sql_exp *e = n->data; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list