Changeset: 25fed45ce57d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25fed45ce57d
Modified Files:
        monetdb5/optimizer/opt_recycler.c
Branch: DVframework
Log Message:

dvf-recycler: mount statements are reused also with update statements.


diffs (40 lines):

diff --git a/monetdb5/optimizer/opt_recycler.c 
b/monetdb5/optimizer/opt_recycler.c
--- a/monetdb5/optimizer/opt_recycler.c
+++ b/monetdb5/optimizer/opt_recycler.c
@@ -177,6 +177,18 @@ OPTrecyclerImplementation(Client cntxt, 
                        continue;
                }
 
+               if (getFunctionId(p) == mountRef) {
+                       recycled[getArg(p, 0)] = 1;
+                       p->recycle = recycleMaxInterest;
+                       marks++;
+                       
+                       if(!preluded) {
+                               /* create a handle for recycler */
+                               (void) newFcnCall(mb, "recycle", "prelude");
+                               preluded = 1;
+                       }
+               }
+               
                /* don't change instructions in update statements */
                if (updstmt) {
                        pushInstruction(mb, p);
@@ -196,17 +208,6 @@ OPTrecyclerImplementation(Client cntxt, 
 //                     marks++;
 //             }
                
-               if (getFunctionId(p) == mountRef) {
-                       recycled[getArg(p, 0)] = 1;
-                       p->recycle = recycleMaxInterest;
-                       marks++;
-                       
-                       if(!preluded) {
-                               /* create a handle for recycler */
-                               (void) newFcnCall(mb, "recycle", "prelude");
-                               preluded = 1;
-                       }
-               }
                /* During base table recycling skip marking instructions other 
than octopus.bind */
                if (baseTableMode) {
                        pushInstruction(mb, p);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to