Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6885/compiler/algebra/prop
Modified Files:
prop_icol.c prop_ori_names.c
Log Message:
* Added the correct mil implementation for the error operator.
Basically it checks at runtime if the BAT with the error message strings is
empty or not. If it is not empty, only one error is produced by fetching
the first row of the BAT.
* Added semantics for the error operator. That actually changed the signature
of the PFla_error and PFpa_error functions so alot of files had to adjust
to these changes. We use the same semantics structure as the cond_err
operator but disregard the sem.err.str part.
Index: prop_icol.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_icol.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- prop_icol.c 13 Dec 2007 13:08:17 -0000 1.28
+++ prop_icol.c 19 Dec 2007 22:39:09 -0000 1.29
@@ -247,7 +247,6 @@
case la_lit_tbl:
case la_empty_tbl:
case la_ref_tbl:
- case la_error:
break;
case la_attach:
@@ -685,6 +684,7 @@
n->prop->l_icols = 0;
break;
+ case la_error:
case la_cond_err:
/* infer incoming icols for input relation */
n->prop->l_icols = n->prop->icols;
Index: prop_ori_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_ori_names.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- prop_ori_names.c 13 Dec 2007 13:08:17 -0000 1.25
+++ prop_ori_names.c 19 Dec 2007 22:39:09 -0000 1.26
@@ -358,7 +358,6 @@
}
break;
- case la_error:
case la_select:
case la_pos_select:
case la_distinct:
@@ -630,6 +629,10 @@
/* do not infer name pairs to the children */
break;
+ case la_error:
+ n->prop->l_name_pairs = PFarray_copy (np_list);
+ break;
+
case la_cond_err:
n->prop->l_name_pairs = PFarray_copy (np_list);
/* introduce new column for error branch */
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
