Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12888
Modified Files:
sql.mx sql_optimizer.mx sql_scenario.mx
Log Message:
Functions required an extra parameter
U sql_scenario.mx
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- sql_scenario.mx 21 Jul 2008 19:55:16 -0000 1.314
+++ sql_scenario.mx 7 Aug 2008 09:05:35 -0000 1.315
@@ -480,14 +480,14 @@
@c
static void
-freeVariables(MalBlkPtr mb, MalStkPtr glb, int start)
+freeVariables(Client c, MalBlkPtr mb, MalStkPtr glb, int start)
{
int i;
for (i = start; i < mb->vtop;) {
if (glb) {
if (isVarCleanup(mb,i))
- garbageElement(&glb->stk[i]);
+ garbageElement(c,&glb->stk[i]);
/* clean stack entry */
glb->stk[i].vtype = TYPE_int;
glb->stk[i].val.ival = 0;
@@ -625,7 +625,7 @@
msg = (str) runMAL(c, c->curprg->def, 1, 0, 0, 0);
c->state[MAL_SCENARIO_PARSER] = be;
MSresetInstructions(c->curprg->def, 1);
- freeVariables(c->curprg->def, 0, 0);
+ freeVariables(c,c->curprg->def, 0, 0);
c->curprg= oldsym;
}
}
@@ -1109,7 +1109,7 @@
showErrors(c);
/* restore the state */
resetMalBlk(c->curprg->def, oldstop);
- freeVariables(c->curprg->def, c->glb, oldvtop);
+ freeVariables(c,c->curprg->def, c->glb, oldvtop);
c->curprg->def->errors = 0;
msg = createException(PARSE, "SQLparser", "Semantic
errors");
}
@@ -1203,7 +1203,7 @@
LIST_MAL_INSTR | LIST_MAL_PROPS | LIST_MAPI);
/* cleanup the arguments */
for(i=pci->retc; i<pci->argc; i++) {
- garbageElement(v= &glb->stk[pci->argv[i]]);
+ garbageElement(c,v= &glb->stk[pci->argv[i]]);
v->vtype= TYPE_int;
v->val.ival= int_nil;
}
@@ -1346,7 +1346,7 @@
if (getExceptionType(msg) == OPTIMIZER) {
resetMalBlk( c->curprg->def, 1);
/* resetInstructions(c->curprg->def, 1);*/
- freeVariables(c->curprg->def, c->glb, be->vtop);
+ freeVariables(c,c->curprg->def, c->glb, be->vtop);
be->language = oldlang;
c->glb = oldglb;
return SQLrecompile(c, be);
@@ -1377,7 +1377,7 @@
sqlcleanup(be->mvc, 0);
resetMalBlk( c->curprg->def, 1);
/* resetInstructions(c->curprg->def, 1);*/
- freeVariables(c->curprg->def, c->glb, be->vtop);
+ freeVariables(c,c->curprg->def, c->glb, be->vtop);
be->language = oldlang;
@-
Any error encountered during execution should block further processing
@@ -1416,7 +1416,7 @@
showErrors(c);
/* restore the state */
resetMalBlk(c->curprg->def, oldstop);
- freeVariables(c->curprg->def, c->glb, oldvtop);
+ freeVariables(c,c->curprg->def, c->glb, oldvtop);
c->curprg->def->errors = 0;
throw(SQL, "SQLrecompile", "Semantic errors");
}
@@ -1487,7 +1487,7 @@
if (s == NULL)
throw(MAL, "cache.remove", "internal error, symbol missing\n");
if( getInstrPtr(s->def,0)->token == FACTORYsymbol)
- shutdownFactoryByName(c->nspace, nme);
+ shutdownFactoryByName(c,c->nspace, nme);
else
deleteSymbol(c->nspace,s);
return MAL_SUCCEED;
U sql_optimizer.mx
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- sql_optimizer.mx 31 Jul 2008 09:41:22 -0000 1.189
+++ sql_optimizer.mx 7 Aug 2008 09:05:34 -0000 1.190
@@ -457,13 +457,13 @@
"accessmode,"
"aliases,"
/* "crack," */
-/* "joinPath," */
+ /*"joinPath,"*/
"mergetable,"
"commonTerms,"
/* "replicator," */
"accumulators,"
"deadcode,"
-/* "recycle," */
+ /*"recycle,"*/
"reduce,"
"garbageCollector,"
"dataflow,"
U sql.mx
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- sql.mx 28 Jul 2008 13:23:13 -0000 1.273
+++ sql.mx 7 Aug 2008 09:05:32 -0000 1.274
@@ -1929,7 +1929,8 @@
return msg;
if (ATOMextern(mtype))
p = *(ptr*)p;
- if (mvc_export_value(c, b->out, *qtype, *tn, *cn, *type, *digits,
*scale, *eclass, p, mtype, *w, "NULL") != SQL_OK)
+ if (b->out == NULL ||
+ mvc_export_value(c, b->out, *qtype, *tn, *cn, *type, *digits,
*scale, *eclass, p, mtype, *w, "NULL") != SQL_OK)
throw(SQL, "sql.exportValue", "failed");
return MAL_SUCCEED;
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
