Update of /cvsroot/monetdb/MonetDB5/src/optimizer
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18280
Modified Files:
opt_commonTerms.mx opt_support.mx
Log Message:
Declare algebra.reuse as having side-effects, because it leads to an alias
to bats, which may screwup subsequent optimizers.
Index: opt_commonTerms.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_commonTerms.mx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- opt_commonTerms.mx 1 Feb 2008 19:36:34 -0000 1.27
+++ opt_commonTerms.mx 2 Feb 2008 09:08:03 -0000 1.28
@@ -235,10 +235,12 @@
getBeginLifespan(span,getArg(p,0)) == i &&
getLastUpdate(span,getArg(p,1))
< i){
alias[getArg(p,0)]=
alias[getArg(p,1)];
+/*
freeInstruction(p);
mb->stop--;
mb->stmt[mb->stop]=0;
n--;
+*/
}
j= 0; /* end of search */
}
Index: opt_support.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_support.mx,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- opt_support.mx 27 Jan 2008 09:48:23 -0000 1.57
+++ opt_support.mx 2 Feb 2008 09:08:03 -0000 1.58
@@ -1080,6 +1080,9 @@
{
if( getFunctionId(p) == NULL) return FALSE;
+ if ( getModuleId(p) == algebraRef &&
+ getFunctionId(p) == reuseRef)
+ return TRUE;
if ( getModuleId(p) == batRef &&
(getFunctionId(p) == insertRef ||
getFunctionId(p) == inplaceRef ||
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
