MonetDB: default - Fix typo in comparion and updated test descri...

[Martin Kersten]

Changeset: e9fa51af8254 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9fa51af8254
Modified Files:
        monetdb5/mal/Tests/recycle01.mal
        monetdb5/mal/mal_recycle.c
Branch: default
Log Message:

Fix typo in comparion and updated test description


diffs (49 lines):

diff --git a/monetdb5/mal/Tests/recycle01.mal b/monetdb5/mal/Tests/recycle01.mal
--- a/monetdb5/mal/Tests/recycle01.mal
+++ b/monetdb5/mal/Tests/recycle01.mal
@@ -12,7 +12,6 @@ barrier i:= 0:oid;
     bat.append(b,i);
     redo i:= iterator.next(1:oid,11:oid);
 exit i;
-       io.print(tid);
     return tid:= b;
 end tid;
 
@@ -30,7 +29,6 @@ function sql.bind(mvc:int, s:str,t:str,c
        bat.insert(b,9@0,9);
        bat.insert(b,10@0,10);
        bat.insert(b,11@0,11);
-       io.print(b);
        return bind:=b;
 end bind;
 
diff --git a/monetdb5/mal/mal_recycle.c b/monetdb5/mal/mal_recycle.c
--- a/monetdb5/mal/mal_recycle.c
+++ b/monetdb5/mal/mal_recycle.c
@@ -1221,7 +1221,7 @@ RECYCLEdataTransfer(Client cntxt, MalStk
 static int
 RECYCLEreuse(Client cntxt, MalBlkPtr mb, MalStkPtr s, InstrPtr p, int pci)
 {
-    int i, j, ridx, idx, evicted=0, pc=0;
+    int i, j, ridx, idx, evicted=0, pc= -1;
        //int qidx;
     bat bid= -1, nbid= -1;
     InstrPtr q;
@@ -1380,7 +1380,7 @@ RECYCLEreuse(Client cntxt, MalBlkPtr mb,
 #endif
 
     MT_lock_unset(&recycleLock, "recycle");
-       if ( pc == 0 )          /* successful multi-subsumption */
+       if ( pc >= 0 )          /* successful multi-subsumption */
                RECYCLEexit(cntxt,mb,s,p, pci,ticks);
     return pc;
 }
@@ -1402,7 +1402,7 @@ RECYCLEentry(Client cntxt, MalBlkPtr mb,
                return 0;
        i = RECYCLEreuse(cntxt,mb,stk,p,pc) >= 0;
 #ifdef _DEBUG_RECYCLE_
-       if ( i > 0) {
+       if ( i ){
                mnstr_printf(cntxt->fdout,"#REUSE   [%3d]   ",i);
                printInstruction(cntxt->fdout,mb,0,p, LIST_MAL_STMT);
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list