Changeset: 5d5f6a72806c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5d5f6a72806c
Modified Files:
sql/server/rel_optimize_others.c
Branch: nested
Log Message:
merged with default
diffs (27 lines):
diff --git a/sql/server/rel_optimize_others.c b/sql/server/rel_optimize_others.c
--- a/sql/server/rel_optimize_others.c
+++ b/sql/server/rel_optimize_others.c
@@ -160,20 +160,9 @@ exp_push_down_prj(mvc *sql, sql_exp *e,
return NULL;
return exp_propagate(sql->sa, ne, e);
case e_convert:
- {
- sql_exp *l = e->l;
- if (l->type == e_column) {
- sql_exp *ne = exps_bind_nid(f->exps, l->nid);
- if (!ne || !ne->nid)
- return NULL;
- sql_exp *nne = exps_bind_nid(t->exps, ne->nid);
- if (!nne)
- return NULL;
- l = exp_ref(sql, nne);
- } else if (!(l = exp_push_down_prj(sql, e->l, f, t)))
- return NULL;
- ne = exp_convert(sql, l, exp_fromtype(e),
exp_totype(e));
- }
+ if (e->f || !(l = exp_push_down_prj(sql, e->l, f, t)))
+ return NULL;
+ ne = exp_convert(sql, l, exp_fromtype(e), exp_totype(e));
return exp_propagate(sql->sa, ne, e);
case e_aggr:
case e_func: {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
