Peter

are the *.print() below debugging output that should not be in and hence be removed again?

Thanks!

Stefan

On Thu, Nov 09, 2006 at 11:35:05PM +0000, Peter Boncz wrote:

Update of /cvsroot/monetdb/pathfinder/runtime In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29555

Modified Files: Tag: XQuery_0-14 pathfinder.mx Log Message:

• newnids(): prevent error in slice

Index: pathfinder.mx

RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v retrieving revision 1.269.2.7 retrieving revision 1.269.2.8 diff -u -d -r1.269.2.7 -r1.269.2.8 --- pathfinder.mx 9 Nov 2006 18:17:58 -0000 1.269.2.7 +++ pathfinder.mx 9 Nov 2006 23:35:02 -0000 1.269.2.8 @@ -1488,10 +1488,10 @@ { var free_nids := runtime.fetch(RT_NID_FREELIST); var i := count(free_nids);

+free_nids.col_name("free_nids").print(); # re-use a page from the list; or -if empty- append a new page if (i > 0) {

•    var ret := free_nids.slice(i - cnt, i - 1).copy();
  

•    var ret := free_nids.slice(max(0, i - cnt), i - 1).copy();
     free_nids.delete(ret);
     return ret;
  

  }

@@ -1797,6 +1797,7 @@ lock_set(coll_lock); var newnids := empty_bat, err := CATCH(newnids := __runtime_newnids(runtime, cnt)); lock_unset(coll_lock); +newnids.col_name("newnids").print();

 if (isnil(err) and bit(cnt :-= count(newnids))) {
     # not enough free nids page: we must physically extend the nid_rid table 

@@ -1834,6 +1835,7 @@ var delta := reverse(nid_rid.slice(nid_off,nid_cnt - 1)); # put nids in reverse order in the freelist, so they are given out in order delta := delta.copy().access(BAT_WRITE).revert(); +delta.col_name("delta").print();

             # add extra created NIDs to the freelist
             lock_set(coll_lock);

---

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&da... _______________________________________________ Monetdb-pf-checkins mailing list Monetdb-pf-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins