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

fixed crash in distinct rewrite


diffs (20 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
@@ -5177,14 +5177,14 @@ rel_groupby_distinct2(int *changes, mvc 
                        exp_setname(sql->sa, v, exp_find_rel_name(e), 
exp_name(e));
                        append(naggrs, v);
                } else { /* group by col */
-                       if (list_find_exp(gbes, e)) {  /* group by exp are 
needed in the aggr list, simple (alias or project) expressions are just needed 
in the result */
+                       if (list_find_exp(gbes, e) || !list_find_exp(naggrs, 
e)) { 
                                append(aggrs, e);
        
                                e = exp_column(sql->sa, exp_find_rel_name(e), 
exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
                        }
                        append(naggrs, e);
                }
-       }       
+       }
 
        l = rel->l = rel_groupby(sql, rel->l, gbes);
        l->exps = aggrs;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to