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

Modified Files:
        opt_joinpath.mx 
Log Message:
make sure we make also intermediate results readonly


Index: opt_joinpath.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_joinpath.mx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- opt_joinpath.mx     28 Feb 2008 07:40:20 -0000      1.25
+++ opt_joinpath.mx     28 Feb 2008 10:14:44 -0000      1.26
@@ -325,6 +325,7 @@
                assert(b);
                BBPdecref(joins[j]->batCacheid, FALSE);
                BBPdecref(joins[j+1]->batCacheid, FALSE);
+               if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
                joins[j] = b;
                top--;
                for (i = j + 1; i < top; i++)
@@ -336,6 +337,7 @@
        b = BATjoin(joins[0], joins[1], oid_nil);
        BBPdecref(joins[0]->batCacheid, FALSE);
        BBPdecref(joins[1]->batCacheid, FALSE);
+        if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
        assert(b);
        return b;
 }
@@ -364,7 +366,6 @@
                joins[top++] = b;
        }
        b= ALGjoinPathBody(top,joins);
-        if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
        BBPkeepref(b->batCacheid);
        *(int *) getArgReference(stk, pci, 0) = b->batCacheid;
        return MAL_SUCCEED;


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