MonetDB: default - Capture error messages and pass them onward.

[Martin Kersten]

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

Capture error messages and pass them onward.


diffs (53 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
@@ -192,7 +192,7 @@ BSKTregister(Client cntxt, MalBlkPtr mb,
 
        t = mvc_bind_table(m, s, ltbl);
        if (t == NULL)
-               throw(SQL, "datacell.register", "Table missing");
+               throw(SQL, "datacell.register", "Table missing '%s'", ltbl);
 
        /* check double registration */
        if (BSKTlocate(tbl))
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
@@ -141,9 +141,12 @@ DCreceptor(Client cntxt, MalBlkPtr mb, M
        str *protocol;
        str *mode;
        Receptor rc;
+       str msg= MAL_SUCCEED;
        
        if (idx == 0)
-               BSKTregister(cntxt, mb, stk, pci);
+               msg = BSKTregister(cntxt, mb, stk, pci);
+       if ( msg) 
+               return msg;
        rc = RCfind(*tbl);
        if ( pci->argc == 6 && rc != NULL ){
                protocol = (str *) getArgReference(stk, pci, 4);
@@ -175,8 +178,7 @@ DCreceptor(Client cntxt, MalBlkPtr mb, M
 
 str
 DCbasket(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
-       BSKTregister(cntxt, mb, stk, pci);
-       return MAL_SUCCEED;
+       return BSKTregister(cntxt, mb, stk, pci);
 }
 
 str
@@ -189,9 +191,12 @@ DCemitter(Client cntxt, MalBlkPtr mb, Ma
        int idx = BSKTlocate(*tbl);
        Emitter em;
        str *protocol, *mode;
+       str msg= MAL_SUCCEED;
 
        if (idx == 0)
-               BSKTregister(cntxt, mb, stk, pci);
+               msg = BSKTregister(cntxt, mb, stk, pci);
+       if ( msg) 
+               return msg;
        em = EMfind(*tbl);
        if ( pci->argc == 6 && em != NULL ){
                protocol = (str *) getArgReference(stk, pci, 4);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list