MonetDB: sqloptimizer - Reset plan outputs at more places

[Pedro Ferreira]

Changeset: 8b6a2ec1ce2e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8b6a2ec1ce2e
Modified Files:
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_scenario.c
        tools/monetdbe/monetdbe.c
Branch: sqloptimizer
Log Message:

Reset plan outputs at more places


diffs (52 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -149,6 +149,7 @@ sqlcleanup(backend *be, int err)
 
        /* some statements dynamically disable caching */
        be->mvc->sym = NULL;
+       be->mvc->runs = NULL;
        if (be->mvc->ta)
                be->mvc->ta = sa_reset(be->mvc->ta);
        if (be->mvc->sa)
diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -530,6 +530,7 @@ SQLstatementIntern(Client c, const char 
                        /* passed over to query cache, used during dumpproc */
                        m->sa = NULL;
                        m->sym = NULL;
+                       m->runs = NULL;
                        m->params = NULL;
                        /* register name in the namespace */
                        if (be->q) {
@@ -632,6 +633,7 @@ endofcompile:
                sa_destroy(m->sa);
        m->sa = NULL;
        m->sym = NULL;
+       m->runs = NULL;
        /* variable stack maybe resized, ie we need to keep the new stack */
        label = m->label;
        status = m->session->status;
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
@@ -1215,6 +1215,7 @@ SQLparser(Client c)
                        /* passed over to query cache, used during dumpproc */
                        m->sa = NULL;
                        m->sym = NULL;
+                       m->runs = NULL;
                        m->params = NULL;
                        /* register name in the namespace */
                        if (be->q) {
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -392,6 +392,7 @@ monetdbe_query_internal(monetdbe_databas
        m->errstr[0] = '\0';
        m->params = NULL;
        m->sym = NULL;
+       m->runs = NULL;
        m->label = 0;
        if (m->sa)
                m->sa = sa_reset(m->sa);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org