MonetDB: default - Renaming of arguments for better re-use

[mk]

Changeset: e13b3a4f93e9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e13b3a4f93e9
Modified Files:
        sql/backends/monet5/sql_optimizer.mx
Branch: default
Log Message:

Renaming of arguments for better re-use


diffs (40 lines):

diff --git a/sql/backends/monet5/sql_optimizer.mx 
b/sql/backends/monet5/sql_optimizer.mx
--- a/sql/backends/monet5/sql_optimizer.mx
+++ b/sql/backends/monet5/sql_optimizer.mx
@@ -142,6 +142,7 @@
 sql5_export str setOptimizers(str optimizer);
 
 sql5_export str optimizerpipe;         /* the active pipeline */
+sql5_export void addOptimizers(Client c,MalBlkPtr mb, int flag);
 #endif /* _SQL_OPTIMIZER_H_ */
 
 @-
@@ -633,8 +634,8 @@
        return optimizerpipe;
 }
 
-static void
-addOptimizers(Client c,MalBlkPtr mb, mvc *m)
+void
+addOptimizers(Client c,MalBlkPtr mb, int flag)
 {
        int i;
 
@@ -642,7 +643,7 @@
        for (i = 0; optimizers[i]; i++) {
                InstrPtr p;
 
-               if (m->point_query && (strcmp(optimizers[i], "mitosis")==0 || 
strcmp(optimizers[i], "dataflow")==0))
+               if (flag && (strcmp(optimizers[i], "mitosis")==0 || 
strcmp(optimizers[i], "dataflow")==0))
                        continue;
                p = newFcnCall(mb, "optimizer", optimizers[i]);
                typeChecker(c->nspace, mb, p, FALSE);
@@ -686,7 +687,7 @@
        }
        optimizer = stack_get_string(be->mvc, "optimizer");
        stack_set_var(be->mvc, "optimizer", VALset(&src, TYPE_str, 
setOptimizers(optimizer)));
-       addOptimizers(c,mb, be->mvc);
+       addOptimizers(c,mb, be->mvc->point_query);
        SQLgetStatistics(c,(mvc *) c->state[MAL_SCENARIO_OPTIMIZE],mb);
        if ( m->emod & mod_debug )
                addtoMalBlkHistory(mb,"getStatistics");
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list