Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14756
Modified Files:
mal_recycle.mx
Log Message:
disable recycling as we need to fix/handle updates first
Index: mal_recycle.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_recycle.mx,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- mal_recycle.mx 17 Mar 2008 15:26:02 -0000 1.58
+++ mal_recycle.mx 17 Mar 2008 21:38:02 -0000 1.59
@@ -160,7 +160,7 @@
RETAIN_COVER exploits potentional overlap in range selects
to reduce the amount of scanning.
@c
-int reusePolicy = REUSE_COVER; /* recycle reuse policy
+int reusePolicy = REUSE_NONE; /* recycle reuse policy
REUSE_NONE: baseline, keeps stat, no retain, no reuse
REUSE_COVER: reuse smallest select covering
REUSE_EXACT: exact covering */
@@ -480,7 +480,8 @@
for (i = 0; i < recycleBlk->stop; i++){
q = getInstrPtr(recycleBlk,i);
- if ((p->argc != q->argc) ||
+
+ if ((p->argc > q->argc) ||
(getFunctionId(p) != getFunctionId(q)) ||
(getModuleId(p) != getModuleId(q)))
continue;
@@ -493,7 +494,7 @@
/* 1: reuse smallest range covering */
ridx= getArg(q,1);
idx= getArg(p,1);
- if ( q->argc > 3 &&
+ if (q->argc > 3 && q->argc <= 4 && p->argc <= 4 &&
getFunctionId(p) == selectRef &&
getVarConstant(recycleBlk, ridx).val.bval ==
s->stk[idx].val.bval &&
BATatoms[getArgType(recycleBlk,q,2)].linear )
@@ -546,7 +547,7 @@
case REUSE_EXACT:
/* 2: exact covering */
for (j = p->retc; j < p->argc; j++)
- if ( VALcmp(&s->stk[getArg(p,j)],
&getVarConstant(recycleBlk,getArg(q,j))))
+ if (VALcmp(&s->stk[getArg(p,j)],
&getVarConstant(recycleBlk,getArg(q,j))))
goto notfound;
/* found an exact match */
-------------------------------------------------------------------------
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
