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

Modified Files:
        opt_algebra_cse.c 
Log Message:
propagated changes of Friday Mar 06 2009 - Tuesday Mar 10 2009
from the Feb2009 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/03/06 - mayrm: compiler/algebra/opt/opt_algebra_cse.c,1.47.2.1
if grouping is performed on the same attribute as the
aggregate function is applied, don't add this item to
the mapping structure
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


U opt_algebra_cse.c
Index: opt_algebra_cse.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_algebra_cse.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- opt_algebra_cse.c   14 Jan 2009 16:41:20 -0000      1.47
+++ opt_algebra_cse.c   10 Mar 2009 09:54:40 -0000      1.48
@@ -2329,7 +2329,11 @@
                     (cse->sem.aggr.part != col_NULL &&
                      ori->sem.aggr.part != col_NULL));
 
-            if (cse->sem.aggr.part != col_NULL)
+            /* if grouping is performed on the same attribute as the
+               aggregate function is applied don't add this item to
+               the mapping structure */
+            if ((cse->sem.aggr.part != col_NULL) && 
+                (ori->sem.aggr.part != ori->sem.aggr.col))
                 INACTCOL (actmap,
                           actcol (cse->sem.aggr.part, ori->sem.aggr.part));
 


------------------------------------------------------------------------------
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to