Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13388/src/backends/monet5
Modified Files:
sql_optimizer.mx
Log Message:
propagated changes of Sunday Jul 01 2007 - Monday Jul 02 2007
from the SQL_2-18 branch to the development trunk
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- sql_optimizer.mx 20 Jun 2007 21:04:26 -0000 1.156
+++ sql_optimizer.mx 2 Jul 2007 10:17:09 -0000 1.157
@@ -101,15 +101,6 @@
The current heuristic is geared at avoiding trivial
factory structures.
@-
[EMAIL PROTECTED] SQLglobal
-{ sql_subtype ctype;
- stmt *r;
- ValRecord src;
- sql_find_subtype(&ctype, "varchar", 1024, 0);
- r = stmt_var(_strdup(@1), &ctype, 0, 1);
- stack_push_var(be->mvc, @1, r, &ctype);
- stack_set_var(be->mvc, @1, VALset(&src, ctype.type->localtype, @2));
-}
@c
#include "sql_config.h"
#include "mal_builder.h"
@@ -474,6 +465,7 @@
backend *be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
str optimizer;
MalBlkPtr mb;
+ ValRecord src;
insertSymbol(c->nspace, c->curprg);
trimMalBlk(c->curprg->def);
@@ -514,23 +506,27 @@
expand the macros (unless this has already been taken
care of.
@c
- if( strcmp(optimizer,"on")==0 ||
- strcmp(optimizer,"default")==0 ){
+ if( strcmp(optimizer,"on")==0 || strcmp(optimizer,"default")==0 ){
str base = GDKstrdup(defaultPlan);
- @:SQLglobal("optimizer", defaultPlan)@
+
+ stack_set_var(be->mvc, "optimizer",
+ VALset(&src, TYPE_str, defaultPlan));
addOptimizers(c,mb, base);
optimizeMALBlock(mb);
GDKfree(base);
} else
if( strcmp(optimizer,"off")==0 ){
str base = GDKstrdup(minimalPlan);
- @:SQLglobal("optimizer", minimalPlan)@
+
+ stack_set_var(be->mvc, "optimizer",
+ VALset(&src, TYPE_str, minimalPlan));
/* no real optimization needed */
addOptimizers(c,mb, base);
optimizeMALBlock(mb);
GDKfree(base);
} else {
str base = GDKstrdup(optimizer);
+
addOptimizers(c,mb,base);
GDKfree(base);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
