MonetDB: default - Simplify first scenario and minor changes format

[Martin Kersten]

Changeset: e99e08ae84d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e99e08ae84d1
Modified Files:
        sql/backends/monet5/datacell/Tests/scenario00.sql
        sql/backends/monet5/datacell/actuator.c
        sql/backends/monet5/datacell/emitter.c
Branch: default
Log Message:

Simplify first scenario and minor changes format
The output of the emitter is still wrong. It cuts each field to one character.


diffs (64 lines):

diff --git a/sql/backends/monet5/datacell/Tests/scenario00.sql 
b/sql/backends/monet5/datacell/Tests/scenario00.sql
--- a/sql/backends/monet5/datacell/Tests/scenario00.sql
+++ b/sql/backends/monet5/datacell/Tests/scenario00.sql
@@ -7,7 +7,7 @@ set optimizer='datacell_pipe';
 
 create table datacell.bsktin(
     id integer,
-    tag timestamp,
+    tag integer,
     payload integer
 );
 create table datacell.bsktout (like datacell.bsktin);
@@ -22,7 +22,7 @@ call datacell.resume();
 call datacell.dump();
 
 -- externally, activate the sensor 
---sensor --host=localhost --port=50500 --events=100 --columns=3 --delay=1
+--sensor --host=localhost --port=50500 --events=100 --columns=3 --delay=1 
--trace
 -- externally, activate the actuator server to listen
 -- actuator 
 
diff --git a/sql/backends/monet5/datacell/actuator.c 
b/sql/backends/monet5/datacell/actuator.c
--- a/sql/backends/monet5/datacell/actuator.c
+++ b/sql/backends/monet5/datacell/actuator.c
@@ -335,6 +335,10 @@ main(int argc, char **argv)
        err = NULL;
        if ( mode == PASSIVE) {
                ac->fromServer = udp_rastream(host, port, actuator);
+               if ( ac->fromServer == 0){
+                       mnstr_printf(ACout, "Failed to access stream 
%s:%d\n",host,port);
+                       return 0;
+               }
                consumeStream(ac);
 #ifdef _DEBUG_ACTUATOR_
                        mnstr_printf(ACout, "stream consumed\n");
diff --git a/sql/backends/monet5/datacell/emitter.c 
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -171,19 +171,19 @@ str DCemitterNew(int *ret, str *tbl, str
                }
 
                em->table.format[j].c[0] = BATcopy(b,b->htype, b->ttype,FALSE);;
-               em->table.format[j].ci[0] = bat_iterator(b);
+               em->table.format[j].ci[0] = 
bat_iterator(em->table.format[j].c[0]);
                em->table.format[j].name = GDKstrdup(baskets[idx].cols[i]);
                em->table.format[j].sep = GDKstrdup(",");
                em->table.format[j].seplen = 
(int)strlen(em->table.format[j].sep);
-               em->table.format[j].type = ATOMname(b->ttype);
-               em->table.format[j].adt = (b)->ttype;
+               em->table.format[j].type = 
GDKstrdup(ATOMname(em->table.format[j].c[0]->ttype));
+               em->table.format[j].adt = em->table.format[j].c[0]->ttype;
                em->table.format[j].nullstr = GDKstrdup("");
                em->table.format[j].tostr = &TABLETadt_toStr;
                em->table.format[j].frstr = &TABLETadt_frStr;
                em->table.format[j].extra = em->table.format + j;
-               em->table.format[j].len = em->table.format[j].nillen =
-                                                                         
ATOMlen(em->table.format[j].adt, ATOMnilptr(em->table.format[j].adt));
-               em->table.format[j].data = GDKmalloc(em->table.format[j].len);
+               em->table.format[j].len = 0;
+               em->table.format[j].nillen = 0;
+               em->table.format[j].data = NULL;
                j++;
        }
        GDKfree(em->table.format[j-1].sep);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list