Changeset: f359b1ebdd7e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f359b1ebdd7e Modified Files: monetdb5/ChangeLog monetdb5/modules/kernel/00_aggr_hge.mal monetdb5/modules/kernel/00_aggr_hge.mal.sh monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh Branch: default Log Message:
Removed aggregate functions that weren't "headless". diffs (truncated from 1672 to 300 lines): diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog --- a/monetdb5/ChangeLog +++ b/monetdb5/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Thu Dec 10 2015 Sjoerd Mullender <[email protected]> +- Removed grouped aggregate functions from the aggr module in which the + groups were indicated by the head column of the bat to be aggregated. + Use the interface with a separate group bat instead. + * Tue Dec 8 2015 Sjoerd Mullender <[email protected]> - The server now stops executing a query when the client disconnects. diff --git a/monetdb5/modules/kernel/00_aggr_hge.mal b/monetdb5/modules/kernel/00_aggr_hge.mal --- a/monetdb5/modules/kernel/00_aggr_hge.mal +++ b/monetdb5/modules/kernel/00_aggr_hge.mal @@ -8,10 +8,6 @@ module aggr; -command sum(b:bat[:oid,:bte], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRsum2_hge -comment "Sum over grouped tail sum on bte"; - command sum(b:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRsum3_hge @@ -25,10 +21,6 @@ command subsum(b:bat[:oid,:bte],g:bat[:o address AGGRsubsumcand_hge comment "Grouped sum aggregate with candidates list"; -command prod(b:bat[:oid,:bte], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRprod2_hge -comment "Product over grouped tail product on bte"; - command prod(b:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRprod3_hge @@ -42,10 +34,6 @@ command subprod(b:bat[:oid,:bte],g:bat[: address AGGRsubprodcand_hge comment "Grouped product aggregate with candidates list"; -command sum(b:bat[:oid,:sht], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRsum2_hge -comment "Sum over grouped tail sum on sht"; - command sum(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRsum3_hge @@ -59,10 +47,6 @@ command subsum(b:bat[:oid,:sht],g:bat[:o address AGGRsubsumcand_hge comment "Grouped sum aggregate with candidates list"; -command prod(b:bat[:oid,:sht], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRprod2_hge -comment "Product over grouped tail product on sht"; - command prod(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRprod3_hge @@ -76,10 +60,6 @@ command subprod(b:bat[:oid,:sht],g:bat[: address AGGRsubprodcand_hge comment "Grouped product aggregate with candidates list"; -command sum(b:bat[:oid,:int], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRsum2_hge -comment "Sum over grouped tail sum on int"; - command sum(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRsum3_hge @@ -93,10 +73,6 @@ command subsum(b:bat[:oid,:int],g:bat[:o address AGGRsubsumcand_hge comment "Grouped sum aggregate with candidates list"; -command prod(b:bat[:oid,:int], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRprod2_hge -comment "Product over grouped tail product on int"; - command prod(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRprod3_hge @@ -110,10 +86,6 @@ command subprod(b:bat[:oid,:int],g:bat[: address AGGRsubprodcand_hge comment "Grouped product aggregate with candidates list"; -command sum(b:bat[:oid,:wrd], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRsum2_hge -comment "Sum over grouped tail sum on wrd"; - command sum(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRsum3_hge @@ -127,10 +99,6 @@ command subsum(b:bat[:oid,:wrd],g:bat[:o address AGGRsubsumcand_hge comment "Grouped sum aggregate with candidates list"; -command prod(b:bat[:oid,:wrd], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRprod2_hge -comment "Product over grouped tail product on wrd"; - command prod(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRprod3_hge @@ -144,10 +112,6 @@ command subprod(b:bat[:oid,:wrd],g:bat[: address AGGRsubprodcand_hge comment "Grouped product aggregate with candidates list"; -command sum(b:bat[:oid,:lng], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRsum2_hge -comment "Sum over grouped tail sum on lng"; - command sum(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRsum3_hge @@ -161,10 +125,6 @@ command subsum(b:bat[:oid,:lng],g:bat[:o address AGGRsubsumcand_hge comment "Grouped sum aggregate with candidates list"; -command prod(b:bat[:oid,:lng], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRprod2_hge -comment "Product over grouped tail product on lng"; - command prod(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRprod3_hge @@ -178,10 +138,6 @@ command subprod(b:bat[:oid,:lng],g:bat[: address AGGRsubprodcand_hge comment "Grouped product aggregate with candidates list"; -command sum(b:bat[:oid,:hge], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRsum2_hge -comment "Sum over grouped tail sum on hge"; - command sum(b:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRsum3_hge @@ -195,10 +151,6 @@ command subsum(b:bat[:oid,:hge],g:bat[:o address AGGRsubsumcand_hge comment "Grouped sum aggregate with candidates list"; -command prod(b:bat[:oid,:hge], e:bat[:oid,:any_1]) :bat[:oid,:hge] -address AGGRprod2_hge -comment "Product over grouped tail product on hge"; - command prod(b:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:hge] address AGGRprod3_hge @@ -212,18 +164,10 @@ command subprod(b:bat[:oid,:hge],g:bat[: address AGGRsubprodcand_hge comment "Grouped product aggregate with candidates list"; -command avg(b:bat[:oid,:hge], e:bat[:oid,:any_1]) :bat[:oid,:dbl] -address AGGRavg12_dbl -comment "Grouped tail average on hge"; - command avg(b:bat[:oid,:hge], g:bat[:oid,:oid], e:bat[:oid,:any_1]):bat[:oid,:dbl] address AGGRavg13_dbl comment "Grouped tail average on hge"; -command avg(b:bat[:oid,:hge], e:bat[:oid,:any_1]) (:bat[:oid,:dbl],:bat[:oid,:wrd]) -address AGGRavg22_dbl -comment "Grouped tail average on hge, also returns count"; - command avg(b:bat[:oid,:hge], g:bat[:oid,:oid], e:bat[:oid,:any_1]) (:bat[:oid,:dbl],:bat[:oid,:wrd]) address AGGRavg23_dbl comment "Grouped tail average on hge, also returns count"; @@ -244,10 +188,6 @@ command subavg(b:bat[:oid,:hge],g:bat[:o address AGGRsubavg2cand_dbl comment "Grouped average aggregate with candidates list, also returns count"; -command stdev(b:bat[:oid,:hge], e:bat[:oid,:any_1]) :bat[:oid,:dbl] -address AGGRstdev2_dbl -comment "Grouped tail standard deviation (sample/non-biased) on hge"; - command stdev(b:bat[:oid,:hge], g:bat[:oid,:oid], e:bat[:oid,:any_1]):bat[:oid,:dbl] address AGGRstdev3_dbl comment "Grouped tail standard deviation (sample/non-biased) on hge"; @@ -260,10 +200,6 @@ command substdev(b:bat[:oid,:hge],g:bat[ address AGGRsubstdevcand_dbl comment "Grouped standard deviation (sample/non-biased) aggregate with candidates list"; -command stdevp(b:bat[:oid,:hge], e:bat[:oid,:any_1]) :bat[:oid,:dbl] -address AGGRstdevp2_dbl -comment "Grouped tail standard deviation (population/biased) on hge"; - command stdevp(b:bat[:oid,:hge], g:bat[:oid,:oid], e:bat[:oid,:any_1]):bat[:oid,:dbl] address AGGRstdevp3_dbl comment "Grouped tail standard deviation (population/biased) on hge"; @@ -276,10 +212,6 @@ command substdevp(b:bat[:oid,:hge],g:bat address AGGRsubstdevpcand_dbl comment "Grouped standard deviation (population/biased) aggregate with candidates list"; -command variance(b:bat[:oid,:hge], e:bat[:oid,:any_1]) :bat[:oid,:dbl] -address AGGRvariance2_dbl -comment "Grouped tail variance (sample/non-biased) on hge"; - command variance(b:bat[:oid,:hge], g:bat[:oid,:oid], e:bat[:oid,:any_1]):bat[:oid,:dbl] address AGGRvariance3_dbl comment "Grouped tail variance (sample/non-biased) on hge"; @@ -292,10 +224,6 @@ command subvariance(b:bat[:oid,:hge],g:b address AGGRsubvariancecand_dbl comment "Grouped variance (sample/non-biased) aggregate with candidates list"; -command variancep(b:bat[:oid,:hge], e:bat[:oid,:any_1]) :bat[:oid,:dbl] -address AGGRvariancep2_dbl -comment "Grouped tail variance (population/biased) on hge"; - command variancep(b:bat[:oid,:hge], g:bat[:oid,:oid], e:bat[:oid,:any_1]):bat[:oid,:dbl] address AGGRvariancep3_dbl comment "Grouped tail variance (population/biased) on hge"; diff --git a/monetdb5/modules/kernel/00_aggr_hge.mal.sh b/monetdb5/modules/kernel/00_aggr_hge.mal.sh --- a/monetdb5/modules/kernel/00_aggr_hge.mal.sh +++ b/monetdb5/modules/kernel/00_aggr_hge.mal.sh @@ -22,10 +22,6 @@ for tp1 in 1:bte 2:sht 4:int 8:wrd 8:lng for tp2 in 16:hge; do if [ ${tp1%:*} -le ${tp2%:*} -o ${tp1#*:} = ${tp2#*:} ]; then cat <<EOF -command sum(b:bat[:oid,:${tp1#*:}], e:bat[:oid,:any_1]) :bat[:oid,:${tp2#*:}] -address AGGRsum2_${tp2#*:} -comment "Sum over grouped tail sum on ${tp1#*:}"; - command sum(b:bat[:oid,:${tp1#*:}],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:${tp2#*:}] address AGGRsum3_${tp2#*:} @@ -44,10 +40,6 @@ command subsum(b:bat[:oid,:${tp1#*:}],g: address AGGRsubsumcand_${tp2#*:} comment "Grouped sum aggregate with candidates list"; -command prod(b:bat[:oid,:${tp1#*:}], e:bat[:oid,:any_1]) :bat[:oid,:${tp2#*:}] -address AGGRprod2_${tp2#*:} -comment "Product over grouped tail product on ${tp1#*:}"; - command prod(b:bat[:oid,:${tp1#*:}],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:${tp2#*:}] address AGGRprod3_${tp2#*:} @@ -70,10 +62,6 @@ for tp1 in 16:hge; do for tp2 in 8:dbl 1:bte 2:sht 4:int 4:wrd 8:lng 16:hge; do if [ ${tp1%:*} -le ${tp2%:*} -o ${tp1#*:} = ${tp2#*:} ]; then cat <<EOF -command sum(b:bat[:oid,:${tp1#*:}], e:bat[:oid,:any_1]) :bat[:oid,:${tp2#*:}] -address AGGRsum2_${tp2#*:} -comment "Sum over grouped tail sum on ${tp1#*:}"; - command sum(b:bat[:oid,:${tp1#*:}],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:${tp2#*:}] address AGGRsum3_${tp2#*:} @@ -92,10 +80,6 @@ command subsum(b:bat[:oid,:${tp1#*:}],g: address AGGRsubsumcand_${tp2#*:} comment "Grouped sum aggregate with candidates list"; -command prod(b:bat[:oid,:${tp1#*:}], e:bat[:oid,:any_1]) :bat[:oid,:${tp2#*:}] -address AGGRprod2_${tp2#*:} -comment "Product over grouped tail product on ${tp1#*:}"; - command prod(b:bat[:oid,:${tp1#*:}],g:bat[:oid,:oid],e:bat[:oid,:any_1]) :bat[:oid,:${tp2#*:}] address AGGRprod3_${tp2#*:} @@ -117,18 +101,10 @@ done # We may have to extend the signatures to all possible {void,oid} combos for tp in hge; do cat <<EOF -command avg(b:bat[:oid,:${tp}], e:bat[:oid,:any_1]) :bat[:oid,:dbl] -address AGGRavg12_dbl -comment "Grouped tail average on ${tp}"; - command avg(b:bat[:oid,:${tp}], g:bat[:oid,:oid], e:bat[:oid,:any_1]):bat[:oid,:dbl] address AGGRavg13_dbl comment "Grouped tail average on ${tp}"; -command avg(b:bat[:oid,:${tp}], e:bat[:oid,:any_1]) (:bat[:oid,:dbl],:bat[:oid,:wrd]) -address AGGRavg22_dbl -comment "Grouped tail average on ${tp}, also returns count"; - command avg(b:bat[:oid,:${tp}], g:bat[:oid,:oid], e:bat[:oid,:any_1]) (:bat[:oid,:dbl],:bat[:oid,:wrd]) address AGGRavg23_dbl comment "Grouped tail average on ${tp}, also returns count"; @@ -154,10 +130,6 @@ EOF comm=${func#*:} func=${func%:*} cat <<EOF -command ${func}(b:bat[:oid,:${tp}], e:bat[:oid,:any_1]) :bat[:oid,:dbl] -address AGGR${func}2_dbl -comment "Grouped tail ${comm} (sample/non-biased) on ${tp}"; - command ${func}(b:bat[:oid,:${tp}], g:bat[:oid,:oid], e:bat[:oid,:any_1]):bat[:oid,:dbl] address AGGR${func}3_dbl comment "Grouped tail ${comm} (sample/non-biased) on ${tp}"; @@ -170,10 +142,6 @@ command sub${func}(b:bat[:oid,:${tp}],g: address AGGRsub${func}cand_dbl comment "Grouped ${comm} (sample/non-biased) aggregate with candidates list"; -command ${func}p(b:bat[:oid,:${tp}], e:bat[:oid,:any_1]) :bat[:oid,:dbl] -address AGGR${func}p2_dbl -comment "Grouped tail ${comm} (population/biased) on ${tp}"; - command ${func}p(b:bat[:oid,:${tp}], g:bat[:oid,:oid], e:bat[:oid,:any_1]):bat[:oid,:dbl] address AGGR${func}p3_dbl _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
