Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23847/algebra

Modified Files:
      Tag: Nov2009
        planner.c 
Log Message:
-- Restrict heuristic to avoid blowing up the plan size.


Index: planner.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/planner.c,v
retrieving revision 1.87.2.1
retrieving revision 1.87.2.2
diff -u -d -r1.87.2.1 -r1.87.2.2
--- planner.c   7 Oct 2009 13:44:12 -0000       1.87.2.1
+++ planner.c   18 Nov 2009 09:11:09 -0000      1.87.2.2
@@ -3976,8 +3976,11 @@
                    if we have only a small number of input orders.
                    (Choose 1000 as otherwise prune_plans() will have
                     to compare more than 1.000.000 orderings for each
-                    plan combination.) */
-                if (PFord_set_count (p->orderings) < 1000)
+                    plan combination.)
+                    Furthermore ensure that we do not increase the plan space
+                    if we already have a large number of possible plans. */
+                if (PFord_set_count (p->orderings) < 1000 &&
+                    PFarray_last (plans) < 5000)
                     for (i = 0; i < PFord_set_count (orderings); i++) {
                         ord = PFord_set_at (orderings, i);
                         add_plans (plans, ensure_ordering (p, ord));


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to