MonetDB: default - Minor interface changes

[Martin Kersten]

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

Minor interface changes
The timers are now in lng


diffs (80 lines):

diff --git a/sql/backends/monet5/datacell/datacell.c 
b/sql/backends/monet5/datacell/datacell.c
--- a/sql/backends/monet5/datacell/datacell.c
+++ b/sql/backends/monet5/datacell/datacell.c
@@ -33,6 +33,7 @@
 #include "winsock2.h"
 #endif
 
+MT_Lock dcLock;
 /*
  * The scheduler works against a converted datacell schema.
  * It should be stopped before additions to the scheme will take effect
@@ -82,6 +83,7 @@ DCprelude(Client cntxt, MalBlkPtr mb, Ma
        (void) mb;
        (void) stk;
        (void) pci;
+       MT_lock_init( &dcLock, "datacellLock");
        addPipeDefinition(cntxt, "datacell_pipe",
                
"optimizer.inline();optimizer.remap();optimizer.datacell();optimizer.garbageCollector();"
                
"optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();"
@@ -435,19 +437,19 @@ DCthreshold(int *ret, str *bskt, int *mi
 }
 
 str
-DCwindow(int *ret, str *bskt, int *sz, int *slide)
+DCwindow(int *ret, str *bskt, lng *sz, lng *slide)
 {
        return BSKTwindow(ret, bskt, sz, slide);
 }
 
 str
-DCtimewindow(int *ret, str *bskt, int *sz, int *slide)
+DCtimewindow(int *ret, str *bskt, lng *sz, lng *slide)
 {
        return BSKTtimewindow(ret, bskt, sz, slide);
 }
 
 str
-DCbeat(int *ret, str *bskt, int *beat)
+DCbeat(int *ret, str *bskt, lng *beat)
 {
        return BSKTbeat(ret, bskt, beat);
 }
diff --git a/sql/backends/monet5/datacell/datacell.h 
b/sql/backends/monet5/datacell/datacell.h
--- a/sql/backends/monet5/datacell/datacell.h
+++ b/sql/backends/monet5/datacell/datacell.h
@@ -53,9 +53,9 @@ datacell_export str DCstopObject(Client 
 datacell_export str DCquery(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 datacell_export str DCdump(int *ret);
 datacell_export str DCthreshold(int *ret, str *bskt, int *mi);
-datacell_export str DCwindow(int *ret, str *bskt, int *sz, int *slide);
-datacell_export str DCtimewindow(int *ret, str *bskt, int *sz, int *slide);
-datacell_export str DCbeat(int *ret, str *bskt, int *t);
+datacell_export str DCwindow(int *ret, str *bskt, lng *sz, lng *slide);
+datacell_export str DCtimewindow(int *ret, str *bskt, lng *sz, lng *slide);
+datacell_export str DCbeat(int *ret, str *bskt, lng *t);
 
 datacell_export str DCpauseScheduler(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
 datacell_export str DCresumeScheduler(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
diff --git a/sql/backends/monet5/datacell/datacell.mal 
b/sql/backends/monet5/datacell/datacell.mal
--- a/sql/backends/monet5/datacell/datacell.mal
+++ b/sql/backends/monet5/datacell/datacell.mal
@@ -89,15 +89,15 @@ command threshold{unsafe}(bskt:str, mi:i
 address DCthreshold
 comment "Prefilter on bucket content";
 
-command window{unsafe}(bskt:str, size:int, slide:int):bit
+command window{unsafe}(bskt:str, size:lng, slide:lng):bit
 address DCwindow
 comment "Slide the basket with a limited number of events";
 
-command timewindow{unsafe}(bskt:str, N:int, S:int):bit
+command timewindow{unsafe}(bskt:str, N:lng, S:lng):bit
 address DCtimewindow
 comment "Slide the basket with a time window of N milliseconds with stride S 
milliseconds";
 
-command beat(bskt:str, t:int):bit
+command beat(bskt:str, t:lng):bit
 address DCbeat
 comment "Schedule query with T milliseconds interval";
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list