Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8381
Modified Files:
Tag: Nov2009
sql_optimizer.mx sql_scenario.mx
Log Message:
Simplify switching between optimizer pipelines.
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.356
retrieving revision 1.356.2.1
diff -u -d -r1.356 -r1.356.2.1
--- sql_scenario.mx 22 Sep 2009 11:02:47 -0000 1.356
+++ sql_scenario.mx 22 Oct 2009 09:47:51 -0000 1.356.2.1
@@ -293,7 +293,7 @@
bit T = TRUE;
bit F = FALSE;
ValRecord src;
- str optimizer;
+ str optimizer, pipe= NULL;
typename = "int";
sql_find_subtype(&ctype, typename, 0, 0);
@@ -305,10 +305,16 @@
SQLglobal("current_user", user);
SQLglobal("current_role", user);
optimizer= GDKgetenv("sql_optimizer");
+ /* the sql_optimizer may point to a specific pipeline */
if (optimizer == NULL)
optimizer= defaultPlan;
- else
+ else {
+ /* the sql_optimizer may point to a specific pipeline */
+ pipe= GDKgetenv(optimizer);
+ if ( pipe != NULL)
+ optimizer= pipe;
defaultPlan= optimizer;
+ }
setOptimizers(optimizer);
SQLglobal("optimizer", optimizer);
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.230
retrieving revision 1.230.2.1
diff -u -d -r1.230 -r1.230.2.1
--- sql_optimizer.mx 15 Sep 2009 19:44:38 -0000 1.230
+++ sql_optimizer.mx 22 Oct 2009 09:47:51 -0000 1.230.2.1
@@ -510,10 +510,14 @@
/* the optimizer control is a semicolon separated list of names */
/* the predefined 'default' injects the default plan upon need */
int top=0,i;
- char *base, *nxt, *nme;
+ char *base, *nxt, *nme, *pipe;
if (optimizerpipeline == optimizer || pipelineOverruled)
return;
+ pipe= GDKgetenv(optimizer);
+ if ( pipe != NULL)
+ optimizer= pipe;
+
optimizerpipeline= optimizer;
base= GDKstrdup(optimizer);
------------------------------------------------------------------------------
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
