MonetDB: default - Force emptying the baskets

[Martin Kersten]

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

Force emptying the baskets


diffs (83 lines):

diff --git a/sql/backends/monet5/datacell/basket.c 
b/sql/backends/monet5/datacell/basket.c
--- a/sql/backends/monet5/datacell/basket.c
+++ b/sql/backends/monet5/datacell/basket.c
@@ -365,7 +365,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
                        /* clean out basket */
                        bn = BATjoin(BATmirror(bs), b, BUN_NONE);
                        b = BATsetaccess(b, BAT_WRITE);
-                       BATclear(b, FALSE);
+                       BATclear(b, TRUE);
                        BATins(b, bn, FALSE);
                        cnt = (int) BATcount(bn);
                        BBPreleaseref(bn->batCacheid);
@@ -390,7 +390,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
                        bn = BATcopy(b, b->htype, b->ttype, TRUE);
                        v = BATslice(bn, baskets[bskt].winstride, BATcount(bn));
                        b = BATsetaccess(b, BAT_WRITE);
-                       BATclear(b, FALSE);
+                       BATclear(b, TRUE);
                        BATins(b, v, FALSE);
                        BATsetcount(bn, baskets[bskt].winsize);
                        cnt = (int) BATcount(bn);
@@ -407,7 +407,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
                        b = baskets[bskt].primary[i];
                        bn = BATcopy(b, b->htype, b->ttype, TRUE);
                        cnt = (int) BATcount(b);
-                       BATclear(b, FALSE);
+                       BATclear(b, TRUE);
                        *ret = bn->batCacheid;
                        BBPkeepref(*ret);
                }
@@ -512,7 +512,7 @@ BSKTthreshold(int *ret, str *tbl, int *s
 }
 
 str
-BSKTwindow(int *ret, str *tbl, int *sz, int *stride)
+BSKTwindow(int *ret, str *tbl, lng *sz, lng *stride)
 {
        int idx;
 
@@ -536,7 +536,7 @@ BSKTwindow(int *ret, str *tbl, int *sz, 
 }
 
 str
-BSKTtimewindow(int *ret, str *tbl, int *sz, int *stride)
+BSKTtimewindow(int *ret, str *tbl, lng *sz, lng *stride)
 {
        int idx;
 
@@ -558,7 +558,7 @@ BSKTtimewindow(int *ret, str *tbl, int *
 }
 
 str
-BSKTbeat(int *ret, str *tbl, int *sz)
+BSKTbeat(int *ret, str *tbl, lng *sz)
 {
        int bskt, tst;
        timestamp ts, tn;
diff --git a/sql/backends/monet5/datacell/basket.h 
b/sql/backends/monet5/datacell/basket.h
--- a/sql/backends/monet5/datacell/basket.h
+++ b/sql/backends/monet5/datacell/basket.h
@@ -78,6 +78,9 @@ datacell_export str modename[3];
 #define UDP 2
 #define CSV 3
 
+
+mal_export MT_Lock  dcLock ;
+
 datacell_export str protocolname[4];
 
 datacell_export str schema_default;
@@ -92,9 +95,9 @@ datacell_export str BSKTdump(int *ret);
 datacell_export str BSKTgrab(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 datacell_export str BSKTupdate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 datacell_export str BSKTthreshold(int *ret, str *tbl, int *sz);
-datacell_export str BSKTbeat(int *ret, str *tbl, int *sz);
-datacell_export str BSKTwindow(int *ret, str *tbl, int *sz, int *slide);
-datacell_export str BSKTtimewindow(int *ret, str *tbl, int *sz, int *slide);
+datacell_export str BSKTbeat(int *ret, str *tbl, lng *sz);
+datacell_export str BSKTwindow(int *ret, str *tbl, lng *sz, lng *slide);
+datacell_export str BSKTtimewindow(int *ret, str *tbl, lng *sz, lng *slide);
 datacell_export str BSKTtable(int *nameId, int *thresholdId, int * winsizeId, 
int *winstrideId,int *timesliceId, int *timestrideId, int *beatId, int *seenId, 
int *eventsId);
 datacell_export str BSKTtableerrors(int *nmeId, int *errorId);
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list