MonetDB: default - Use proper test for heartbeat

[mk]

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

Use proper test for heartbeat


diffs (34 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
@@ -407,7 +407,7 @@
 {
        str tbl;
        int bskt, i, *ret;
-       BAT *b,*bn,*v;
+       BAT *b,*bn = 0,*v;
 
        (void) cntxt;
        (void) mb;
@@ -446,7 +446,7 @@
        }
        mal_unset_lock(baskets[bskt].lock, "unlock basket");
        if ( i != baskets[bskt].colcount) {
-               BBPunfix( bn->batCacheid);
+               if( bn) BBPunfix( bn->batCacheid);
                throw(MAL,"basket.grab","too early");
        }
        return MAL_SUCCEED;
@@ -576,11 +576,9 @@
                throw(MAL,"basket.beat","Basket not found");
        if ( *sz < 0)
                throw(MAL,"basket.beat","Illegal value");
-       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() )
+       if ( baskets[bskt].beat + baskets[bskt].lastseen > GDKusec() )
                throw(MAL,"basket.heat","too early");
        return MAL_SUCCEED;
 }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list