Changeset: bad8a6eb968f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bad8a6eb968f
Modified Files:
        sql/src/server/rel_optimizer.mx
Branch: default
Log Message:

use new macros to cleanup code


diffs (21 lines):

diff -r 8a1da7574e68 -r bad8a6eb968f sql/src/server/rel_optimizer.mx
--- a/sql/src/server/rel_optimizer.mx   Wed May 05 00:36:59 2010 +0200
+++ b/sql/src/server/rel_optimizer.mx   Wed May 05 10:25:19 2010 +0200
@@ -991,7 +991,7 @@
                if (e->type == e_func)
                        return exp_op(nl, sql_dup_func(e->f));
                else 
-                       return exp_aggr(nl, sql_dup_aggr(e->f), e->flag&1, 
(e->flag>>1), e->card, has_nil(e));
+                       return exp_aggr(nl, sql_dup_aggr(e->f), 
need_distinct(e), need_no_nil(e), e->card, has_nil(e));
        }       
        case e_atom:
                return exp_dup(e);
@@ -1103,7 +1103,7 @@
                if (e->type == e_func)
                        return exp_op(nl, sql_dup_func(e->f));
                else 
-                       return exp_aggr(nl, sql_dup_aggr(e->f), e->flag&1, 
(e->flag>>1), e->card, has_nil(e));
+                       return exp_aggr(nl, sql_dup_aggr(e->f), 
need_distinct(e), need_no_nil(e), e->card, has_nil(e));
        }       
        case e_atom:
                return exp_dup(e);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to