Update of /cvsroot/monetdb/pathfinder/compiler/algebra/map
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7084/compiler/algebra/map
Modified Files:
Tag: xrpcdemo
intro_proxy.c map_ori_names.c
Log Message:
propagated changes of Saturday May 31 2008 - Monday Jun 02 2008
from the XQuery_0-24 branch to the xrpcdemo branch
U intro_proxy.c
Index: intro_proxy.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/intro_proxy.c,v
retrieving revision 1.34
retrieving revision 1.34.4.1
diff -u -d -r1.34 -r1.34.4.1
--- intro_proxy.c 17 Mar 2008 17:41:13 -0000 1.34
+++ intro_proxy.c 2 Jun 2008 20:54:14 -0000 1.34.4.1
@@ -3039,6 +3039,11 @@
by 'out'side operators. */
find_conflicts (root, conflict_list);
+ /* also check for conflicting operators in the children of the exit
+ operator (in case there is no reference from the root node) */
+ if (L(proxy_exit)) find_conflicts (L(proxy_exit), conflict_list);
+ if (R(proxy_exit)) find_conflicts (R(proxy_exit), conflict_list);
+
PFla_in_out_reset (root);
PFla_dag_reset (root);
U map_ori_names.c
Index: map_ori_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/map_ori_names.c,v
retrieving revision 1.33.4.1
retrieving revision 1.33.4.2
diff -u -d -r1.33.4.1 -r1.33.4.2
--- map_ori_names.c 28 May 2008 20:53:43 -0000 1.33.4.1
+++ map_ori_names.c 2 Jun 2008 20:54:14 -0000 1.33.4.2
@@ -1018,10 +1018,15 @@
PFla_op_t *
PFmap_ori_names (PFla_op_t *root)
{
+ bool out_of_names;
+
PFarray_t *map = PFarray (sizeof (ori_unq_map), 300);
/* infer original bit-encoded names */
- PFprop_infer_ori_names (root);
+ out_of_names = PFprop_infer_ori_names (root);
+
+ /* do not return anything if we get into trouble with the column names */
+ if (out_of_names) return NULL;
/* generate equivalent algebra DAG */
map_ori_names (root, map);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
