Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16717/src/backends/monet5
Modified Files:
sql_scenario.mx
Log Message:
propagated changes of Thursday Oct 22 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/22 - mlkersten: src/backends/monet5/sql_scenario.mx,1.356.2.1
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.357
diff -u -d -r1.356 -r1.357
--- sql_scenario.mx 22 Sep 2009 11:02:47 -0000 1.356
+++ sql_scenario.mx 22 Oct 2009 10:57:34 -0000 1.357
@@ -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);
------------------------------------------------------------------------------
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
