Update of /cvsroot/monetdb/MonetDB5/src/optimizer
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14381/src/optimizer
Modified Files:
opt_macro.mx opt_support.mx
Log Message:
added batstr.replace
fixed hassideeffects: str.replace isn't unsafe (only bat.replace is)
some indent/space fixes
Index: opt_macro.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_macro.mx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- opt_macro.mx 27 Dec 2007 13:23:22 -0000 1.26
+++ opt_macro.mx 27 Dec 2007 17:27:08 -0000 1.27
@@ -252,7 +252,7 @@
else
if (mc->var[n]->isaconstant ){
nv[n] = cpyConstant(mb,getVar(mc,n));
- } else{
+ } else {
nv[n] = newTmpVariable(mb, getVarType(mc, n));
getVar(mb,nv[n])->isudftype= getVar(mc,n)->isudftype;
getVar(mb,nv[n])->isused= getVar(mc,n)->isused;
@@ -286,7 +286,6 @@
q= pushNil(mb, q, getArgType(mb, p, n));
}
- /* copying stops at the first return statement */
for (i = 1; i < mc->stop - 1; i++) {
q = mc->stmt[i];
if( q->token == ENDsymbol)
@@ -305,6 +304,7 @@
}
k++;
}
+
/* copy the remainder of the stable part */
for (i = pc + 1; i < mb->stop; i++){
ns[k++] = mb->stmt[i];
Index: opt_support.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_support.mx,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- opt_support.mx 26 Dec 2007 14:31:12 -0000 1.53
+++ opt_support.mx 27 Dec 2007 17:27:09 -0000 1.54
@@ -1088,16 +1088,18 @@
{
if( getFunctionId(p) == NULL) return FALSE;
- if (getFunctionId(p) == depositRef ||
- getFunctionId(p) == insertRef ||
+ if ( getModuleId(p) == batRef &&
+ (getFunctionId(p) == insertRef ||
getFunctionId(p) == inplaceRef ||
getFunctionId(p) == appendRef ||
getFunctionId(p) == updateRef ||
- getFunctionId(p) == sortTailRef ||
getFunctionId(p) == setAccessRef ||
getFunctionId(p) == setWriteModeRef ||
getFunctionId(p) == replaceRef ||
- getFunctionId(p) == deleteRef)
+ getFunctionId(p) == deleteRef))
+ return TRUE;
+
+ if (getFunctionId(p) == depositRef)
return TRUE;
if( getModuleId(p) == ioRef ||
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
