Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25356/algebra/prop

Modified Files:
        prop_rec_delta.c 
Log Message:
-- Fixed bugs in recursion strategy detection


Index: prop_rec_delta.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_rec_delta.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prop_rec_delta.c    14 Feb 2007 11:11:25 -0000      1.4
+++ prop_rec_delta.c    26 Feb 2007 16:40:06 -0000      1.5
@@ -118,11 +118,6 @@
             break;
 
         case la_difference:
-            /* check for a reference to iter */
-            if (n->schema.count == 1 &&
-                n->schema.items[0].name & ITER(L(n)))
-                return true;
-
             
/******************************************************************/
             /*                                                                
*/
             /* We can also allow difference operators if R(n) contains        
*/
@@ -151,12 +146,11 @@
             /* the difference operator produces the same result.)             
*/
             /*                                                                
*/
             
/******************************************************************/
-
-            /* check for a reference to iter */
+            /*
             if (n->schema.count == 1 &&
-                n->schema.items[0].name & ITER(L(n)) &&
                 n->schema.items[0].name & ITER(R(n)))
                 return true;
+            */
             
             ITER (n) = ITER (L(n));
             POS  (n) = POS  (L(n));
@@ -302,7 +296,7 @@
             
         case la_element_tag:
             /* we may not allow a reference to the input sequence */
-            if (ITER(R(n)) & n->sem.elem.iter_val)
+            if (ITER(R(n)) & att_iter)
                 return true;
             /* fall through */
         case la_attribute:


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to