MonetDB: label - fixed lookup of count expression

[Niels Nes via checkin-list]

Changeset: 3f5268a0c6dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3f5268a0c6dc
Modified Files:
        sql/server/rel_unnest.c
Branch: label
Log Message:

fixed lookup of count expression


diffs (27 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
@@ -3241,17 +3241,21 @@ rewrite_compare(visitor *v, sql_rel *rel
                                        return NULL;
                                re = rsq->exps->t->data;
 
+#if 0
                                if (!is_tuple) {
                                        re = exp_label(v->sql->sa, re, 
++v->sql->label); /* unique name */
                                        list_hash_clear(rsq->exps);
                                        re = exp_ref(v->sql, re);
                                }
+#endif
                                set_processed(rsq);
                        }
 
                        int is_cnt = 0;
-                       if (rsq)
-                               is_cnt = exp_is_count(re, rsq);
+                       if (rsq) {
+                               sql_exp *r = exps_bind_nid(rsq->exps, re->nid);
+                               is_cnt = exp_is_count(r, rsq);
+                       }
                        if (is_project(rel->op) || depth > 0 || quantifier || 
is_cnt) {
                                sql_rel *sq = lsq;
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org