Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9761/runtime
Modified Files:
Tag: M5XQ
pf_support.mx
Log Message:
propagated changes of Tuesday May 19 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/05/19 - sjoerd: runtime/pf_support.mx,1.335
propagated changes of Tuesday May 19 2009
from the May2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/05/19 - tsheyar: runtime/pf_support.mx,1.334.2.1
-- Removed the runtime error for doc_tbl if a non-existing document is loaded.
-- Made the side effect for fn:doc explicit in the algebra. This way we
re-introduce
the runtime error for missing documents at a place where the optimizations
can
cope correctly with it.
-- Added test for bug 2791704: unusuable fn:doc-available.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.333.2.1
retrieving revision 1.333.2.2
diff -u -d -r1.333.2.1 -r1.333.2.2
--- pf_support.mx 16 May 2009 08:24:13 -0000 1.333.2.1
+++ pf_support.mx 19 May 2009 14:35:37 -0000 1.333.2.2
@@ -8884,14 +8884,21 @@
@mil
PROC doc_tbl (BAT[void, BAT] ws, BAT[void, str] item) : BAT[void,BAT]
{
- # load all requested documents into the working set
- var r := ws_opendoc(ws, item);
-
- # pick the according cont value for each document requested
- var ret_cont := r.tmark(0...@0);
+ var ret_item := bat(void,oid).seqbase(0...@0);
+ var ret_cont := bat(void,oid).seqbase(0...@0);
- # pick the according root-pre value for each document requested
- var ret_item := r.hmark(0...@0);
+ i...@batloop() { # try to open the documents now so there are no atomicity
issues
+ var res;
+ CATCH({res := ws_opendoc(ws,bat(void,str).append($t));});
+ if (not(isnil (res))) {
+ ret_item.append(res.reverse().fetch(0));
+ ret_cont.append(res.fetch(0));
+ }
+ # We discard the unavailable document entries.
+ #
+ # Without the compile time handling this properly
+ # the query generation might invalid execution plans.
+ }
# return result as a BAT of BATs
return new (void, BAT).append(ws)
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
