Changeset: e9524d62aece for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9524d62aece
Modified Files:
        sql/server/rel_optimizer.c
Branch: Jun2020
Log Message:

small fix for rel_split_project, don't refer to a earlier expression if it 
hides a deeper expression.


diffs (22 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
@@ -7785,7 +7785,17 @@ add_exp_too_project(mvc *sql, sql_exp *e
                exp_label(sql->sa, e, ++sql->label);
                append(rel->exps, e);
        } else {
-               e = n->data;
+               sql_exp *ne = n->data;
+
+               if (rel && rel->l) { 
+                       if ((exp_relname(ne) && exp_name(ne) && 
rel_bind_column2(sql, rel->l, exp_relname(ne), exp_name(ne), 0)) ||
+                          (!exp_relname(ne) && exp_name(ne) && 
rel_bind_column(sql, rel->l, exp_name(ne), 0, 1))) {
+                               exp_label(sql->sa, e, ++sql->label);
+                               append(rel->exps, e);
+                               ne = e;
+                       }
+               }
+               e = ne;
        }
        e = exp_ref(sql, e);
        return e;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to