Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4243/compiler/algebra/prop
Modified Files:
Tag: M5XQ
prop_dom.c
Log Message:
propagated changes of Friday Jun 12 2009 - Monday Jun 15 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/06/12 - tsheyar: compiler/algebra/prop/prop_dom.c,1.68
-- Replaced aggregate operators count, min, max, avg, sum, prod, seqty1,
and all in the algebra by a single aggregate operator ``aggr''
that can handle multiple aggregates. The aggregate entries
are of kind count, min, max, avg, sum, prod, seqty1, all, and dist.
-- Added new aggregate kind ``dist'' that allows to represent group by
columns that functionally depend on the partitioning criterion
in the result of the grouping aggregate.
-- Added rewrite that merges aggregates.
-- Added rewrite that removes superfluous aggregates.
-- Added rewrite that pushes a rank operator through an aggregate.
-- Extended the XML import to cope with the old
as well as the new representation of aggregates.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U prop_dom.c
Index: prop_dom.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_dom.c,v
retrieving revision 1.65.2.2
retrieving revision 1.65.2.3
diff -u -d -r1.65.2.2 -r1.65.2.3
--- prop_dom.c 12 May 2009 13:35:13 -0000 1.65.2.2
+++ prop_dom.c 15 Jun 2009 12:45:51 -0000 1.65.2.3
@@ -936,21 +936,29 @@
add_new_dom (n->sem.unary.res);
break;
- case la_avg:
- case la_sum:
- case la_prod:
- case la_count:
- case la_seqty1:
- case la_all:
- add_new_dom (n->sem.aggr.res);
- if (n->sem.aggr.part)
- add_dom (n->sem.aggr.part,
- PFprop_dom (L(n)->prop, n->sem.aggr.part));
- break;
-
- case la_max:
- case la_min:
- filter_dom_ (L(n), n->sem.aggr.col, n->sem.aggr.res);
+ case la_aggr:
+ for (unsigned int i = 0; i < n->sem.aggr.count; i++)
+ switch (n->sem.aggr.aggr[i].kind) {
+ case alg_aggr_dist:
+ add_dom (n->sem.aggr.aggr[i].res,
+ PFprop_dom (L(n)->prop,
+ n->sem.aggr.aggr[i].col));
+ break;
+ case alg_aggr_min:
+ case alg_aggr_max:
+ case alg_aggr_all:
+ filter_dom_ (L(n),
+ n->sem.aggr.aggr[i].col,
+ n->sem.aggr.aggr[i].res);
+ break;
+ case alg_aggr_count:
+ case alg_aggr_avg:
+ case alg_aggr_sum:
+ case alg_aggr_seqty1:
+ case alg_aggr_prod:
+ add_new_dom (n->sem.aggr.aggr[i].res);
+ break;
+ }
if (n->sem.aggr.part)
add_dom (n->sem.aggr.part,
PFprop_dom (L(n)->prop, n->sem.aggr.part));
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
