Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7760
Modified Files:
Tag: GDK-2
aggr.mx
Log Message:
Fix from MonetDB4.
Index: aggr.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/aggr.mx,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -d -r1.18.2.2 -r1.18.2.3
--- aggr.mx 11 Aug 2007 22:31:59 -0000 1.18.2.2
+++ aggr.mx 15 Aug 2007 09:44:43 -0000 1.18.2.3
@@ -19,8 +19,8 @@
@v 1.0
@+ Aggregates Module
-This module contains some efficient aggregate functions that compute their
-result in one scan, rather than in the iterative manner of the generic
+This module contains some efficient aggregate functions that compute their
+result in one scan, rather than in the iterative manner of the generic
MIL aggregrate implementations.
The implementation code is derived from the original 'aggr' module.
@@ -159,7 +159,10 @@
The macro CHKrange is just for array-lookups, analogously to BUNfntVOID &
HASHfnd_oid for void- and hash-lookups, respectively
@c
-#define CHKrange(r, bn, h) r = (BUN)(((*(oid*)h >= min) && (*(oid*)h <=
max))?h:NULL)
+/* if the test succeeds, we must return something not equal to
+ BUN_NONE, but the actual value doesn't matter since it is not
+ otherwise used */
+#define CHKrange(r, bn, h) r = (BUN)(*(oid*)(h) >= min && *(oid*)(h) <=
max ? 0 : BUN_NONE)
@- Result initialization
@c
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
