Changeset: c7530c0c8329 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7530c0c8329
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/batxml.mal
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/optimizer/Tests/tst4900.mal
monetdb5/optimizer/Tests/tst4900.stable.out
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_prelude.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.c
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
Branch: Feb2013
Log Message:
Fixed aggregation code.
- prod and subprod are now always called that (and not (sub)product).
- skip_nils and abort_on_error arguments are now of type bit.
- removed a bunch of useless and unused interfaces.
diffs (truncated from 2673 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
@@ -611,7 +611,7 @@ str AGGRcount3nils(bat *retval, bat *bid
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, int *skip_nils);
+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);
@@ -634,58 +634,58 @@ str AGGRstdev2_dbl(bat *retval, bat *bid
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 AGGRsubavg_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubavgcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubcount(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils);
-str AGGRsubcountcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int
*skip_nils);
-str AGGRsubmax(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils);
-str AGGRsubmax_val(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils);
-str AGGRsubmaxcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int
*skip_nils);
-str AGGRsubmaxcand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils);
-str AGGRsubmedian(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils);
-str AGGRsubmediancand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int
*skip_nils);
-str AGGRsubmin(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils);
-str AGGRsubmin_val(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils);
-str AGGRsubmincand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int
*skip_nils);
-str AGGRsubmincand_val(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils);
-str AGGRsubprod_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubprod_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubprod_flt(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubprod_int(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubprod_lng(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubprod_sht(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubprod_wrd(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubprodcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubprodcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubprodcand_flt(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubprodcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubprodcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubprodcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubprodcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubstdev_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
-str AGGRsubstdevcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubstdevp_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
-str AGGRsubstdevpcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubsum_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubsum_flt(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubsum_int(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubsum_lng(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubsum_sht(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubsum_wrd(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils,
int *abort_on_error);
-str AGGRsubsumcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubsumcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubsumcand_flt(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubsumcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubsumcand_lng(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubsumcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubsumcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid,
int *skip_nils, int *abort_on_error);
-str AGGRsubvariance_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
-str AGGRsubvariancecand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat
*sid, int *skip_nils, int *abort_on_error);
-str AGGRsubvariancep_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
-str AGGRsubvariancepcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat
*sid, int *skip_nils, int *abort_on_error);
-str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils);
-str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int
*skip_nils);
+str AGGRsubavg_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils,
bit *abort_on_error);
+str AGGRsubavgcand_dbl(bat *retval, 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 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 AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
+str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, 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);
@@ -704,7 +704,6 @@ str AGGRvariance2_dbl(bat *retval, bat *
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 AGGRxml(bat *retval, bat *bid, int *skip_nils);
str ALARMctime(str *res);
str ALARMepilogue(void);
str ALARMepoch(int *res);
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -78,9 +78,8 @@ batxml_export str BATXMLforest(Client cn
batxml_export str BATXMLagg(int *ret, int *bid, int *grp);
batxml_export str BATXMLagg3(int *ret, int *bid, int *grp, int *e);
batxml_export str BATXMLgroup(xml *ret, int *bid);
-batxml_export str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid,
bat *sid, int *skip_nils);
-batxml_export str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils);
-batxml_export str AGGRxml(bat *retval, bat *bid, int *skip_nils);
+batxml_export str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid,
bat *sid, bit *skip_nils);
+batxml_export str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit
*skip_nils);
#define prepareOperand(X,Y,Z)
\
@@ -1600,7 +1599,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
}
str
-AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int
*skip_nils)
+AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils)
{
BAT *b, *g, *e, *s, *bn = NULL;
const char *err;
@@ -1647,18 +1646,12 @@ AGGRsubxmlcand(bat *retval, bat *bid, ba
}
str
-AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils)
+AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils)
{
return AGGRsubxmlcand(retval, bid, gid, eid, NULL, skip_nils);
}
str
-AGGRxml(bat *retval, bat *bid, int *skip_nils)
-{
- return AGGRsubxmlcand(retval, bid, NULL, NULL, NULL, skip_nils);
-}
-
-str
BATXMLxquery(int *ret, int *bid, str *expr)
{
(void) ret;
diff --git a/monetdb5/modules/atoms/batxml.mal
b/monetdb5/modules/atoms/batxml.mal
--- a/monetdb5/modules/atoms/batxml.mal
+++ b/monetdb5/modules/atoms/batxml.mal
@@ -91,11 +91,11 @@ command xml.aggr(val:bat[:oid,:xml]):xml
address BATXMLgroup
comment "Aggregate the XML values.";
-command xml.subaggr(val:bat[:oid,:xml],g:bat[:oid,:oid],e:bat[:oid,:any_1],
skip_nils:int) :bat[:oid,:xml]
+command xml.subaggr(val:bat[:oid,:xml],g:bat[:oid,:oid],e:bat[:oid,:any_1],
skip_nils:bit) :bat[:oid,:xml]
address AGGRsubxml
comment "Grouped aggregation of XML values.";
-command
xml.subaggr(val:bat[:oid,:xml],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],
skip_nils:int) :bat[:oid,:xml]
+command
xml.subaggr(val:bat[:oid,:xml],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],
skip_nils:bit) :bat[:oid,:xml]
address AGGRsubxmlcand
comment "Grouped aggregation of XML values with candidates list.";
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
@@ -626,361 +626,361 @@ AGGRsubgrouped(bat *retval, bat *bid, ba
return MAL_SUCCEED;
}
-aggr_export str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, bit
*skip_nils, bit *abort_on_error);
str
-AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, int *skip_nils, int
*abort_on_error)
+AGGRsubsum_bte(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit
*abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, NULL, *skip_nils,
*abort_on_error, TYPE_bte,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsum_sht(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsum_sht(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, int *skip_nils, int
*abort_on_error)
+AGGRsubsum_sht(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit
*abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, NULL, *skip_nils,
*abort_on_error, TYPE_sht,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsum_int(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsum_int(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, int *skip_nils, int
*abort_on_error)
+AGGRsubsum_int(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit
*abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, NULL, *skip_nils,
*abort_on_error, TYPE_int,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsum_wrd(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsum_wrd(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, int *skip_nils, int
*abort_on_error)
+AGGRsubsum_wrd(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit
*abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, NULL, *skip_nils,
*abort_on_error, TYPE_wrd,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsum_lng(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsum_lng(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, int *skip_nils, int
*abort_on_error)
+AGGRsubsum_lng(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit
*abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, NULL, *skip_nils,
*abort_on_error, TYPE_lng,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsum_flt(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsum_flt(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, int *skip_nils, int
*abort_on_error)
+AGGRsubsum_flt(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit
*abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, NULL, *skip_nils,
*abort_on_error, TYPE_flt,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsum_dbl(bat *retval, bat *bid, bat *gid, bat *eid, int
*skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsum_dbl(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, int *skip_nils, int
*abort_on_error)
+AGGRsubsum_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, bit
*abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, NULL, *skip_nils,
*abort_on_error, TYPE_dbl,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsumcand_bte(bat *retval, bat *bid, bat *gid, bat *eid,
bat *sid, int *skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsumcand_bte(bat *retval, bat *bid, bat *gid, bat *eid,
bat *sid, bit *skip_nils, bit *abort_on_error);
str
-AGGRsubsumcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, int
*skip_nils, int *abort_on_error)
+AGGRsubsumcand_bte(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils, bit *abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, sid, *skip_nils,
*abort_on_error, TYPE_bte,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsumcand_sht(bat *retval, bat *bid, bat *gid, bat *eid,
bat *sid, int *skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsumcand_sht(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, int
*skip_nils, int *abort_on_error)
+AGGRsubsumcand_sht(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils, bit *abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, sid, *skip_nils,
*abort_on_error, TYPE_sht,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsumcand_int(bat *retval, bat *bid, bat *gid, bat *eid,
bat *sid, int *skip_nils, int *abort_on_error);
+aggr_export str AGGRsubsumcand_int(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, int
*skip_nils, int *abort_on_error)
+AGGRsubsumcand_int(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils, bit *abort_on_error)
{
return AGGRsubgrouped(retval, bid, gid, eid, sid, *skip_nils,
*abort_on_error, TYPE_int,
BATgroupsum, "aggr.subsum");
}
-aggr_export str AGGRsubsumcand_wrd(bat *retval, bat *bid, bat *gid, bat *eid,
bat *sid, int *skip_nils, int *abort_on_error);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
