Martin,
maybe the compiler reminded us that you originally intended the following,
i.e., propagation the actual error message of CMDbulk_rotate_xor_hash()
upwards instead of just saying OPERATION_FAILED:
========
$ cvs diff MonetDB5/src/modules/mal/mkey.mx
Index: MonetDB5/src/modules/mal/mkey.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mkey.mx,v
retrieving revision 1.15.2.1
diff -u -r1.15.2.1 mkey.mx
--- MonetDB5/src/modules/mal/mkey.mx 19 May 2009 05:52:49 -0000 1.15.2.1
+++ MonetDB5/src/modules/mal/mkey.mx 19 May 2009 07:39:01 -0000
@@ -584,6 +584,7 @@
str
MKEYbulk_rotate_xor_hash(int *ret, int *hid, int *nbits, int *bid){
BAT *hn, *b, *bn=0;
+ str msg= MAL_SUCCEED;
if ((hn = BATdescriptor(*hid)) == NULL) {
throw(MAL, "mkey.bulk_rotate_xor_hash", RUNTIME_OBJECT_MISSING);
@@ -593,15 +594,15 @@
throw(MAL, "mkey.bulk_rotate_xor_hash", RUNTIME_OBJECT_MISSING);
}
- if( CMDbulk_rotate_xor_hash(&bn,hn,nbits,b) != MAL_SUCCEED){
+ if( (msg= CMDbulk_rotate_xor_hash(&bn,hn,nbits,b)) != MAL_SUCCEED){
BBPreleaseref(hn->batCacheid);
BBPreleaseref(b->batCacheid);
- throw(MAL, "mkey.bulk_rotate_xor_hash", OPERATION_FAILED);
+ throw(MAL, "mkey.bulk_rotate_xor_hash", msg);
}
BBPreleaseref(hn->batCacheid);
BBPreleaseref(b->batCacheid);
*ret= bn->batCacheid;
BBPkeepref(bn->batCacheid);
- return MAL_SUCCEED;
+ return msg;
}
@}
========
?
Stefan
On Tue, May 19, 2009 at 05:52:51AM +0000, Martin Kersten wrote:
> Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
> In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30928
>
> Modified Files:
> Tag: May2009
> mkey.mx
> Log Message:
> Silence compiler
>
>
> U mkey.mx
> Index: mkey.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mkey.mx,v
> retrieving revision 1.15
> retrieving revision 1.15.2.1
> diff -u -d -r1.15 -r1.15.2.1
> --- mkey.mx 17 May 2009 21:14:54 -0000 1.15
> +++ mkey.mx 19 May 2009 05:52:49 -0000 1.15.2.1
> @@ -584,7 +584,6 @@
> str
> MKEYbulk_rotate_xor_hash(int *ret, int *hid, int *nbits, int *bid){
> BAT *hn, *b, *bn=0;
> - str msg= MAL_SUCCEED;
>
> if ((hn = BATdescriptor(*hid)) == NULL) {
> throw(MAL, "mkey.bulk_rotate_xor_hash", RUNTIME_OBJECT_MISSING);
> @@ -594,7 +593,7 @@
> throw(MAL, "mkey.bulk_rotate_xor_hash", RUNTIME_OBJECT_MISSING);
> }
>
> - if( (msg= CMDbulk_rotate_xor_hash(&bn,hn,nbits,b)) != MAL_SUCCEED){
> + if( CMDbulk_rotate_xor_hash(&bn,hn,nbits,b) != MAL_SUCCEED){
> BBPreleaseref(hn->batCacheid);
> BBPreleaseref(b->batCacheid);
> throw(MAL, "mkey.bulk_rotate_xor_hash", OPERATION_FAILED);
>
>
> ------------------------------------------------------------------------------
> Crystal Reports - New Free Runtime and 30 Day Trial
> Check out the new simplified licensing option that enables
> unlimited royalty-free distribution of the report engine
> for externally facing server and web deployment.
> http://p.sf.net/sfu/businessobjects
> _______________________________________________
> Monetdb-checkins mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
>
>
>
--
| Dr. Stefan Manegold | mailto:[email protected] |
| CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ |
| 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 |
| The Netherlands | Fax : +31 (20) 592-4312 |
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Monetdb-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-developers
