MonetDB: default - Minor admin bugs resolved.

[mk]

Changeset: 353e88a864bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=353e88a864bc
Modified Files:
        sql/backends/monet5/datacell/basket.mx
        sql/backends/monet5/datacell/emitter.mx
        sql/backends/monet5/datacell/opt_datacell.mx
        sql/backends/monet5/sql.mx
Branch: default
Log Message:

Minor admin bugs resolved.


diffs (73 lines):

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
@@ -427,7 +427,7 @@
        bskt = BSKTlocate(tbl);
        if (bskt == 0 )
                throw(MAL,"basket.pass","Basket not found");
-       if ( baskets[bskt].colcount != pci->retc - 3)
+       if ( baskets[bskt].colcount != pci->argc - 2)
                throw(MAL,"basket.pass","Non-matchin arguments");
 
        /* copy the content of the temporary BATs into the basket */
diff --git a/sql/backends/monet5/datacell/emitter.mx 
b/sql/backends/monet5/datacell/emitter.mx
--- a/sql/backends/monet5/datacell/emitter.mx
+++ b/sql/backends/monet5/datacell/emitter.mx
@@ -401,7 +401,7 @@
 EMbody(Emitter em)
 {
        BUN cnt;
-       size_t i,j;
+       size_t j;
        int k, ret;
        BAT *b;
 
@@ -454,6 +454,7 @@
                        if ( em->table.format[k].c[0] )
                                BBPunfix( em->table.format[k].c[0]->batCacheid);
                        b = em->table.format[k].c[0] =  
baskets[em->bskt].primary[k];
+                       em->table.format[k].ci[0] = bat_iterator(b);
                        if (  b->htype == TYPE_oid) {
                                baskets[em->bskt].primary[k] = 
BATnew(TYPE_void, b->ttype, 0);
                                BATseqbase(baskets[em->bskt].primary[k], 0);
@@ -476,15 +477,9 @@
                        if (ret < 0)
                                mnstr_printf(EMout, "Tuple emission failed\n");
 #endif
-                       if (ret < 0) {
+                       if (ret < 0)
                                /* keep the events and try to setup a new 
connection */
-                               BSKTunlock(&em->lck, &em->name);
                                break;
-                       }
-                       /* clean the baskets */
-                       for (i = 1; i < em->table.nr_attrs; i++)
-                               BATclear(em->table.format[i].c[0]);
-
                        if (em->table.error) {
                                mnstr_printf(GDKerr, em->table.error);
                                em->table.error = 0;
diff --git a/sql/backends/monet5/datacell/opt_datacell.mx 
b/sql/backends/monet5/datacell/opt_datacell.mx
--- a/sql/backends/monet5/datacell/opt_datacell.mx
+++ b/sql/backends/monet5/datacell/opt_datacell.mx
@@ -92,7 +92,7 @@
     for (i = 0; i < limit; i++) 
        if( old[i]) {
         p = old[i];
-               if ( i == 2) 
+               if ( i == 1) 
                        /* inject transaction start */
                        newFcnCall(mb,sqlRef,putName("transaction",11));
                
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -50,7 +50,7 @@
 address SQLtransaction
 comment "a transaction statement (type can be commit,release,rollback or 
start)";
 
-pattern transaction()
+pattern transaction{unsafe}()
 address SQLtransaction2
 comment "Start an autocommit transaction";
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list