Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15124/src/backends/monet5

Modified Files:
        sql_optimizer.mx 
Log Message:
propagated changes of Monday Oct 26 2009 - Thursday Oct 29 2009
from the Nov2009 branch to the development trunk

  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  2009/10/26 - nielsnes: src/backends/monet5/sql_optimizer.mx,1.230.2.6
  call optimize once
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- sql_optimizer.mx    26 Oct 2009 10:12:48 -0000      1.234
+++ sql_optimizer.mx    29 Oct 2009 08:42:54 -0000      1.235
@@ -626,13 +626,12 @@
        optimizer = stack_get_string(be->mvc, "optimizer");
        stack_set_var(be->mvc, "optimizer", VALset(&src, TYPE_str, 
setOptimizers(optimizer)));
        addOptimizers(c,mb);
+       SQLgetStatistics(c,(mvc *) c->state[MAL_SCENARIO_OPTIMIZE],mb);
        optimizeMALBlock(c,mb);
 
        /* time to execute the optimizers */
        if( c->debug)
                optimizerCheck(c,mb,"sql.baseline",-1,0, OPT_CHECK_ALL);
-       SQLgetStatistics(c,(mvc *) c->state[MAL_SCENARIO_OPTIMIZE],mb);
-       optimizeMALBlock(c,mb);
 #ifdef _SQL_OPTIMIZER_DEBUG
        stream_printf(GDKout, "ADD optimized QUERY TO CACHE\n");
        printFunction(GDKout,mb,0,LIST_MAL_ALL);


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to