MonetDB: default - Use lowecase and protect against non-initiali...

[Martin Kersten]

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

Use lowecase and protect against non-initialized vars


diffs (74 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
@@ -119,6 +119,7 @@ BSKTlocate(str tbl)
                        return i;
        /* try prefixing it with datacell */
        snprintf(buf,BUFSIZ,"datacell.%s",tbl);
+       BSKTtolower(buf);
        for (i = 1; i < bsktTop; i++)
                if (baskets[i].name && strcmp(buf, baskets[i].name) == 0)
                        return i;
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
@@ -66,6 +66,7 @@ EMfind(str nme)
                if (strcmp(nme, r->name) == 0)
                        return r;
        snprintf(buf,BUFSIZ,"datacell.%s",nme);
+       BSKTtolower(buf);
        for (r = emAnchor; r; r = r->nxt)
                if (strcmp(buf, r->name) == 0)
                        return r;
@@ -493,7 +494,8 @@ EMtable(int *nameId, int *hostId, int *p
                goto wrapup;
        BATseqbase(status, 0);
 
-       for (; em; em = em->nxt){
+       for (; em; em = em->nxt)
+       if ( em->table.format[1].c[0]){
                BUNappend(name, em->name, FALSE);
                BUNappend(host, em->host, FALSE);
                BUNappend(port, &em->port, FALSE);
diff --git a/sql/backends/monet5/datacell/receptor.c 
b/sql/backends/monet5/datacell/receptor.c
--- a/sql/backends/monet5/datacell/receptor.c
+++ b/sql/backends/monet5/datacell/receptor.c
@@ -82,6 +82,7 @@ RCfind(str nme)
                if (strcmp(nme, r->name) == 0)
                        return r;
        snprintf(buf,BUFSIZ,"datacell.%s",nme);
+       BSKTtolower(buf);
        for (r = rcAnchor; r; r = r->nxt)
                if (strcmp(buf, r->name) == 0)
                        return r;
@@ -103,6 +104,9 @@ RCreceptorStartInternal(int *ret, str *t
 
        if (RCfind(*tbl))
                throw(MAL, "receptor.new", "Duplicate receptor");
+       idx = BSKTlocate(*tbl);
+       if (idx == 0) /* should not happen */
+               throw(MAL, "receptor.new", "Basket '%s' not found",*tbl);
        for (rc = rcAnchor; rc; rc = rc->nxt)
                if (rc->port == *port)
                        throw(MAL, "receptor.new", "Port already in use");
@@ -124,9 +128,7 @@ RCreceptorStartInternal(int *ret, str *t
        rc->protocol = protocol;
        rc->lastseen = *timestamp_nil;
 
-       rc->bskt = idx = BSKTlocate(*tbl);
-       if (idx == 0) /* should not happen */
-               throw(MAL, "receptor.new", "Basket not found");
+       rc->bskt = idx;
        len = BSKTmemberCount(*tbl);
        fmt = rc->table.format = GDKzalloc(sizeof(Column) * len);
 
@@ -744,7 +746,8 @@ RCtable(int *nameId, int *hostId, int *p
                goto wrapup;
        BATseqbase(status, 0);
 
-       for (; rc; rc = rc->nxt){
+       for (; rc; rc = rc->nxt)
+       if ( rc->table.format[1].c[0]){
                BUNappend(name, rc->name, FALSE);
                BUNappend(host, rc->host, FALSE);
                BUNappend(port, &rc->port, FALSE);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list