MonetDB: default - The dot file production

[Martin Kersten]

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

The dot file production
The dot file should be produced after the optimizers have made
their pass over the code.


diffs (27 lines):

diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1395,13 +1395,11 @@ SQLparser(Client c)
                /* generate and call the MAL code */
                if (m->emode == m_explain)
                        SQLshowPlan(c);
-               if (m->emode == m_dot)
-                       SQLshowDot(c);
                if (m->emod & mod_trace)
                        SQLsetTrace(be, c, TRUE);
                if (m->emod & mod_debug)
                        SQLsetDebugger(c, m, TRUE);
-               if ((m->emode != m_inplace && m->emode != m_prepare && m->emode 
!= m_prepareresult && !m->caching && m->emode != m_explain && m->emode != 
m_dot) || s->type == st_none || m->type == Q_TRANS) {
+               if ((m->emode != m_inplace && m->emode != m_prepare && m->emode 
!= m_prepareresult && !m->caching && m->emode != m_explain ) || s->type == 
st_none || m->type == Q_TRANS) {
                        InstrPtr p;
                        MalBlkPtr curBlk;
 
@@ -1418,6 +1416,8 @@ SQLparser(Client c)
 
                        if (m->emode == m_inplace)
                                m->emode = m_normal;
+                       if (m->emode == m_dot)
+                               SQLshowDot(c);
                } else {
                        /* generate a factory instantiation */
                        be->q = qc_insert(m->qc,
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list