Stefan Manegold wrote:
On Thu, Sep 06, 2007 at 11:49:57AM +0200, Romulo Goncalves wrote:
Sjoerd Mullender wrote:
Update of /cvsroot/monetdb/MonetDB5/src/modules/mal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15018/src/modules/mal
Modified Files: Tag: GDK-2 batxml.mx Log Message: propagated changes of Friday Aug 24 2007 - Tuesday Aug 28 2007 from the development trunk to the GDK-2 branch
There were inexplicable conflicts in src/modules/mal/batxml.mx and src/modules/mal/Tests/inspect05.stable.out, neither of which had been changed on the branch. I just copied the HEAD version to the branch to resolve the conflicts.
......
str -BATXMLagg(MalBlkPtr mb, MalStkPtr stk, InstrPtr p) +BATXMLagg(int *ret, int *grp,int *bid) { - (void) mb; - (void) stk; - (void) p; - throw(MAL,"xml.agg","Not yet implemented"); + BAT *j, *r, *g, *b, *bn; + BUN p,q; + int xx; + oid gid,o=0; The variable is not initialized. I will take the freedom to initialize it with value 0;
Do I have green light or the values should be another one?
Note: this is a propagation and the this code comes from the Martin checking on 08/25/2007 9:48 am
do NOT fix any bugs on the GDK-2 branch that also exist in the development trunk (HEAD). if at all, fix them in the development trunk (HEAD); usual propagation wiil get them into the GDK-2 branch. Yes I know that. If not I will create conflicts ;)
Regards, Romulo
Stefan
+ int first= 1; + str t; + str buf= GDKmalloc(BUFSIZ); + int len, size=BUFSIZ,offset; + + @:getBATdescriptor(grp,g,"xml.agg")@ + @:getBATdescriptor(bid,b,"xml.agg",BBPunfix(g->batCacheid))@ + + bn= BATnew(g->htype, b->ttype,BATcount(g)); + if( bn== NULL){ + BBPunfix(b->batCacheid); + BBPunfix(g->batCacheid); + throw(MAL,"xml.agg","Could not create BAT"); + } + + j= BATjoin(g,b,oid_nil); + r= BATsort(j); + /* now we can perform a simple scan and emit the group*/ + + buf[0]=0; + offset=0; + first=1; + BATloopFast(r,p,q,xx){ + o= *(oid*) BUNhead(r,p); + t= (str) BUNtail(r,p); + if( gid != o && first==0){ It is used here for the first time without being initialized.
Regards, Romulo
+ /* flush */ + bunfastins(bn,&gid,buf); + buf[0]=0; + offset =0; + } + gid=o; + first=0; .......
------------------------------------------------------------------------- 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-developers mailing list Monetdb-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-developers