Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17711/src/backends/monet5
Modified Files:
sql_optimizer.mx sql_scenario.mx
Log Message:
small indenting changes
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- sql_scenario.mx 21 Dec 2007 17:02:23 -0000 1.288
+++ sql_scenario.mx 30 Dec 2007 18:24:36 -0000 1.289
@@ -499,15 +499,15 @@
int i;
for (i = start; i < mb->vtop;) {
- clearVariable(mb, i);
-
if (glb) {
- garbageElement(&glb->stk[i]);
+ if (isVarGarbage(mb,i))
+ garbageElement(&glb->stk[i]);
/* clean stack entry */
glb->stk[i].vtype = TYPE_int;
glb->stk[i].val.ival = 0;
glb->stk[i].len = 0;
}
+ clearVariable(mb, i);
i++;
}
mb->vtop = start;
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- sql_optimizer.mx 25 Dec 2007 21:34:31 -0000 1.168
+++ sql_optimizer.mx 30 Dec 2007 18:24:36 -0000 1.169
@@ -493,11 +493,10 @@
}
/* add the optimizers to the query plan */
- for (i=0;i<top; i++) {
+ for (i=0; i<top; i++) {
InstrPtr p = newFcnCall(mb, "optimizer", optimizers[i]);
+
typeChecker(c->nspace, mb, p, TRUE);
- /* niels added else leaks */
- //pushInstruction(mb, p);
}
if (oldbase)
GDKfree(oldbase);
@@ -514,7 +513,7 @@
insertSymbol(c->nspace, c->curprg);
trimMalBlk(c->curprg->def);
c->blkmode = 0;
- mb= c->curprg->def;
+ mb = c->curprg->def;
chkProgram(c->nspace, mb);
#ifdef _SQL_OPTIMIZER_DEBUG
printf("ADD QUERY TO CACHE\n");
@@ -537,8 +536,8 @@
return;
}
optimizer = stack_get_string(be->mvc, "optimizer");
- if( optimizer == 0 )
- optimizer= defaultPlan? defaultPlan:minimalPlan;
+ if (optimizer == 0)
+ optimizer = defaultPlan? defaultPlan:minimalPlan;
#ifdef _SQL_OPTIMIZER_DEBUG
if( optimizer)
stream_printf(c->fdout,"optimizer:%s:\n",optimizer?optimizer:"unknown");
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
