Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10146/src/backends/monet5
Modified Files:
sql_gencode.mx sql_optimizer.mx
Log Message:
a bit more string (namespace) reuse
the mergetable optimize should run before the joinpath (as the later
doesn't understand mat's and the former doesn't understand the joinpath
operator).
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- sql_gencode.mx 6 Nov 2007 15:42:26 -0000 1.249
+++ sql_gencode.mx 12 Nov 2007 22:22:00 -0000 1.250
@@ -604,9 +604,9 @@
@:SQLprelude@
if (s->flag) {
- q = newStmt(mb, "group", "refine");
+ q = newStmt1(mb, groupRef, "refine");
} else {
- q = newStmt(mb, "group", "refine_reverse");
+ q = newStmt1(mb, groupRef, "refine_reverse");
}
q = pushArgument(mb, q, l);
q = pushArgument(mb, q, r);
@@ -876,9 +876,9 @@
int o1 = _dumpstmt(sql, mb, s->op1.stval);
int o2 = _dumpstmt(sql, mb, s->op2.stval);
@:SQLprelude@
- mp = newStmt(mb, batRef, mirrorRef);
+ mp = newStmt2(mb, batRef, mirrorRef);
pushArgument(mb,mp,o2);
- mq = newStmt(mb, algebraRef, joinRef);
+ mq = newStmt2(mb, algebraRef, joinRef);
pushArgument(mb,mq,getArg(mp,0));
pushArgument(mb,mq,o1);
s->nr = getDestVar(mq);
@@ -1007,7 +1007,7 @@
nme = alloca(SMALLBUFSIZ);
@:SQLprelude@
- q = newStmt(mb, "group", "new");
+ q = newStmt2(mb, groupRef, newRef);
ext = getDestVar(q);
snprintf( nme, SMALLBUFSIZ, "grp%d", getDestVar(q));
q = pushReturn(mb, q, newVariable(mb, _strdup(nme),
TYPE_any));
@@ -1047,7 +1047,7 @@
nme = alloca(SMALLBUFSIZ);
buf = alloca(SMALLBUFSIZ);
@:SQLprelude@
- q = newStmt(mb, "group", "derive");
+ q = newStmt2(mb, groupRef, deriveRef);
ext = getDestVar(q);
snprintf( nme, SMALLBUFSIZ, "grp%d", getDestVar(q));
q = pushReturn(mb, q, newVariable(mb, _strdup(nme),
TYPE_any));
@@ -1077,7 +1077,7 @@
nme = alloca(SMALLBUFSIZ);
buf = alloca(SMALLBUFSIZ);
- q = newStmt(mb, "group", "derive");
+ q = newStmt2(mb, groupRef, deriveRef);
e = getDestVar(q);
snprintf( nme, SMALLBUFSIZ, "grp%d",
getDestVar(q));
q = pushReturn(mb, q, newVariable(mb,
_strdup(nme), TYPE_any));
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- sql_optimizer.mx 12 Nov 2007 20:11:03 -0000 1.164
+++ sql_optimizer.mx 12 Nov 2007 22:22:00 -0000 1.165
@@ -451,8 +451,8 @@
/* "crack," */
"commonTerms,"
"accumulators,"
- "joinPath,"
"mergetable,"
+ "joinPath,"
"deadcode,"
"reduce,"
"garbageCollector,"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
