Changeset: eb27a0d06fa7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb27a0d06fa7
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
Branch: default
Log Message:
Removed ALGavg: superseded by CMDcalcavg.
diffs (55 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
@@ -725,7 +725,6 @@ str ALARMtimers(bat *res);
str ALARMusec(lng *ret);
str ALGantijoin(bat *result, const bat *lid, const bat *rid);
str ALGantijoin2(bat *l, bat *r, const bat *lid, const bat *rid);
-str ALGavg(dbl *res, const bat *bid);
str ALGbandjoin(bat *result, const bat *lid, const bat *rid, const void
*minus, const void *plus, const bit *li, const bit *hi);
str ALGbandjoin2(bat *l, bat *r, const bat *lid, const bat *rid, const void
*minus, const void *plus, const bit *li, const bit *hi);
str ALGbandjoin_default(bat *result, const bat *lid, const bat *rid, const
void *minus, const void *plus);
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -2165,28 +2165,6 @@ str ALGreuse(bat *ret, const bat *bid)
}
/*
- * The avg aggregate only works for int and float fields.
- */
-str
-ALGavg(dbl *res, const bat *bid)
-{
- BAT *b;
- int ret;
- BUN cnt;
-
- if ((b = BATdescriptor(*bid)) == NULL)
- throw(MAL, "aggr.avg", RUNTIME_OBJECT_MISSING);
- ret = BATcalcavg(b, NULL, res, &cnt);
- BBPreleaseref(b->batCacheid);
- if (ret == GDK_FAIL)
- throw(MAL, "aggr.avg", SEMANTIC_TYPE_MISMATCH);
- /* backward compatibility: return nil if there are nils in the input */
- if (cnt < BATcount(b))
- *res = dbl_nil;
- return MAL_SUCCEED;
-}
-
-/*
* BAT standard deviation
*/
str
diff --git a/monetdb5/modules/kernel/algebra.h
b/monetdb5/modules/kernel/algebra.h
--- a/monetdb5/modules/kernel/algebra.h
+++ b/monetdb5/modules/kernel/algebra.h
@@ -34,8 +34,6 @@
#define algebra_export extern
#endif
-algebra_export str ALGavg(dbl *res, const bat *bid);
-
algebra_export str ALGstdev(dbl *res, const bat *bid);
algebra_export str ALGstdevp(dbl *res, const bat *bid);
algebra_export str ALGvariance(dbl *res, const bat *bid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
