Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4680/src/modules/kernel
Modified Files:
batifthen.mx group.mx
Log Message:
fixed bug in mtime (incorrect return type)
fixed bug in ifthenelse on constants (properly dereference external types)
fixed crash in group.mx, if called with wrong arguments we should not crash, ie
protect against NULL result (no BAT)
finished rename of mserver -> mapi/mal_mapi
Index: batifthen.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/batifthen.mx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- batifthen.mx 11 Jan 2008 10:41:35 -0000 1.13
+++ batifthen.mx 27 Jan 2008 09:48:22 -0000 1.14
@@ -29,7 +29,7 @@
address [EMAIL PROTECTED]
comment "Ifthen operation to assemble a conditional result ";
-command batcalc.ifthenelse(b:bat[:oid,:bit], v:@1,w:@1) :bat[:oid,:@1]
+command batcalc.ifthenelse(b:bat[:oid,:bit], v:@1, w:@1) :bat[:oid,:@1]
address [EMAIL PROTECTED]
comment "Ifthen operation to assemble a conditional result ";
@@ -335,6 +335,10 @@
bi = bat_iterator(b);
t = (bit*)Tloc(b,BUNfirst(b));
+ if (ATOMvarsized([EMAIL PROTECTED])) {
+ tid = *(@1**)tid;
+ eid = *(@1**)eid;
+ }
BATloop(b, p, q) {
if (*t == bit_nil)
BUNfastins(bn, BUNhead(bi,p), (ptr) & nilval);
Index: group.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/group.mx,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- group.mx 15 Jan 2008 08:25:15 -0000 1.104
+++ group.mx 27 Jan 2008 09:48:22 -0000 1.105
@@ -1376,7 +1376,7 @@
GRPrefine(int *retid, int *bid, int *aid)
{
BAT *b, *a;
- BAT *bn;
+ BAT *bn = NULL;
if ((b = BATdescriptor(*bid)) == NULL) {
throw(MAL, "group.refine", "Cannot access descriptor");
@@ -1389,10 +1389,11 @@
@:chkHeader(a,GRPrefine)@
CTrefine(&bn, b, a);
- *retid = bn->batCacheid;
- BBPkeepref(*retid);
BBPreleaseref(b->batCacheid);
BBPreleaseref(a->batCacheid);
+ if (!bn)
+ throw(MAL, "group.refine", "Failed");
+ BBPkeepref(*retid = bn->batCacheid);
return MAL_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
