Changeset: 988bafa82362 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=988bafa82362
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/group.c
monetdb5/modules/kernel/group.h
Branch: Oct2014
Log Message:
Added some const qualifiers.
diffs (truncated from 1555 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -595,118 +595,118 @@ char *mapi_unquote(char *msg);
MapiMsg mapi_virtual_result(MapiHdl hdl, int columns, const char
**columnnames, const char **columntypes, const int *columnlengths, int
tuplecount, const char ***tuples);
# monetdb5
-str AGGRavg12_dbl(bat *retval, bat *bid, bat *eid);
-str AGGRavg13_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRavg22_dbl(bat *retval1, bat *retval2, bat *bid, bat *eid);
-str AGGRavg23_dbl(bat *retval1, bat *retval2, bat *bid, bat *gid, bat *eid);
-str AGGRcount2(bat *retval, bat *bid, bat *eid, bit *ignorenils);
-str AGGRcount2nils(bat *retval, bat *bid, bat *eid);
-str AGGRcount2nonils(bat *retval, bat *bid, bat *eid);
-str AGGRcount3(bat *retval, bat *bid, bat *gid, bat *eid, bit *ignorenils);
-str AGGRcount3nils(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRcount3nonils(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRmax2(bat *retval, bat *bid, bat *eid);
-str AGGRmax3(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRmedian(bat *retval, bat *bid, bit *skip_nils);
-str AGGRmedian3(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRmin2(bat *retval, bat *bid, bat *eid);
-str AGGRmin3(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRprod2_bte(bat *retval, bat *bid, bat *eid);
-str AGGRprod2_dbl(bat *retval, bat *bid, bat *eid);
-str AGGRprod2_flt(bat *retval, bat *bid, bat *eid);
-str AGGRprod2_int(bat *retval, bat *bid, bat *eid);
-str AGGRprod2_lng(bat *retval, bat *bid, bat *eid);
-str AGGRprod2_sht(bat *retval, bat *bid, bat *eid);
-str AGGRprod2_wrd(bat *retval, bat *bid, bat *eid);
-str AGGRprod3_bte(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRprod3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRprod3_flt(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRprod3_int(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRprod3_lng(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRprod3_sht(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRprod3_wrd(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRquantile(bat *retval, bat *bid, bat *quantile, bit *skip_nils);
-str AGGRquantile3(bat *retval, bat *bid, bat *gid, bat *eid, bat *quantile);
-str AGGRsize2(bat *retval, bat *bid, bat *eid);
-str AGGRsize2nils(bat *retval, bat *bid, bat *eid);
-str AGGRstdev2_dbl(bat *retval, bat *bid, bat *eid);
-str AGGRstdev3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRstdevp2_dbl(bat *retval, bat *bid, bat *eid);
-str AGGRstdevp3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRsubavg1_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubavg1cand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubavg2_dbl(bat *retval1, bat *retval2, bat *bid, bat *gid, bat *eid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubavg2cand_dbl(bat *retval1, bat *retval2, bat *bid, bat *gid, bat
*eid, bat *sid, bit *skip_nils, bit *abort_on_error);
-str AGGRsubcount(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
-str AGGRsubcountcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils);
-str AGGRsubmax(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
-str AGGRsubmax_val(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
-str AGGRsubmaxcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils);
-str AGGRsubmaxcand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils);
-str AGGRsubmedian(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
-str AGGRsubmediancand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils);
-str AGGRsubmin(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
-str AGGRsubmin_val(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
-str AGGRsubmincand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils);
-str AGGRsubmincand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils);
-str AGGRsubprod_bte(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubprod_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubprod_flt(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubprod_int(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubprod_lng(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubprod_sht(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubprod_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubprodcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubprodcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubprodcand_flt(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubprodcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubprodcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubprodcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubprodcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubquantile(bat *retval, bat *bid, bat *quantile, bat *gid, bat *eid,
bit *skip_nils);
-str AGGRsubquantilecand(bat *retval, bat *bid, bat *quantile, bat *gid, bat
*eid, bat *sid, bit *skip_nils);
-str AGGRsubstdev_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit
*skip_nils, bit *abort_on_error);
-str AGGRsubstdevcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubstdevp_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit
*skip_nils, bit *abort_on_error);
-str AGGRsubstdevpcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubsum_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubsum_flt(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubsum_int(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubsum_lng(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubsum_sht(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubsum_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
-str AGGRsubsumcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubsumcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubsumcand_flt(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubsumcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubsumcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubsumcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubsumcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
bit *skip_nils, bit *abort_on_error);
-str AGGRsubvariance_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit
*skip_nils, bit *abort_on_error);
-str AGGRsubvariancecand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat
*sid, bit *skip_nils, bit *abort_on_error);
-str AGGRsubvariancep_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit
*skip_nils, bit *abort_on_error);
-str AGGRsubvariancepcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat
*sid, bit *skip_nils, bit *abort_on_error);
+str AGGRavg12_dbl(bat *retval, const bat *bid, const bat *eid);
+str AGGRavg13_dbl(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRavg22_dbl(bat *retval1, bat *retval2, const bat *bid, const bat *eid);
+str AGGRavg23_dbl(bat *retval1, bat *retval2, const bat *bid, const bat *gid,
const bat *eid);
+str AGGRcount2(bat *retval, const bat *bid, const bat *eid, const bit
*ignorenils);
+str AGGRcount2nils(bat *retval, const bat *bid, const bat *eid);
+str AGGRcount2nonils(bat *retval, const bat *bid, const bat *eid);
+str AGGRcount3(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *ignorenils);
+str AGGRcount3nils(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+str AGGRcount3nonils(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+str AGGRmax2(bat *retval, const bat *bid, const bat *eid);
+str AGGRmax3(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRmedian(bat *retval, const bat *bid, const bit *skip_nils);
+str AGGRmedian3(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRmin2(bat *retval, const bat *bid, const bat *eid);
+str AGGRmin3(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRprod2_bte(bat *retval, const bat *bid, const bat *eid);
+str AGGRprod2_dbl(bat *retval, const bat *bid, const bat *eid);
+str AGGRprod2_flt(bat *retval, const bat *bid, const bat *eid);
+str AGGRprod2_int(bat *retval, const bat *bid, const bat *eid);
+str AGGRprod2_lng(bat *retval, const bat *bid, const bat *eid);
+str AGGRprod2_sht(bat *retval, const bat *bid, const bat *eid);
+str AGGRprod2_wrd(bat *retval, const bat *bid, const bat *eid);
+str AGGRprod3_bte(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRprod3_dbl(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRprod3_flt(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRprod3_int(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRprod3_lng(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRprod3_sht(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRprod3_wrd(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRquantile(bat *retval, const bat *bid, const bat *quantile, const bit
*skip_nils);
+str AGGRquantile3(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bat *quantile);
+str AGGRsize2(bat *retval, const bat *bid, const bat *eid);
+str AGGRsize2nils(bat *retval, const bat *bid, const bat *eid);
+str AGGRstdev2_dbl(bat *retval, const bat *bid, const bat *eid);
+str AGGRstdev3_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+str AGGRstdevp2_dbl(bat *retval, const bat *bid, const bat *eid);
+str AGGRstdevp3_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+str AGGRsubavg1_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubavg1cand_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubavg2_dbl(bat *retval1, bat *retval2, const bat *bid, const bat
*gid, const bat *eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubavg2cand_dbl(bat *retval1, bat *retval2, const bat *bid, const bat
*gid, const bat *eid, const bat *sid, const bit *skip_nils, const bit
*abort_on_error);
+str AGGRsubcount(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *skip_nils);
+str AGGRsubcountcand(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils);
+str AGGRsubmax(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *skip_nils);
+str AGGRsubmax_val(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils);
+str AGGRsubmaxcand(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils);
+str AGGRsubmaxcand_val(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils);
+str AGGRsubmedian(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *skip_nils);
+str AGGRsubmediancand(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils);
+str AGGRsubmin(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *skip_nils);
+str AGGRsubmin_val(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils);
+str AGGRsubmincand(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils);
+str AGGRsubmincand_val(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils);
+str AGGRsubprod_bte(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprod_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprod_flt(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprod_int(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprod_lng(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprod_sht(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprod_wrd(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprodcand_bte(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprodcand_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprodcand_flt(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprodcand_int(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprodcand_lng(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprodcand_sht(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubprodcand_wrd(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubquantile(bat *retval, const bat *bid, const bat *quantile, const
bat *gid, const bat *eid, const bit *skip_nils);
+str AGGRsubquantilecand(bat *retval, const bat *bid, const bat *quantile,
const bat *gid, const bat *eid, const bat *sid, const bit *skip_nils);
+str AGGRsubstdev_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubstdevcand_dbl(bat *retval, const bat *bid, const bat *gid, const
bat *eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubstdevp_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubstdevpcand_dbl(bat *retval, const bat *bid, const bat *gid, const
bat *eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsum_bte(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsum_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsum_flt(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsum_int(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsum_lng(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsum_sht(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsum_wrd(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsumcand_bte(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsumcand_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsumcand_flt(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsumcand_int(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsumcand_lng(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsumcand_sht(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubsumcand_wrd(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubvariance_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubvariancecand_dbl(bat *retval, const bat *bid, const bat *gid, const
bat *eid, const bat *sid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubvariancep_dbl(bat *retval, const bat *bid, const bat *gid, const
bat *eid, const bit *skip_nils, const bit *abort_on_error);
+str AGGRsubvariancepcand_dbl(bat *retval, const bat *bid, const bat *gid,
const bat *eid, const bat *sid, const bit *skip_nils, const bit
*abort_on_error);
str AGGRsubxml(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *skip_nils);
str AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils);
-str AGGRsum2_bte(bat *retval, bat *bid, bat *eid);
-str AGGRsum2_dbl(bat *retval, bat *bid, bat *eid);
-str AGGRsum2_flt(bat *retval, bat *bid, bat *eid);
-str AGGRsum2_int(bat *retval, bat *bid, bat *eid);
-str AGGRsum2_lng(bat *retval, bat *bid, bat *eid);
-str AGGRsum2_sht(bat *retval, bat *bid, bat *eid);
-str AGGRsum2_wrd(bat *retval, bat *bid, bat *eid);
-str AGGRsum3_bte(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRsum3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRsum3_flt(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRsum3_int(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRsum3_lng(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRsum3_sht(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRsum3_wrd(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRvariance2_dbl(bat *retval, bat *bid, bat *eid);
-str AGGRvariance3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRvariancep2_dbl(bat *retval, bat *bid, bat *eid);
-str AGGRvariancep3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
+str AGGRsum2_bte(bat *retval, const bat *bid, const bat *eid);
+str AGGRsum2_dbl(bat *retval, const bat *bid, const bat *eid);
+str AGGRsum2_flt(bat *retval, const bat *bid, const bat *eid);
+str AGGRsum2_int(bat *retval, const bat *bid, const bat *eid);
+str AGGRsum2_lng(bat *retval, const bat *bid, const bat *eid);
+str AGGRsum2_sht(bat *retval, const bat *bid, const bat *eid);
+str AGGRsum2_wrd(bat *retval, const bat *bid, const bat *eid);
+str AGGRsum3_bte(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRsum3_dbl(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRsum3_flt(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRsum3_int(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRsum3_lng(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRsum3_sht(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRsum3_wrd(bat *retval, const bat *bid, const bat *gid, const bat *eid);
+str AGGRvariance2_dbl(bat *retval, const bat *bid, const bat *eid);
+str AGGRvariance3_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+str AGGRvariancep2_dbl(bat *retval, const bat *bid, const bat *eid);
+str AGGRvariancep3_dbl(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
str ALARMctime(str *res);
str ALARMepilogue(void *ret);
str ALARMepoch(int *res);
@@ -1320,9 +1320,9 @@ str FCTgetPlants(bat *ret, bat *ret2);
str FCTsetLocation(int *ret, str *loc);
str FCTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str GROUPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str GRPsubgroup1(bat *ngid, bat *next, bat *nhis, bat *bid);
-str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid);
-str GRPsubgroup4(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid, bat
*eid, bat *hid);
+str GRPsubgroup1(bat *ngid, bat *next, bat *nhis, const bat *bid);
+str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat
*gid);
+str GRPsubgroup4(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat
*gid, const bat *eid, const bat *hid);
double HeartbeatCPUload(void);
str IDentifier(identifier *retval, str *in);
int IDfromString(str src, int *len, identifier *retval);
diff --git a/monetdb5/modules/kernel/aggr.c b/monetdb5/modules/kernel/aggr.c
--- a/monetdb5/modules/kernel/aggr.c
+++ b/monetdb5/modules/kernel/aggr.c
@@ -182,7 +182,7 @@ AGGRgrouped(bat *retval1, bat *retval2,
}
static str
-AGGRgrouped3(bat *retval1, bat *retval2, bat *bid, bat *gid, bat *eid, int tp,
+AGGRgrouped3(bat *retval1, bat *retval2, const bat *bid, const bat *gid, const
bat *eid, int tp,
BAT *(*grpfunc1)(BAT *, BAT *, BAT *, BAT *, int, int,
int),
gdk_return (*grpfunc2)(BAT **, BAT **, BAT *, BAT *,
BAT *, BAT *, int, int, int),
int skip_nils,
@@ -193,11 +193,11 @@ AGGRgrouped3(bat *retval1, bat *retval2,
b = BATdescriptor(*bid); /* [head,value] */
g = BATdescriptor(*gid); /* [head,gid] */
e = BATdescriptor(*eid); /* [gid,any] */
- return AGGRgrouped(retval1, retval2, b, g, e, tp, grpfunc1, grpfunc2,
NULL, 0 , skip_nils, malfunc);
+ return AGGRgrouped(retval1, retval2, b, g, e, tp, grpfunc1, grpfunc2,
NULL, 0, skip_nils, malfunc);
}
static str
-AGGRgrouped2(bat *retval1, bat *retval2, bat *bid, bat *eid, int tp,
+AGGRgrouped2(bat *retval1, bat *retval2, const bat *bid, const bat *eid, int
tp,
BAT *(*grpfunc1)(BAT *, BAT *, BAT *, BAT *, int, int,
int),
gdk_return (*grpfunc2)(BAT **, BAT **, BAT *, BAT *,
BAT *, BAT *, int, int, int),
int skip_nils,
@@ -213,406 +213,406 @@ AGGRgrouped2(bat *retval1, bat *retval2,
BBPreleaseref(b->batCacheid);
b = e;
e = BATdescriptor(*eid); /* [gid,any] */
- return AGGRgrouped(retval1, retval2, b, g, e, tp, grpfunc1,
grpfunc2,NULL, 0, skip_nils, malfunc);
+ return AGGRgrouped(retval1, retval2, b, g, e, tp, grpfunc1, grpfunc2,
NULL, 0, skip_nils, malfunc);
}
-aggr_export str AGGRsum3_bte(bat *retval, bat *bid, bat *gid, bat *eid);
+aggr_export str AGGRsum3_bte(bat *retval, const bat *bid, const bat *gid,
const bat *eid);
str
-AGGRsum3_bte(bat *retval, bat *bid, bat *gid, bat *eid)
+AGGRsum3_bte(bat *retval, const bat *bid, const bat *gid, const bat *eid)
{
return AGGRgrouped3(retval, NULL, bid, gid, eid, TYPE_bte,
BATgroupsum, NULL, 1,
"aggr.sum");
}
-aggr_export str AGGRsum3_sht(bat *retval, bat *bid, bat *gid, bat *eid);
+aggr_export str AGGRsum3_sht(bat *retval, const bat *bid, const bat *gid,
const bat *eid);
str
-AGGRsum3_sht(bat *retval, bat *bid, bat *gid, bat *eid)
+AGGRsum3_sht(bat *retval, const bat *bid, const bat *gid, const bat *eid)
{
return AGGRgrouped3(retval, NULL, bid, gid, eid, TYPE_sht,
BATgroupsum, NULL, 1,
"aggr.sum");
}
-aggr_export str AGGRsum3_int(bat *retval, bat *bid, bat *gid, bat *eid);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
