MonetDB: Feb2013 - Minor fixes to datacell

[Martin Kersten]

Changeset: 3c7cd692a229 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c7cd692a229
Modified Files:
        sql/backends/monet5/datacell/Tests/scenario01.sql
        sql/backends/monet5/datacell/Tests/scenario02.sql
        sql/backends/monet5/datacell/datacell.c
Branch: Feb2013
Log Message:

Minor fixes to datacell


diffs (51 lines):

diff --git a/sql/backends/monet5/datacell/Tests/scenario01.sql 
b/sql/backends/monet5/datacell/Tests/scenario01.sql
--- a/sql/backends/monet5/datacell/Tests/scenario01.sql
+++ b/sql/backends/monet5/datacell/Tests/scenario01.sql
@@ -21,3 +21,4 @@ select * from datacell.receptors(); sele
 drop table datacell.bsktin;
 drop table datacell.bsktout;
 
+-- sensor --host=localhost --port=50500 --events=100 --columns=3 --delay=1 
--protocol=udp
diff --git a/sql/backends/monet5/datacell/Tests/scenario02.sql 
b/sql/backends/monet5/datacell/Tests/scenario02.sql
--- a/sql/backends/monet5/datacell/Tests/scenario02.sql
+++ b/sql/backends/monet5/datacell/Tests/scenario02.sql
@@ -16,8 +16,9 @@ call datacell.receptor('datacell.potin',
 call datacell.emitter('datacell.potout','localhost',50602);
 
 call datacell.query('datacell.putter', 'insert into datacell.potout select 
now(), count(*) from datacell.potin;');
-call datacell.pause('potout'); -- hold the events
+call datacell.pause('datacell.potout'); -- hold up the events
 
+select * from datacell.receptors(); select * from datacell.emitters(); select 
* from datacell.queries(); select * from datacell.baskets();
 call datacell.resume();
 select * from datacell.receptors(); select * from datacell.emitters(); select 
* from datacell.queries(); select * from datacell.baskets();
 
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
@@ -233,6 +233,7 @@ DCpauseObject(Client cntxt, MalBlkPtr mb
 {
        int idx, ret = 0;
        str tbl = *(str *) getArgReference(stk, pci, 1);
+       str msg1= MAL_SUCCEED, msg2 = MAL_SUCCEED;
 
        if ( strcmp(tbl,"*")== 0){
                str msg = RCpause(&ret);
@@ -243,8 +244,15 @@ DCpauseObject(Client cntxt, MalBlkPtr mb
        }
        idx = BSKTlocate(tbl);
        if (idx ) {
-               RCreceptorPause(&ret, &tbl);
-               EMemitterPause(&ret, &tbl);
+               msg1 = RCreceptorPause(&ret, &tbl);
+               if ( msg1 == MAL_SUCCEED)
+                       return msg1;
+               msg2 = EMemitterPause(&ret, &tbl);
+               if ( msg2 == MAL_SUCCEED ){
+                       GDKfree(msg1);
+                       return MAL_SUCCEED;
+               }
+               return msg2;
        }
        return PNpauseQuery(cntxt,mb,stk,pci);
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list