Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4671/compiler/algebra/opt

Modified Files:
      Tag: Aug2009_NFI
        opt_complex.c 
Log Message:
Propagated changes from Aug2009 branch to Aug2009_NFI branch.

U opt_complex.c
Index: opt_complex.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_complex.c,v
retrieving revision 1.80.6.1
retrieving revision 1.80.6.2
diff -u -d -r1.80.6.1 -r1.80.6.2
--- opt_complex.c       28 Sep 2009 23:20:25 -0000      1.80.6.1
+++ opt_complex.c       7 Oct 2009 14:09:40 -0000       1.80.6.2
@@ -2092,7 +2092,11 @@
                     if (p->sem.aggr.aggr[i].col &&
                         PFprop_fd (L(p)->prop,
                                    p->sem.aggr.part,
-                                   p->sem.aggr.aggr[i].col))
+                                   p->sem.aggr.aggr[i].col) &&
+                        (p->sem.aggr.aggr[i].kind == alg_aggr_min ||
+                         p->sem.aggr.aggr[i].kind == alg_aggr_max ||
+                         p->sem.aggr.aggr[i].kind == alg_aggr_avg ||
+                         p->sem.aggr.aggr[i].kind == alg_aggr_all))
                         p->sem.aggr.aggr[i].kind = alg_aggr_dist;
             /* A further rewrite in opt_general.brg will introduce distinct
                operators if no other aggregates exist. */


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to