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

merged


diffs (22 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
@@ -495,7 +495,8 @@ push_up_groupby(mvc *sql, sql_rel *rel)
                                                col = exp_ref(sql->sa, col);
                                                col = exp_unop(sql->sa, col, 
sql_bind_func(sql->sa, NULL, "identity", exp_subtype(col), NULL, F_FUNC));
                                                col = exp_label(sql->sa, col, 
++sql->label);
-                                               append(r->exps, col);
+                                               if (!exps_find_exp(r->exps, 
col))
+                                                       append(r->exps, col);
                                        }
                                        exp_ref(sql->sa, col);
                                        append(e->l=sa_list(sql->sa), col);
@@ -508,7 +509,7 @@ push_up_groupby(mvc *sql, sql_rel *rel)
                        if (!r->r)
                                r->r = exps_copy(sql->sa, a);
                        else
-                               r->r = list_merge(r->r, exps_copy(sql->sa, a), 
(fdup)NULL);
+                               r->r = list_distinct(list_merge(r->r, 
exps_copy(sql->sa, a), (fdup)NULL), (fcmp)exp_equal, (fdup)NULL);
 
                        rel->r = r->l; 
                        r->l = rel;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to