Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22345/src/modules/kernel
Modified Files:
algebra.mx
Log Message:
propagated changes of Friday Mar 07 2008 - Monday Mar 17 2008
from the MonetDB_5-4 branch to the development trunk
===================================================================
2008/03/14 - nielsnes: src/modules/kernel/algebra.mx,1.192.2.2
sum now returns NULL for empty bats
===================================================================
Index: algebra.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/algebra.mx,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- algebra.mx 6 Mar 2008 08:30:40 -0000 1.194
+++ algebra.mx 17 Mar 2008 09:35:13 -0000 1.195
@@ -1083,13 +1083,15 @@
@2 [EMAIL PROTECTED];
BATcheck(b,"[EMAIL PROTECTED]@2");
+ if (!BATcount(b))
+ result = @2_nil;
BATloop(b, p, q) {
@1 *value = (@1*) BUNtloc(bi, p);
if (*value == @1_nil) {
result = @2_nil;
break;
} else {
- result += (@2) *value;
+ result += *value;
}
}
*res = result;
@@ -1110,6 +1112,8 @@
@2 [EMAIL PROTECTED];
BATcheck(b,"BATprodInt");
+ if (!BATcount(b))
+ result = @2_nil;
BATloop(b, p, q) {
@1 *value = (@1*) BUNtloc(bi, p);
if (*value == @1_nil) {
@@ -3793,10 +3797,15 @@
[EMAIL PROTECTED](dbl* res, BAT *b)
{
int cnt = BATcount(b);
- dbl result=0.0;
- [EMAIL PROTECTED](&result, b);
- *res = result/cnt;
+ if (cnt) {
+ dbl result=0;
+
+ [EMAIL PROTECTED](&result, b);
+ *res = result/cnt;
+ } else {
+ *res = dbl_nil;
+ }
return GDK_SUCCEED;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
