MonetDB: default - Get window query working

[mk]

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

Get window query working
The first exception of a continuous query is retained for analysis.
We better set the access modes when updating a BAT.
Use long numbers to collect a sum.


diffs (41 lines):

diff --git a/sql/backends/monet5/datacell/Tests/scenario04.sql 
b/sql/backends/monet5/datacell/Tests/scenario04.sql
--- a/sql/backends/monet5/datacell/Tests/scenario04.sql
+++ b/sql/backends/monet5/datacell/Tests/scenario04.sql
@@ -11,7 +11,7 @@
     tag timestamp,
     payload integer
 );
-create table datacell.winout( tag timestamp, mi integer, ma integer, su 
integer);
+create table datacell.winout( tag timestamp, mi integer, ma integer, su 
bigint);
 
 call datacell.receptor('datacell.winin','localhost',50500);
 
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
@@ -423,6 +423,7 @@
                        bn = BATcopy(b, b->htype, b->ttype,TRUE);
                        v = BATslice(bn, baskets[bskt].winslide,BATcount(bn));
                        BATclear(b);
+                       b = BATsetaccess(b, BAT_WRITE);
                        BATins(b,v, FALSE);
                        BATsetcount(bn, baskets[bskt].winsize);
                        BBPunfix(v->batCacheid);
diff --git a/sql/backends/monet5/datacell/petrinet.mx 
b/sql/backends/monet5/datacell/petrinet.mx
--- a/sql/backends/monet5/datacell/petrinet.mx
+++ b/sql/backends/monet5/datacell/petrinet.mx
@@ -573,10 +573,10 @@
                                pnet[i].cycletime += GDKusec() - t;
                                if ( msg != MAL_SUCCEED){
                                        char buf[BUFSIZ];
-                                       if ( pnet[i].error )
-                                               GDKfree(pnet[i].error);
-                                       snprintf(buf,BUFSIZ-1,"Function: %s 
failed:%s", pnet[i].fcn, msg);
-                                       pnet[i].error = GDKstrdup(buf);
+                                       if ( pnet[i].error == NULL ) {
+                                               snprintf(buf,BUFSIZ-1,"Query %s 
failed:%s", pnet[i].fcn, msg);
+                                               pnet[i].error = GDKstrdup(buf);
+                                       } else GDKfree(msg);
                                        pnet[i].enabled = -1;
                                } else {
                                        pnet[i].cycles++;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list