Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14261
Modified Files:
Tag: Feb2009
sql_gencode.mx sql_optimizer.mx
Log Message:
Make sure the query string is back into place.
U sql_gencode.mx
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.312.2.1
retrieving revision 1.312.2.2
diff -u -d -r1.312.2.1 -r1.312.2.2
--- sql_gencode.mx 30 Jan 2009 23:52:16 -0000 1.312.2.1
+++ sql_gencode.mx 10 Feb 2009 17:52:13 -0000 1.312.2.2
@@ -2007,15 +2007,18 @@
m->Tparse = Toptimize - m->Tparse;
if (m->history) {
- char *t = sql_escape_str(QUERY(m->scanner) + m->scanner.as);
+ char *t;
oid queryid = OIDnew(1);
InstrPtr q;
-
- while( t && isspace((int) *t) )
- t++;
+ if ( be->q && be->q->codestring) {
+ t = GDKstrdup( be->q->codestring);
+ while( t && isspace((int) *t) )
+ t++;
+ } else
+ t = GDKstrdup("-- no query");
- q = newStmt(mb, userRef, "keepquery");
+ q = newStmt(mb, userRef, "keepquery");
q->token = REMsymbol;
q = pushWrd(mb, q, queryid);
q = pushStr(mb, q, t);
U sql_optimizer.mx
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.203
retrieving revision 1.203.2.1
diff -u -d -r1.203 -r1.203.2.1
--- sql_optimizer.mx 17 Jan 2009 18:17:01 -0000 1.203
+++ sql_optimizer.mx 10 Feb 2009 17:52:16 -0000 1.203.2.1
@@ -446,11 +446,14 @@
"emptySet,"
/* "joinselect," */
/* "accessmode," not needed after patches to BKCappend */
-// "mitosis,"
+ "mitosis,"
"aliases,"
/* "crack," */
/*"joinPath,"*/
"mergetable,"
+#ifndef WIN32
+/* "octopus,"*/
+#endif
"commonTerms,"
/* "replicator," */
"accumulators,"
@@ -459,7 +462,6 @@
"reduce,"
"garbageCollector,"
"dataflow,"
-/* "octopus,"*/
"history,"
"multiplex";
static str minimalPlan=
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
