Changeset: 05044a513937 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/05044a513937
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_execute.h
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
small cleanup
diffs (131 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1403,7 +1403,6 @@ str RAstatementEnd(Client cntxt, MalBlkP
str SQLautocommit(mvc *m);
void SQLdestroyResult(res_table *destroy);
void SQLengine(Client c);
-str SQLengineIntern(Client c, backend *be);
str SQLengine_(Client c);
str SQLescapeString(str s);
str SQLexitClient(Client c);
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
@@ -539,13 +539,9 @@ SQLstatementIntern(Client c, const char
if (!output)
sql->out = NULL; /* no output stream */
be->depth++;
- msg = SQLrun(c,m);
+ msg = SQLrun(c, m);
be->depth--;
- if (c->curprg->def->stop > 1) {
- assert(0);
- MSresetInstructions(c->curprg->def, oldstop);
- freeVariables(c, c->curprg->def, NULL, oldvtop);
- }
+ assert (c->curprg->def->stop <= 1);
sqlcleanup(sql, 0);
if (!execute)
goto endofcompile;
@@ -603,38 +599,6 @@ endofcompile:
return msg;
}
-str
-SQLengineIntern(Client c, backend *be)
-{
- str msg = MAL_SUCCEED;
- //char oldlang = be->language;
- mvc *m = be->mvc;
-
- assert (m->emode != m_deallocate && m->emode != m_prepare);
- assert (c->curprg->def->stop > 2);
-
- //be->language = 'D';
- if (MALcommentsOnly(c->curprg->def))
- msg = MAL_SUCCEED;
- else
- msg = SQLrun(c,m);
-
- if (m->type == Q_SCHEMA && m->qc != NULL)
- qc_clean(m->qc);
- be->q = NULL;
- if (msg)
- m->session->status = -10;
- sqlcleanup(be, (!msg) ? 0 : -1);
- MSresetInstructions(c->curprg->def, 1);
- freeVariables(c, c->curprg->def, NULL, be->vtop);
- //be->language = oldlang;
- /*
- * Any error encountered during execution should block further
processing
- * unless auto_commit has been set.
- */
- return msg;
-}
-
void
SQLdestroyResult(res_table *destroy)
{
@@ -692,12 +656,10 @@ RAstatement(Client c, MalBlkPtr mb, MalS
if (backend_dumpstmt(be, c->curprg->def, rel, 0, 1, NULL) < 0) {
msg = createException(SQL,"RAstatement","Program
contains errors"); // TODO: use macro definition.
} else {
- SQLaddQueryToCache(c);
- msg = SQLoptimizeFunction(c,c->curprg->def);
- if( msg == MAL_SUCCEED)
+ msg = SQLoptimizeFunction(c, c->curprg->def);
+ if (msg == MAL_SUCCEED)
msg = SQLrun(c,m);
resetMalBlk(c->curprg->def);
- SQLremoveQueryFromCache(c);
}
rel_destroy(rel);
}
diff --git a/sql/backends/monet5/sql_execute.h
b/sql/backends/monet5/sql_execute.h
--- a/sql/backends/monet5/sql_execute.h
+++ b/sql/backends/monet5/sql_execute.h
@@ -15,7 +15,6 @@
#include "sql.h"
sql5_export str SQLstatementIntern(Client c, const char *expr, const char
*nme, bit execute, bit output, res_table **result);
-sql5_export str SQLengineIntern(Client c, backend *be);
sql5_export str RAstatement(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str RAstatement2(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str RAstatementEnd(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
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
@@ -1670,7 +1670,31 @@ SQLengine_(Client c)
sqlcleanup(be, 0);
return NULL;
}
- return SQLengineIntern(c, be);
+
+ mvc *m = be->mvc;
+
+ assert (m->emode != m_deallocate && m->emode != m_prepare);
+ assert (c->curprg->def->stop > 2);
+
+ if (MALcommentsOnly(c->curprg->def)) {
+ assert(0);
+ msg = MAL_SUCCEED;
+ } else
+ msg = SQLrun(c,m);
+
+ if (m->type == Q_SCHEMA && m->qc != NULL)
+ qc_clean(m->qc);
+ be->q = NULL;
+ if (msg)
+ m->session->status = -10;
+ sqlcleanup(be, (!msg) ? 0 : -1);
+ MSresetInstructions(c->curprg->def, 1);
+ freeVariables(c, c->curprg->def, NULL, be->vtop);
+ /*
+ * Any error encountered during execution should block further
processing
+ * unless auto_commit has been set.
+ */
+ return msg;
}
void
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
