Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21154
Modified Files:
sql_optimizer.mx sql_scenario.mx
Log Message:
The default plan is in the config file.
U sql_scenario.mx
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- sql_scenario.mx 31 May 2009 07:19:16 -0000 1.348
+++ sql_scenario.mx 4 Jun 2009 22:24:15 -0000 1.349
@@ -297,6 +297,8 @@
optimizer= GDKgetenv("sql_optimizer");
if (optimizer == NULL)
optimizer= defaultPlan;
+ else
+ defaultPlan= optimizer;
setOptimizers(optimizer);
SQLglobal("optimizer", optimizer);
U sql_optimizer.mx
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- sql_optimizer.mx 1 Jun 2009 10:36:24 -0000 1.222
+++ sql_optimizer.mx 4 Jun 2009 22:24:15 -0000 1.223
@@ -438,44 +438,10 @@
The optimizers applied are taken from a list managed with
the SQL set optimizer statement. The default list has been
tested extensively and should provide overall good performance.
+Additional pipelines are defined in the monetdb.conf file.
@c
-str defaultPlan=
- "inline,"
- "remap,"
- "evaluate,"
- "costModel,"
- "coercions,"
- "emptySet,"
- /* "joinselect," */
- "mitosis,"
-/* "cluster,"*/
- "aliases,"
- /* "crack," */
- /* "selcrack," */
- /* "sidcrack," */
- "mergetable,"
- "deadcode," /* mergetable leaves dead code behind */
-#ifndef WIN32
- /*"octopus,"*/
-#endif
- "constants,"
- "commonTerms,"
-/* "replicator," */
- /*"reorder,"*/
- "joinPath,"
- /*"accumulators," clashes with the mergetable */
- "deadcode,"
- /*"recycle,"*/
- "reduce,"
- "garbageCollector,"
- "dataflow,"
- /*"prejoin," sort large operands */
- "history,"
- "multiplex";
-static str minimalPlan=
- "inline,"
- "remap,"
- "multiplex";
+str minimalPlan= "inline,remap,deadcode,multiplex";
+str defaultPlan;
static str optimizers[256]; /* the optimizer pipeline */
static str optimizerpipeline; /* reference to last pipeline string */
@@ -487,7 +453,7 @@
int mitosis= FALSE, deadcode= FALSE;
int i;
- if ( strcmp(optimizers[0],"inline") ){
+ if (optimizers[0] && strcmp(optimizers[0],"inline") ){
showException(SQL,"optimizer"," 'inline' should be the
first\n");
error++;
}
@@ -502,9 +468,16 @@
if (strcmp(optimizers[i],"mergetable") == 0 && mitosis ==
FALSE) {
showException(SQL,"optimizer"," 'mergetable' needs
'mitosis'\n");
error++;
+ }
+#ifdef WIN32
+ else
+ if (strcmp(optimizers[i],"octopus") == 0){
+ showException(SQL,"optimizer"," 'octopus' needs
Linux\n");
+ error++;
}
+#endif
- if ( --i >= 0 && strcmp(optimizers[i],"multiplex") ){
+ if ( --i >= 0 && optimizers[i] && strcmp(optimizers[i],"multiplex") ){
showException(SQL,"optimizer"," 'multiplex' should be the
last\n");
error++;
}
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
