Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16:/tmp/cvs-serv26713/runtime
Modified Files:
pf_support.mx
Log Message:
activated loop-lifted implementation of following step
(instead of non-loop-lifted (i.e., iterative) version)
(implementation of loop-lifted preceding step will follow later)
No extensive performance testing done, yet
(of all standard benchmarks, only one query of XPathMark uses the following
step).
However, the query reported by JanR in bug report #1654317
"XQ: following step kills Mserver (after 2h)"
(http://sourceforge.net/tracker/index.php?func=detail&aid=1654317&group_id=56967&atid=482468)
now runs in ~45 secs instead of ~30 min with the ALG backend
(on a 2 GHz Opteron with 8 GB RAM; Mserver grows to 4/8 GB res/virt);
Unfortunately, the MPS version now grows to 14 GB and does not finish
within 3 h (used to take 2 h requiring "just" 8 GB).
Adding JanR's query as a test is not really an option,
as it produces a 46 MB result (correctness check pending).
Declaration/disclaimer:
-----------------------
On my FC6 desktop (64-bit, 64-bit OIDs, configured with --enable-optimize,
compiled with gcc 4.1.1), this check-in does not make any pathfinder test
fail that did not also fail with the most recent code base in CVS prior to
this check-in.
I did not check in detail, though, whether all previously failing tests
still fail the same way after this check-in as they did before this
check-in.
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- pf_support.mx 14 May 2007 09:55:29 -0000 1.227
+++ pf_support.mx 14 May 2007 09:59:16 -0000 1.228
@@ -253,7 +253,9 @@
@- Path steps (staircase join)
@m
+@(
@:prec_foll(following)@
+@)
@:prec_foll(preceding)@
@= prec_foll
@@ -269,8 +271,8 @@
DESCRIPTION
axis step evaluation on the @1 axis from the given context."
@m
-@(
@:ll_prec_foll_decl(following)@
+@(
@:ll_prec_foll_decl(preceding)@
@)
@@ -1431,11 +1433,14 @@
@:step(following_sibling,following-sibling,lev_fs,@:level_intro@,@:level_code@,,)@
@:step(preceding_sibling,preceding-sibling,lev_ps,@:level_intro@,@:level_code@,,)@
+
+@(
@:step(following,following,following_void,,@:sizes_code@,
@:foll_prec_code@,@:doc_pre@)@
+@)
@:step(preceding,preceding,preceding_void,,@:sizes_code@,
@:foll_prec_code@,@:doc_pre@)@
-@(
@:ll_prec_foll_impl(following)@
+@(
@:ll_prec_foll_impl(preceding)@
@)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
