Update of /cvsroot/monetdb/pathfinder/compiler/algebra/map
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21670/algebra/map
Modified Files:
Tag: XQuery_0-24
intro_proxy.c
Log Message:
-- fixing bug #1981403:
The proxy recognition did not look in the complete plan for conflicts.
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.2.1
diff -u -d -r1.34 -r1.34.2.1
--- intro_proxy.c 17 Mar 2008 17:41:13 -0000 1.34
+++ intro_proxy.c 2 Jun 2008 08:15:06 -0000 1.34.2.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);
-------------------------------------------------------------------------
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
