Changeset: ba44c80e9683 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba44c80e9683
Modified Files:
monetdb5/modules/kernel/aggr.c
Branch: arrays
Log Message:
and some more assertions to ifs
diffs (22 lines):
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
@@ -601,13 +601,13 @@ AGGRsubgroupedExt(bat *retval1, bat *ret
BAT *b, *g, *e, *s, *bn = NULL, *cnts, *q = NULL;
double qvalue;
- /* one of grpfunc1, grpfunc2 and quantilefunc is non-NULL and the others
are */
- assert((grpfunc1 && grpfunc2 == NULL && quantilefunc == NULL) ||
- (grpfunc1 == NULL && grpfunc2 && quantilefunc == NULL)
||
- (grpfunc1 == NULL && grpfunc2 == NULL && quantilefunc)
);
+ /* one of grpfunc1, grpfunc2 and quantilefunc is non-NULL and the
others are */
+ if( (grpfunc1 && (grpfunc2 || quantilefunc)) || (grpfunc2 && (grpfunc1
|| quantilefunc)) || ((grpfunc1 || grpfunc2) && quantilefunc) )
+ throw(MAL, "AGGRsubgroupedExt:", "more than one of grpfunc1,
grpfunc2 and quantilefunc is non-NULL");
/* if retval2 is non-NULL, we must have grpfunc2 */
- assert(retval2 == NULL || grpfunc2 != NULL);
+ if(retval2 != NULL && grpfunc2 == NULL)
+ throw(MAL, "AGGRsubgroupedExt:", "retval is not NULL and
grpfunc2 is");
b = BATdescriptor(*bid);
g = gid ? BATdescriptor(*gid) : NULL;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
