Changeset: 42d1bd665f71 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42d1bd665f71
Modified Files:
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.h
Branch: jit
Log Message:
Remove unused execution mode.
diffs (57 lines):
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
@@ -604,11 +604,6 @@ SQLengineIntern(Client c, backend *be)
return MAL_SUCCEED;
}
- if (m->emode == m_inplace) {
- msg = SQLexecutePrepared(c, be, be->q);
- goto cleanup_engine;
- }
-
if (m->emode == m_prepare)
goto cleanup_engine;
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
@@ -1058,7 +1058,6 @@ SQLparser(Client c)
sqlcleanup(m, err);
goto finalize;
}
- //m->emode = m_inplace;
scanner_query_processed(&(m->scanner));
} else if (caching(m) && cachable(m, NULL) && m->emode != m_prepare &&
(be->q = qc_match(m->qc, m->sym, m->args, m->argc, m->scanner.key ^
m->session->schema->base.id)) != NULL) {
/* query template was found in the query cache */
@@ -1120,9 +1119,7 @@ SQLparser(Client c)
if (m->emode == m_prepare)
/* For prepared queries, return a table with
result set structure*/
err = mvc_export_prepare(m, c->fdout, be->q,
"");
- else if (m->emode == m_inplace) {
- /* everything ready for a fast call */
- } else if( m->emode == m_execute || m->emode ==
m_normal || m->emode == m_plan){
+ else if( m->emode == m_execute || m->emode == m_normal
|| m->emode == m_plan){
/* call procedure generation (only in cache
mode) */
backend_call(be, c, be->q);
}
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -41,7 +41,6 @@
/* different query execution modes (emode) */
#define m_normal 0
-#define m_inplace 1
#define m_execute 2
#define m_prepare 3
#define m_plan 4
@@ -51,7 +50,7 @@
#define m_instantiate 5
#define m_deps 6
-#define QUERY_MODE(m) (m==m_normal || m==m_inplace || m==m_instantiate ||
m==m_deps)
+#define QUERY_MODE(m) (m==m_normal || m==m_instantiate || m==m_deps)
/* different query execution modifiers (emod) */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
