MonetDB: Feb2013 - Make the optimizer pipe to be added explicit

[Martin Kersten]

Changeset: 4ec538e15e63 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ec538e15e63
Modified Files:
        sql/backends/monet5/sql_optimizer.c
        sql/backends/monet5/sql_optimizer.h
Branch: Feb2013
Log Message:

Make the optimizer pipe to be added explicit


diffs (57 lines):

diff --git a/sql/backends/monet5/sql_optimizer.c 
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -232,18 +232,16 @@ initSQLoptimizer(void)
 }
 
 void
-addOptimizers(Client c, MalBlkPtr mb)
+addOptimizers(Client c, MalBlkPtr mb, char *pipe)
 {
        int i;
        InstrPtr q;
-       ValRecord *val;
        backend *be;
 
        be = (backend *) c->sqlcontext;
        assert( be && be->mvc );        /* SQL clients should always have their 
state set */
 
-       val = stack_get_var(be->mvc,"optimizer");
-       addOptimizerPipe(c, mb, val? val->val.sval:"default_pipe");
+       addOptimizerPipe(c, mb, pipe? pipe:"default_pipe");
        /* point queries do not require mitosis and dataflow */
        if ( be->mvc->point_query)
        for( i = mb->stop -1; i > 0; i--){
@@ -260,6 +258,12 @@ addQueryToCache(Client c)
 {
        MalBlkPtr mb;
        mvc *m;
+       ValRecord *val;
+       backend *be;
+
+       be = (backend *) c->sqlcontext;
+       assert( be && be->mvc );        /* SQL clients should always have their 
state set */
+       val = stack_get_var(be->mvc,"optimizer");
 
        insertSymbol(c->nspace, c->curprg);
        trimMalBlk(c->curprg->def);
@@ -285,7 +289,7 @@ addQueryToCache(Client c)
                        runMALDebugger(c,c->curprg);
                return;
        }
-       addOptimizers(c, mb);
+       addOptimizers(c, mb, val->val.sval);
        SQLgetStatistics(c,m,mb);
        if ( m->emod & mod_debug )
                addtoMalBlkHistory(mb,"getStatistics");
diff --git a/sql/backends/monet5/sql_optimizer.h 
b/sql/backends/monet5/sql_optimizer.h
--- a/sql/backends/monet5/sql_optimizer.h
+++ b/sql/backends/monet5/sql_optimizer.h
@@ -28,6 +28,6 @@ sql5_export str SQLoptimizer(Client c);
 sql5_export void SQLsetAccessMode(Client c);
 sql5_export str initSQLoptimizer(void);
 
-sql5_export void addOptimizers(Client c,MalBlkPtr mb);
+sql5_export void addOptimizers(Client c,MalBlkPtr mb, char *pipe);
 #endif /* _SQL_OPTIMIZER_H_ */
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list