Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12767
Modified Files:
Tag: XQuery_0-24
opt_algebra_cse.c
Log Message:
Bugfix:
The iter field in the step_join semantics is never used, so we
don't need to check it's value in the cse phase.
U opt_algebra_cse.c
Index: opt_algebra_cse.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_algebra_cse.c,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -d -r1.30.2.1 -r1.30.2.2
--- opt_algebra_cse.c 28 May 2008 12:48:32 -0000 1.30.2.1
+++ opt_algebra_cse.c 28 May 2008 15:13:38 -0000 1.30.2.2
@@ -1056,10 +1056,13 @@
return true;
case la_step:
+ if (!((ACTATT (R(a), a->sem.step.iter) ==
+ ACTATT (R(b), b->sem.step.iter))))
+ return false;
+ /* falling through */
+
case la_step_join:
- if ((ACTATT (R(a), a->sem.step.iter) ==
- ACTATT (R(b), b->sem.step.iter)) &&
- (ACTATT (R(a), a->sem.step.item) ==
+ if ((ACTATT (R(a), a->sem.step.item) ==
ACTATT (R(b), b->sem.step.item)) &&
(a->sem.step.spec.axis == b->sem.step.spec.axis) &&
(a->sem.step.spec.kind == b->sem.step.spec.kind) &&
@@ -1071,10 +1074,13 @@
return false;
case la_guide_step:
+ if (!((ACTATT (R(a), a->sem.step.iter) ==
+ ACTATT (R(b), b->sem.step.iter))))
+ return false;
+ /* falling through */
+
case la_guide_step_join:
- if (!((ACTATT (R(a), a->sem.step.iter) ==
- ACTATT (R(b), b->sem.step.iter)) &&
- (ACTATT (R(a), a->sem.step.item) ==
+ if (!((ACTATT (R(a), a->sem.step.item) ==
ACTATT (R(b), b->sem.step.item)) &&
(a->sem.step.spec.axis == b->sem.step.spec.axis) &&
(a->sem.step.spec.kind == b->sem.step.spec.kind) &&
-------------------------------------------------------------------------
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
