MonetDB: default - Change interface of addOptimizers.

[Martin Kersten]

Changeset: 1e88a1b85225 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e88a1b85225
Modified Files:
        sql/backends/monet5/datacell/datacell.c
        sql/backends/monet5/datacell/opt_datacell.c
        sql/backends/monet5/sql_optimizer.c
        sql/backends/monet5/sql_optimizer.h
Branch: default
Log Message:

Change interface of addOptimizers.
Take the backend context from the client record.


diffs (74 lines):

diff --git a/sql/backends/monet5/datacell/datacell.c 
b/sql/backends/monet5/datacell/datacell.c
--- a/sql/backends/monet5/datacell/datacell.c
+++ b/sql/backends/monet5/datacell/datacell.c
@@ -315,7 +315,7 @@ DCquery(Client cntxt, MalBlkPtr mb, MalS
        /* optimize the code and register at scheduler */
        if ( msg == MAL_SUCCEED) {
                OPTdatacellImplementation(cntxt,s->def,0,0);
-               addOptimizers(cntxt,s->def,0);
+               addOptimizers(cntxt,s->def);
                if ( msg == MAL_SUCCEED)
                        msg = optimizeMALBlock(cntxt,s->def);
                if ( msg == MAL_SUCCEED)
diff --git a/sql/backends/monet5/datacell/opt_datacell.c 
b/sql/backends/monet5/datacell/opt_datacell.c
--- a/sql/backends/monet5/datacell/opt_datacell.c
+++ b/sql/backends/monet5/datacell/opt_datacell.c
@@ -290,7 +290,7 @@ str OPTdatacell(Client cntxt, MalBlkPtr 
                return MAL_SUCCEED;
        }
        actions = OPTdatacellImplementation(cntxt, mb, stk, p);
-       addOptimizers(cntxt,mb,0);
+       addOptimizers(cntxt,mb);
        if ( msg == MAL_SUCCEED)
                msg = optimizeMALBlock(cntxt,mb);
        if ( msg == MAL_SUCCEED)
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
@@ -439,14 +439,15 @@ initSQLoptimizer(void)
 }
 
 void
-addOptimizers(Client c, MalBlkPtr mb, backend *be)
+addOptimizers(Client c, MalBlkPtr mb)
 {
        int i;
        InstrPtr q;
        ValRecord *val;
+       backend *be;
 
-       if ( be == 0)
-               be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
+       be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
+       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");
@@ -464,7 +465,6 @@ addOptimizers(Client c, MalBlkPtr mb, ba
 void
 addQueryToCache(Client c)
 {
-       backend *be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
        MalBlkPtr mb;
        mvc *m;
 
@@ -495,7 +495,7 @@ addQueryToCache(Client c)
                        runMALDebugger(c,c->curprg);
                return;
        }
-       addOptimizers(c,mb, be);
+       addOptimizers(c, mb);
        SQLgetStatistics(c,(mvc *) c->state[MAL_SCENARIO_OPTIMIZE],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, backend *be);
+sql5_export void addOptimizers(Client c,MalBlkPtr mb);
 #endif /* _SQL_OPTIMIZER_H_ */
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list