Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23694
Modified Files:
batxml.mx
Log Message:
more xml.agg fixing
Index: batxml.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/batxml.mx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- batxml.mx 7 Sep 2007 20:38:34 -0000 1.16
+++ batxml.mx 7 Sep 2007 20:53:40 -0000 1.17
@@ -754,7 +754,7 @@
/* this will not work as it will corrupt the order of the column, ie
the order in which the data will be generated */
- j= BATjoin(VIEWcombine(BATmirror(g)),b,oid_nil);
+ j= BATjoin(BATmirror(g),b,oid_nil);
r= BATsort(j);
/* now we can perform a simple scan and emit the group*/
@@ -790,11 +790,15 @@
BBPunfix(r->batCacheid);
BBPunfix(j->batCacheid);
GDKfree(buf);
+ BBPunfix(e->batCacheid);
+ BBPunfix(g->batCacheid);
+ BBPunfix(b->batCacheid);
BBPkeepref(*ret=bn->batCacheid);
return MAL_SUCCEED;
bunins_failed:
- BBPreleaseref(g->batCacheid);
- BBPreleaseref(b->batCacheid);
+ BBPunfix(e->batCacheid);
+ BBPunfix(g->batCacheid);
+ BBPunfix(b->batCacheid);
BBPunfix(bn->batCacheid);
GDKfree(buf);
throw(MAL, "xml.agg", "bunins failed");
@@ -822,7 +826,7 @@
throw(MAL,"xml.agg","Could not create BAT");
}
- j= BATjoin(g,b,oid_nil);
+ j= BATjoin(BATmirror(g),b,oid_nil);
r= BATsort(j);
/* now we can perform a simple scan and emit the group*/
-------------------------------------------------------------------------
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
