Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25816
Modified Files:
sql_optimizer.mx
Log Message:
Moved direct calls to the MAL optimizers out of the way
and clean up include list.
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- sql_optimizer.mx 23 Mar 2007 19:57:40 -0000 1.148
+++ sql_optimizer.mx 24 Mar 2007 21:23:25 -0000 1.149
@@ -104,11 +104,8 @@
@c
#include "sql_config.h"
#include "mal_builder.h"
-#include "bat5.h"
-
-#include "opt_multiplex.h"
#include "mal_debugger.h"
-#include "mal_namespace.h"
+#include "opt_prelude.h"
#include "sql_mvc.h"
#include "sql_optimizer.h"
#include "sql_scenario.h"
@@ -421,7 +418,11 @@
"joinPath,"
"deadcode,"
"reduce,"
- "garbageCollector,";
+ "garbageCollector,"
+ "multiplex";
+
+static str minimalPlan=
+ "multiplex";
static void
@@ -510,8 +511,9 @@
care of.
@c
if( strcmp(optimizer,"off")==0 ){
- /* no optimization needed */
- OPTmultiplex(mb,0,0); /* always perform multiplex expansions
*/
+ /* no real optimization needed */
+ addOptimizers(c,mb, minimalPlan);
+ optimizeMALBlock(mb);
} else {
str base;
base= GDKstrdup(optimizer);
@@ -523,7 +525,6 @@
optimizerCheck(mb,"sql.baseline",-1,0, OPT_CHECK_ALL);
SQLgetStatistics((mvc *) c->state[OPTIMIZE],mb);
optimizeMALBlock(mb);
- OPTmultiplex(mb,0,0); /* always perform multiplex expansions
*/
}
}
-------------------------------------------------------------------------
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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
