Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2345/src/backends/monet5
Modified Files:
sql_scenario.mx
Log Message:
propagated changes of Friday Oct 23 2009 - Saturday Oct 24 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/23 - mlkersten: src/backends/monet5/sql_scenario.mx,1.356.2.2
Simplify optimizer pipeline setting and test for available ones.
Missing pipelines lead to the minimal plan possible.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -d -r1.357 -r1.358
--- sql_scenario.mx 22 Oct 2009 10:57:34 -0000 1.357
+++ sql_scenario.mx 23 Oct 2009 22:43:49 -0000 1.358
@@ -293,7 +293,7 @@
bit T = TRUE;
bit F = FALSE;
ValRecord src;
- str optimizer, pipe= NULL;
+ str optimizer;
typename = "int";
sql_find_subtype(&ctype, typename, 0, 0);
@@ -305,18 +305,9 @@
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 {
- /* the sql_optimizer may point to a specific pipeline */
- pipe= GDKgetenv(optimizer);
- if ( pipe != NULL)
- optimizer= pipe;
- defaultPlan= optimizer;
- }
- setOptimizers(optimizer);
- SQLglobal("optimizer", optimizer);
+ optimizer= "none";
+ SQLglobal("optimizer", setOptimizers(optimizer));
typename = "sec_interval";
sql_find_subtype(&ctype, typename, 0, 0);
------------------------------------------------------------------------------
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
