Changeset: ccee2662f889 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccee2662f889
Modified Files:
sql/src/backends/monet5/sql_gencode.mx
sql/src/backends/monet5/sql_scenario.mx
sql/src/server/rel_semantic.mx
sql/src/server/rel_subquery.mx
sql/src/server/sql_semantic.mx
Branch: default
Log Message:
fix caching change. Caching should be set to 0 when we recursively call
sqlparse
diffs (78 lines):
diff -r 9b102131dc73 -r ccee2662f889 sql/src/backends/monet5/sql_gencode.mx
--- a/sql/src/backends/monet5/sql_gencode.mx Mon May 10 07:39:56 2010 +0200
+++ b/sql/src/backends/monet5/sql_gencode.mx Mon May 10 09:12:02 2010 +0200
@@ -2007,7 +2007,7 @@
be->mvc_var = getDestVar(q);
(void)_dumpstmt(be, mb, s);
be->mvc_var = old_mv;
- if (c->cache && (c->type == Q_SCHEMA || c->type == Q_TRANS)) {
+ if (c->caching && (c->type == Q_SCHEMA || c->type == Q_TRANS)) {
q = newStmt2(mb, sqlRef, exportOperationRef);
q = pushStr(mb, q, ""); /* warning */
}
diff -r 9b102131dc73 -r ccee2662f889 sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx Mon May 10 07:39:56 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx Mon May 10 09:12:02 2010 +0200
@@ -609,7 +609,7 @@
sql = backend_create(m, c);
m->qc = NULL;
m->prepare_qc = NULL;
- m->cache = 0;
+ m->caching = 0;
m->user_id = m->role_id = USER_MONETDB;
b = (buffer*)GDKmalloc(sizeof(buffer));
@@ -1235,7 +1235,7 @@
SQLsetTrace(be, c, TRUE);
if (m->emod & mod_debug)
SQLsetDebugger(c, m, TRUE);
- if ((m->emode != m_inplace && m->emode != m_prepare &&
!m->cache && m->emode != m_explain) || s->type == st_none || m->type ==
Q_TRANS) {
+ if ((m->emode != m_inplace && m->emode != m_prepare &&
!m->caching && m->emode != m_explain) || s->type == st_none || m->type ==
Q_TRANS) {
scanner_query_processed(&(m->scanner));
backend_callinline(be, c, s );
if( m->emode == m_inplace)
diff -r 9b102131dc73 -r ccee2662f889 sql/src/server/rel_semantic.mx
--- a/sql/src/server/rel_semantic.mx Mon May 10 07:39:56 2010 +0200
+++ b/sql/src/server/rel_semantic.mx Mon May 10 09:12:02 2010 +0200
@@ -127,7 +127,7 @@
m->qc = NULL;
- m->cache = 0;
+ m->caching = 0;
m->emode = emode;
b = (buffer*)GDKmalloc(sizeof(buffer));
diff -r 9b102131dc73 -r ccee2662f889 sql/src/server/rel_subquery.mx
--- a/sql/src/server/rel_subquery.mx Mon May 10 07:39:56 2010 +0200
+++ b/sql/src/server/rel_subquery.mx Mon May 10 09:12:02 2010 +0200
@@ -432,7 +432,7 @@
m->qc = NULL;
- m->cache = 0;
+ m->caching = 0;
m->emode = emode;
b = (buffer*)GDKmalloc(sizeof(buffer));
@@ -501,7 +501,7 @@
m->qc = NULL;
- m->cache = 0;
+ m->caching = 0;
m->emode = emode;
b = (buffer*)GDKmalloc(sizeof(buffer));
diff -r 9b102131dc73 -r ccee2662f889 sql/src/server/sql_semantic.mx
--- a/sql/src/server/sql_semantic.mx Mon May 10 07:39:56 2010 +0200
+++ b/sql/src/server/sql_semantic.mx Mon May 10 09:12:02 2010 +0200
@@ -318,7 +318,7 @@
m->qc = NULL;
m->last = NULL;
- m->cache = 0;
+ m->caching = 0;
m->emode = mode;
b = (buffer*)GDKmalloc(sizeof(buffer));
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
