Changeset: c46e5810d466 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c46e5810d466
Modified Files:
gdk/gdk_aggr.c
sql/test/scripts/Tests/fsum.stable.err
sql/test/scripts/Tests/fsum.stable.out
Branch: default
Log Message:
Clarified error message.
diffs (139 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -432,7 +432,7 @@ dofsum(const void *restrict values, oid
return nils;
overflow:
- GDKerror("22003!overflow in calculation.\n");
+ GDKerror("22003!overflow in sum aggregate.\n");
bailout:
for (grp = 0; grp < ngrp; grp++)
GDKfree(pergroup[grp].partials);
@@ -875,7 +875,7 @@ dosum(const void *restrict values, bool
overflow:
GDKfree(seen);
- GDKerror("22003!overflow in calculation.\n");
+ GDKerror("22003!overflow in sum aggregate.\n");
return BUN_NONE;
}
@@ -1027,7 +1027,7 @@ BATsum(void *res, int tp, BAT *b, BAT *s
else if (cnt > 0 &&
GDK_flt_max / cnt < fabs(avg)) {
if (abort_on_error) {
- GDKerror("22003!overflow in
calculation.\n");
+ GDKerror("22003!overflow in sum
aggregate.\n");
return GDK_FAIL;
}
*(flt *) res = flt_nil;
@@ -1040,7 +1040,7 @@ BATsum(void *res, int tp, BAT *b, BAT *s
} else if (cnt > 0 &&
GDK_dbl_max / cnt < fabs(avg)) {
if (abort_on_error) {
- GDKerror("22003!overflow in
calculation.\n");
+ GDKerror("22003!overflow in sum
aggregate.\n");
return GDK_FAIL;
}
*(dbl *) res = dbl_nil;
@@ -1452,7 +1452,7 @@ doprod(const void *restrict values, oid
overflow:
GDKfree(seen);
- GDKerror("22003!overflow in calculation.\n");
+ GDKerror("22003!overflow in product aggregate.\n");
return BUN_NONE;
}
diff --git a/sql/test/scripts/Tests/fsum.stable.err
b/sql/test/scripts/Tests/fsum.stable.err
--- a/sql/test/scripts/Tests/fsum.stable.err
+++ b/sql/test/scripts/Tests/fsum.stable.err
@@ -29,59 +29,59 @@ stderr of test 'fsum` in directory 'sql/
MAPI = (monetdb) /var/tmp/mtest-23556/.s.monetdb.36044
QUERY = select sum(val) from t where gid = 14;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 20;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 21;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-24476/.s.monetdb.36041
QUERY = select sum(val) from t where gid = 24;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 25;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 26;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 27;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 28;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 29;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 30;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 32;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-21571/.s.monetdb.31912
QUERY = select sum(val) from t where gid = 34;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-24476/.s.monetdb.36041
QUERY = select sum(val) from t where gid = 36;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-24476/.s.monetdb.36041
QUERY = select sum(val) from t where gid = 38;
-ERROR = !overflow in calculation.
+ERROR = !overflow in sum aggregate.
CODE = 22003
# 10:54:43 >
diff --git a/sql/test/scripts/Tests/fsum.stable.out
b/sql/test/scripts/Tests/fsum.stable.out
--- a/sql/test/scripts/Tests/fsum.stable.out
+++ b/sql/test/scripts/Tests/fsum.stable.out
@@ -49,8 +49,8 @@ stdout of test 'fsum` in directory 'sql/
#8.988465674311579e+307 25
[ 3131 ]
#select gid, sum(val) from t where gid in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 15, 16, 17, 18, 19, 22, 23, 31, 33, 35, 37, 39, 40, 41) group by
gid order by gid;
-% sys.t, sys.%2 # table_name
-% gid, %2 # name
+% sys.t, sys.%36 # table_name
+% gid, %36 # name
% int, double # type
% 2, 24 # length
[ 1, 0 ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
