Update of /cvsroot/monetdb/pathfinder/compiler/algebra/opt
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7122/algebra/opt

Modified Files:
      Tag: XQuery_0-24
        opt_complex.c opt_set.c 
Log Message:
-- Disable the blocking step and semijoin operators
   and replace them by step_join+distinct and eqjoin+distinct.

   This change gives the optimizer more freedom and removes the last
   traces of staircase-join from the logical plans.

   The physical algebra planner will try to implement step_join whenever
   possible with a duplicate-eliminating staircase-join operator.


U opt_complex.c
Index: opt_complex.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_complex.c,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -u -d -r1.45.2.1 -r1.45.2.2
--- opt_complex.c       30 May 2008 16:14:46 -0000      1.45.2.1
+++ opt_complex.c       3 Jun 2008 11:53:40 -0000       1.45.2.2
@@ -635,6 +635,7 @@
                 break;
             }
 
+#if 0 /* disable join -> semijoin rewrites */
             /* introduce semi-join operator if possible */
             if (!left_arg_req &&
                 (PFprop_key_left (p->prop, p->sem.eqjoin.att1) ||
@@ -750,6 +751,7 @@
                 *p = *PFla_project_ (semijoin, count, proj);
                 break;
             }
+#endif
         }   break;
 
         case la_semijoin:

U opt_set.c
Index: opt_set.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/opt/opt_set.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- opt_set.c   16 Feb 2008 19:42:40 -0000      1.10
+++ opt_set.c   3 Jun 2008 11:53:41 -0000       1.10.2.1
@@ -142,6 +142,7 @@
                           p->sem.step.item);
             break;
 
+#if 0 /* disable step_join -> step rewrite */
         case la_step_join:
             if (PFprop_set (p->prop) &&
                 PFprop_icols_count (p->prop) == 2 &&
@@ -174,6 +175,7 @@
                           p->sem.step.item_res);
             }
             break;
+#endif
 
         case la_guide_step:
             if (PFprop_set (p->prop) &&


-------------------------------------------------------------------------
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

Reply via email to