Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9743/compiler/algebra

Modified Files:
      Tag: M5XQ
        builtins.c 
Log Message:
propagated changes of Tuesday May 19 2009
from the development trunk to the M5XQ branch

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/05/19 - sjoerd: compiler/algebra/builtins.c,1.123
propagated changes of Tuesday May 19 2009
from the May2009 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/05/19 - tsheyar: compiler/algebra/builtins.c,1.122.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.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


U builtins.c
Index: builtins.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/builtins.c,v
retrieving revision 1.121.2.1
retrieving revision 1.121.2.2
diff -u -d -r1.121.2.1 -r1.121.2.2
--- builtins.c  7 May 2009 14:41:43 -0000       1.121.2.1
+++ builtins.c  19 May 2009 14:35:32 -0000      1.121.2.2
@@ -5540,6 +5540,23 @@
 
     PFla_op_t *doc = doc_tbl (args[0].rel, col_res, col_item, alg_dt_doc);
 
+    *side_effects = error (
+                        *side_effects,
+                        attach (
+                            select_ (
+                                not (
+                                    fun_1to1 (
+                                        args[0].rel,
+                                        alg_fun_fn_doc_available,
+                                        col_res,
+                                        collist (col_item)),
+                                    col_item2,
+                                    col_res),
+                                col_item2),
+                            col_item3,
+                            lit_str ("err:FODC0005: Invalid argument to 
fn:doc")),
+                        col_item3);
+
     return (struct PFla_pair_t) {
         .rel  = project (roots (doc),
                          proj (col_iter, col_iter),


------------------------------------------------------------------------------
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

Reply via email to