MonetDB: balanced_union - exp_is_count() is aware of n-ary munion

[stefanos mavros via checkin-list]

Changeset: 7e61977cfc95 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7e61977cfc95
Modified Files:
        sql/server/rel_unnest.c
Branch: balanced_union
Log Message:

exp_is_count() is aware of n-ary munion


diffs (18 lines):

diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -1140,8 +1140,12 @@ exp_is_count(sql_exp *e, sql_rel *rel)
        if (!e || !rel)
                return 0;
        if (is_alias(e->type) && is_project(rel->op)) {
-               sql_exp *ne = rel_find_exp(rel->l, e);
-               return exp_is_count(ne, rel->l);
+               /* if the relop is n-ary (like munion) we need to retrieve its
+                * first operands which lives in the list at rel->l
+                */
+               sql_rel *pr = is_munion(rel->op) ? ((list*)rel->l)->h->data : 
rel->l;
+               sql_exp *ne = rel_find_exp(pr, e);
+               return exp_is_count(ne, pr);
        }
        if (is_convert(e->type))
                return exp_is_count(e->l, rel);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org