MonetDB: default - Avoid endless loops

[mk]

Changeset: 9461f8cf2f75 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9461f8cf2f75
Modified Files:
        sql/backends/monet5/datacell/basket.mx
Branch: default
Log Message:

Avoid endless loops


diffs (26 lines):

diff --git a/sql/backends/monet5/datacell/basket.mx 
b/sql/backends/monet5/datacell/basket.mx
--- a/sql/backends/monet5/datacell/basket.mx
+++ b/sql/backends/monet5/datacell/basket.mx
@@ -445,8 +445,10 @@
                BBPkeepref(*ret);
        }
        mal_unset_lock(baskets[bskt].lock, "unlock basket");
-       if ( i != baskets[bskt].colcount)
+       if ( i != baskets[bskt].colcount) {
+               BBPunfix( bn->batCacheid);
                throw(MAL,"basket.grab","too early");
+       }
        return MAL_SUCCEED;
 }
 
@@ -577,9 +579,9 @@
        if ( *sz < baskets[bskt].winsize)
                throw(MAL,"basket.threshold","Threshold smaller then window 
size");
        baskets[bskt].beat = *sz;
+       *ret = TRUE;
        if ( baskets[bskt].beat + baskets[bskt].lastseen < GDKusec() )
                throw(MAL,"basket.heat","too early");
-       *ret = TRUE;
        return MAL_SUCCEED;
 }
 @}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list