MonetDB: default - Shuffle code around, no functional change.

[Martin Kersten]

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

Shuffle code around, no functional change.


diffs (63 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
@@ -128,16 +128,36 @@ addOptimizers(Client c, MalBlkPtr mb, ch
                addtoMalBlkHistory(mb, "getStatistics");
 }
 
+static str
+sqlJIToptimizer(Client c, MalBlkPtr mb, backend *be)
+{
+       str msg;
+       str pipe = getSQLoptimizer(be->mvc);
+
+       addOptimizers(c, mb, pipe);
+       msg = optimizeMALBlock(c, mb);
+       if (msg)
+               return msg;
+
+       /* time to execute the optimizers */
+       if (c->debug)
+               optimizerCheck(c, mb, "sql.baseline", -1, 0);
+#ifdef _SQL_OPTIMIZER_DEBUG
+       mnstr_printf(GDKout, "End Optimize Query\n");
+       printFunction(GDKout, mb, 0, LIST_MAL_ALL);
+#endif
+       return MAL_SUCCEED;
+}
+
 str
 optimizeQuery(Client c)
 {
        MalBlkPtr mb;
        backend *be;
-       str msg = 0, pipe;
+       str msg = 0;
 
        be = (backend *) c->sqlcontext;
        assert(be && be->mvc);  /* SQL clients should always have their state 
set */
-       pipe = getSQLoptimizer(be->mvc);
 
        trimMalBlk(c->curprg->def);
        c->blkmode = 0;
@@ -164,19 +184,7 @@ optimizeQuery(Client c)
                }
                return NULL;
        }
-       addOptimizers(c, mb, pipe);
-       msg = optimizeMALBlock(c, mb);
-       if (msg)
-               return msg;
-
-       /* time to execute the optimizers */
-       if (c->debug)
-               optimizerCheck(c, mb, "sql.baseline", -1, 0);
-#ifdef _SQL_OPTIMIZER_DEBUG
-       mnstr_printf(GDKout, "End Optimize Query\n");
-       printFunction(GDKout, mb, 0, LIST_MAL_ALL);
-#endif
-       return NULL;
+       return sqlJIToptimizer(c,mb,be);
 }
 
 void
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list