Changeset: 0a6125640305 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a6125640305 Removed Files: monetdb5/modules/kernel/00_aggr_hge.mal.sh monetdb5/modules/kernel/aggr.mal.sh monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/00_calc_hge.mal.sh monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/01_calc.mal.sh monetdb5/modules/mal/batmtime.mal.sh sql/backends/monet5/sql_decimal.mal.sh sql/backends/monet5/sql_decimal_hge.mal.sh sql/backends/monet5/sql_rank.mal.sh sql/backends/monet5/sql_rank_hge.mal.sh Branch: oscar Log Message:
Remove generate scripts. diffs (truncated from 3931 to 300 lines): diff --git a/monetdb5/modules/kernel/00_aggr_hge.mal.sh b/monetdb5/modules/kernel/00_aggr_hge.mal.sh deleted file mode 100644 --- a/monetdb5/modules/kernel/00_aggr_hge.mal.sh +++ /dev/null @@ -1,198 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. - -sed '/^$/q' $0 # copy copyright from this file - -cat <<EOF -# This file was generated by using the script ${0##*/}. - -module aggr; - -EOF - -integer="bte sht int lng hge" # all integer types -numeric="$integer flt dbl" # all numeric types -fixtypes="bit $numeric oid" -alltypes="$fixtypes str" - -for tp1 in 1:bte 2:sht 4:int 8:lng; do - for tp2 in 16:hge; do - if [ ${tp1%:*} -le ${tp2%:*} -o ${tp1#*:} = ${tp2#*:} ]; then - cat <<EOF -command sum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1]) - :bat[:${tp2#*:}] -address AGGRsum3_${tp2#*:} -comment "Grouped tail sum on ${tp1#*:}"; - -EOF - if [ ${tp2#*:} = dbl ]; then - continue - fi - cat <<EOF -command subsum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubsum_${tp2#*:} -comment "Grouped sum aggregate"; - -command subsum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubsumcand_${tp2#*:} -comment "Grouped sum aggregate with candidates list"; - -command prod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1]) - :bat[:${tp2#*:}] -address AGGRprod3_${tp2#*:} -comment "Grouped tail product on ${tp1#*:}"; - -command subprod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubprod_${tp2#*:} -comment "Grouped product aggregate"; - -command subprod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubprodcand_${tp2#*:} -comment "Grouped product aggregate with candidates list"; - -EOF - fi - done -done - -for tp1 in 16:hge; do - for tp2 in 8:dbl 1:bte 2:sht 4:int 8:lng 16:hge; do - if [ ${tp1%:*} -le ${tp2%:*} -o ${tp1#*:} = ${tp2#*:} ]; then - cat <<EOF -command sum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1]) - :bat[:${tp2#*:}] -address AGGRsum3_${tp2#*:} -comment "Grouped tail sum on ${tp1#*:}"; - -EOF - if [ ${tp2#*:} = dbl ]; then - continue - fi - cat <<EOF -command subsum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubsum_${tp2#*:} -comment "Grouped sum aggregate"; - -command subsum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubsumcand_${tp2#*:} -comment "Grouped sum aggregate with candidates list"; - -command prod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1]) - :bat[:${tp2#*:}] -address AGGRprod3_${tp2#*:} -comment "Grouped tail product on ${tp1#*:}"; - -command subprod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubprod_${tp2#*:} -comment "Grouped product aggregate"; - -command subprod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubprodcand_${tp2#*:} -comment "Grouped product aggregate with candidates list"; - -EOF - fi - done -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[:${tp}], g:bat[:oid], e:bat[:any_1]):bat[:dbl] -address AGGRavg13_dbl -comment "Grouped tail average on ${tp}"; - -command avg(b:bat[:${tp}], g:bat[:oid], e:bat[:any_1]) (:bat[:dbl],:bat[:lng]) -address AGGRavg23_dbl -comment "Grouped tail average on ${tp}, also returns count"; - -command subavg(b:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsubavg1_dbl -comment "Grouped average aggregate"; - -command subavg(b:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsubavg1cand_dbl -comment "Grouped average aggregate with candidates list"; - -command subavg(b:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (:bat[:dbl],:bat[:lng]) -address AGGRsubavg2_dbl -comment "Grouped average aggregate, also returns count"; - -command subavg(b:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (:bat[:dbl],:bat[:lng]) -address AGGRsubavg2cand_dbl -comment "Grouped average aggregate with candidates list, also returns count"; - -EOF - for func in stdev:'standard deviation' variance:variance; do - comm=${func#*:} - func=${func%:*} - cat <<EOF -command ${func}(b:bat[:${tp}], g:bat[:oid], e:bat[:any_1]):bat[:dbl] -address AGGR${func}3_dbl -comment "Grouped tail ${comm} (sample/non-biased) on ${tp}"; - -command sub${func}(b:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsub${func}_dbl -comment "Grouped ${comm} (sample/non-biased) aggregate"; - -command sub${func}(b:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsub${func}cand_dbl -comment "Grouped ${comm} (sample/non-biased) aggregate with candidates list"; - -command ${func}p(b:bat[:${tp}], g:bat[:oid], e:bat[:any_1]):bat[:dbl] -address AGGR${func}p3_dbl -comment "Grouped tail ${comm} (population/biased) on ${tp}"; - -command sub${func}p(b:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsub${func}p_dbl -comment "Grouped ${comm} (population/biased) aggregate"; - -command sub${func}p(b:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsub${func}pcand_dbl -comment "Grouped ${comm} (population/biased) aggregate with candidates list"; - -EOF - done - - cat <<EOF -command covariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) :bat[:dbl] -address AGGRcovariance -comment "Covariance sample aggregate"; - -command subcovariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsubcovariance -comment "Grouped covariance sample aggregate"; - -command subcovariance(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsubcovariancecand -comment "Grouped covariance sample aggregate with candidate list"; - -command covariancep(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) :bat[:dbl] -address AGGRcovariancep -comment "Covariance population aggregate"; - -command subcovariancep(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsubcovariancep -comment "Grouped covariance population aggregate"; - -command subcovariancep(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsubcovariancepcand -comment "Grouped covariance population aggregate with candidate list"; - -command corr(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1]) :bat[:dbl] -address AGGRcorr -comment "Correlation aggregate"; - -command subcorr(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsubcorr -comment "Grouped correlation aggregate"; - -command subcorr(b1:bat[:${tp}],b2:bat[:${tp}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:dbl] -address AGGRsubcorrcand -comment "Grouped correlation aggregate with candidate list"; - -EOF -done diff --git a/monetdb5/modules/kernel/aggr.mal.sh b/monetdb5/modules/kernel/aggr.mal.sh deleted file mode 100644 --- a/monetdb5/modules/kernel/aggr.mal.sh +++ /dev/null @@ -1,358 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. - -sed '/^$/q' $0 # copy copyright from this file - -cat <<EOF -# This file was generated by using the script ${0##*/}. - -module aggr; - -EOF - -integer="bte sht int lng" # all integer types -numeric="$integer flt dbl" # all numeric types -fixtypes="bit $numeric oid" -alltypes="$fixtypes str" - -for tp1 in 1:bte 2:sht 4:int 8:lng; do - for tp2 in 8:dbl 1:bte 2:sht 4:int 8:lng; do - if [ ${tp1%:*} -le ${tp2%:*} -o ${tp1#*:} = ${tp2#*:} ]; then - cat <<EOF -command sum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1]) - :bat[:${tp2#*:}] -address AGGRsum3_${tp2#*:} -comment "Grouped tail sum on ${tp1#*:}"; - -EOF - if [ ${tp2#*:} = dbl ]; then - continue - fi - cat <<EOF -command subsum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubsum_${tp2#*:} -comment "Grouped sum aggregate"; - -command subsum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubsumcand_${tp2#*:} -comment "Grouped sum aggregate with candidates list"; - -command prod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1]) - :bat[:${tp2#*:}] -address AGGRprod3_${tp2#*:} -comment "Grouped tail product on ${tp1#*:}"; - -command subprod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubprod_${tp2#*:} -comment "Grouped product aggregate"; - -command subprod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubprodcand_${tp2#*:} -comment "Grouped product aggregate with candidates list"; - -EOF - fi - done -done - -for tp1 in 4:flt 8:dbl; do - for tp2 in 4:flt 8:dbl; do - if [ ${tp1%:*} -le ${tp2%:*} ]; then - cat <<EOF -command sum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1]) - :bat[:${tp2#*:}] -address AGGRsum3_${tp2#*:} -comment "Grouped tail sum on ${tp1#*:}"; - -command subsum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubsum_${tp2#*:} -comment "Grouped sum aggregate"; - -command subsum(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubsumcand_${tp2#*:} -comment "Grouped sum aggregate with candidates list"; - -command prod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1]) - :bat[:${tp2#*:}] -address AGGRprod3_${tp2#*:} -comment "Grouped tail product on ${tp1#*:}"; - -command subprod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubprod_${tp2#*:} -comment "Grouped product aggregate"; - -command subprod(b:bat[:${tp1#*:}],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) :bat[:${tp2#*:}] -address AGGRsubprodcand_${tp2#*:} -comment "Grouped product aggregate with candidates list"; - -EOF - fi _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
