Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24533/src/mal

Modified Files:
        mal_recycle.mx 
Log Message:
removed subsumption on uselects (if done it needs a semijoin)


Index: mal_recycle.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_recycle.mx,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- mal_recycle.mx      12 Mar 2008 08:19:52 -0000      1.37
+++ mal_recycle.mx      12 Mar 2008 08:53:58 -0000      1.38
@@ -292,6 +292,7 @@
                        recycleVersion++;
                        mal_unset_lock(recycleLock,"recycle");
                }
+               /* TODO when we evict one we should evict all depending on it, 
etc */
        }
 }
 
@@ -410,11 +411,9 @@
        int i, j, nbid, bid= -1 , ridx, idx,pc = -1;
        InstrPtr q;
        static str selectRef;
-       static str uselectRef;
        
        (void) mb;
        if( selectRef == 0) selectRef= getName("select",6);
-       if( uselectRef == 0) uselectRef= getName("uselect",7);
 #ifdef _DEBUG_RECYCLE_
                stream_printf(GDKout,"RECYCLEreuse policy %d  recycleBlk %d\n",
                        reusePolicy, recycleBlk==0);
@@ -438,8 +437,7 @@
                        ridx= getArg(q,1);
                        idx= getArg(p,1);
                        if (q->argc == p->argc &&
-                          (getFunctionId(p) == selectRef || 
-                           getFunctionId(p) == uselectRef)   &&
+                           getFunctionId(p) == selectRef   &&
                            getVarConstant(recycleBlk, ridx).val.bval == 
s->stk[idx].val.bval)
                        {       
 @-


-------------------------------------------------------------------------
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

Reply via email to