Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv575/backends/monet5
Modified Files:
sql_gencode.mx sql_optimizer.mx sql_scenario.mx
Log Message:
Minor textual changes and the first experiment for the octopus.
U sql_scenario.mx
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- sql_scenario.mx 9 Dec 2008 12:13:12 -0000 1.332
+++ sql_scenario.mx 2 Jan 2009 22:34:57 -0000 1.333
@@ -1104,7 +1104,7 @@
@c
finalize:
if (m->emode == m_explain && be->q && be->q->code)
- printFunction(GDKout, ((Symbol)(be->q->code))->def, 0,
LIST_MAL_INSTR | LIST_MAL_UDF);
+ printFunction(GDKout, ((Symbol)(be->q->code))->def, 0,
LIST_MAL_STMT | LIST_MAL_UDF);
@-
Gather the statistics for post analysis. It should preferably
be stored in an SQL table
@@ -1184,7 +1184,7 @@
glb = (MalStkPtr)(q->stk);
ret= callMAL(c, mb, &glb, argv, (m->emod & mod_debug?'n':0));
if (ret && SQLdebug&16)
- printFunction(c->fdout, mb, 0, LIST_MAL_INSTR );
+ printFunction(c->fdout, mb, 0, LIST_MAL_STMT );
/* cleanup the arguments */
for(i=pci->retc; i<pci->argc; i++) {
garbageElement(c,v= &glb->stk[pci->argv[i]]);
U sql_gencode.mx
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- sql_gencode.mx 1 Jan 2009 18:44:46 -0000 1.306
+++ sql_gencode.mx 2 Jan 2009 22:34:57 -0000 1.307
@@ -491,8 +491,8 @@
q = newStmt1(mb, batRef, "new");
setVarType(mb, getArg(q, 0), newBatType(ht, tt));
setVarUDFtype(mb,getArg(q,0));
- q = pushNil(mb, q, ht);
- q = pushNil(mb, q, tt);
+ q = pushType(mb, q, ht);
+ q = pushType(mb, q, tt);
s->nr = getDestVar(q);
} break;
@@ -573,8 +573,8 @@
q = newStmt1(mb, batRef, "new");
setVarType(mb, getArg(q, 0), newBatType(ht,tt));
setVarUDFtype(mb,getArg(q,0));
- q = pushNil(mb, q, ht);
- q = pushNil(mb, q, tt);
+ q = pushType(mb, q, ht);
+ q = pushType(mb, q, tt);
k = getDestVar(q);
q = newStmt2(mb, batRef, appendRef);
@@ -1688,7 +1688,22 @@
q = newStmt(mb, "io", "stdout");
file = getDestVar(q);
}
+/*
+ q = newStmt2(mb, sqlRef,
putName("exportHead",10));
+ q = pushArgument(mb, q, file);
+ q = pushArgument(mb, q, s->nr);
+ q = newStmt2(mb, sqlRef,
putName("exportChunk",11));
+ q = pushArgument(mb, q, file);
+ q = pushArgument(mb, q, s->nr);
+ q = pushInt(mb,q,0);
+ q = pushInt(mb,q,10);
+ q = newStmt2(mb, sqlRef,
putName("exportChunk",11));
+ q = pushArgument(mb, q, file);
+ q = pushArgument(mb, q, s->nr);
+ q = pushInt(mb,q,10);
+ q = pushInt(mb,q,0);
+*/
q = newStmt2(mb, sqlRef, exportResultRef);
q = pushArgument(mb, q, file);
q = pushArgument(mb, q, s->nr);
@@ -1713,8 +1728,8 @@
q = newStmt1(mb, batRef, "new");
s->nr = getDestVar(q);
- q = pushNil(mb, q, TYPE_str);
- q = pushNil(mb, q, TYPE_bat);
+ q = pushType(mb, q, TYPE_str);
+ q = pushType(mb, q, TYPE_bat);
dump_cols(mb, l, s->nr);
} else {
q = newStmt1(mb, sqlRef, "print");
@@ -1934,9 +1949,9 @@
}
/* later we change this to a factory ? */
if (cq)
- c->curprg = newFunction(putName(cq->name,strlen(cq->name)),
FUNCTIONsymbol);
+ c->curprg =
newFunction(userRef,putName(cq->name,strlen(cq->name)), FUNCTIONsymbol);
else
- c->curprg = newFunction("tmp", FUNCTIONsymbol);
+ c->curprg = newFunction(userRef,"tmp", FUNCTIONsymbol);
curPrg = c->curprg;
curPrg->def->keephistory= backup->def->keephistory;
@@ -2074,7 +2089,7 @@
assert(s);
backup = c->curprg;
- c->curprg = newFunction(putName(f->base.name,strlen(f->base.name)),
FUNCTIONsymbol);
+ c->curprg =
newFunction(userRef,putName(f->base.name,strlen(f->base.name)), FUNCTIONsymbol);
curBlk = c->curprg->def;
curInstr = getInstrPtr(curBlk, 0);
U sql_optimizer.mx
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- sql_optimizer.mx 4 Nov 2008 23:07:19 -0000 1.200
+++ sql_optimizer.mx 2 Jan 2009 22:34:57 -0000 1.201
@@ -270,7 +270,7 @@
the cache when the underlying table is changed.
@c
#ifdef _SQL_OPTIMIZER_DEBUG
- printFunction(GDKout, mb, 0, LIST_MAL_INSTR);
+ printFunction(GDKout, mb, 0, LIST_MAL_STMT);
#endif
return MAL_SUCCEED;
}
@@ -606,7 +606,7 @@
(void) c;
#ifdef _SQL_OPTIMIZER_DEBUG
stream_printf(GDKout, "SQLoptimizer\n");
- printFunction(c->fdout, c->curprg->def,0, LIST_MAL_INSTR);
+ printFunction(c->fdout, c->curprg->def,0, LIST_MAL_STMT);
stream_printf(GDKout, "done\n");
#endif
return MAL_SUCCEED;
------------------------------------------------------------------------------
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
