MonetDB: Apr2011 - assert read-only BAT head (BAThrestricted()) ...

[Stefan Manegold]

Changeset: 7c5e5c66c514 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7c5e5c66c514
Modified Files:
        monetdb5/modules/mal/mkey.mx
Branch: Apr2011
Log Message:

assert read-only BAT head (BAThrestricted()) and create view only if we indeed 
require it


diffs (16 lines):

diff --git a/monetdb5/modules/mal/mkey.mx b/monetdb5/modules/mal/mkey.mx
--- a/monetdb5/modules/mal/mkey.mx
+++ b/monetdb5/modules/mal/mkey.mx
@@ -418,10 +418,10 @@
        if( (b = BATdescriptor(*bid)) == NULL ){
                throw(SQL, "bathash", "Cannot access descriptor");
        }
-       assert(BAThrestricted(b));
+       assert(BAThvoid(b) || BAThrestricted(b));
 
        msg = voidbathash(&dst, b);
-       if (b->htype != TYPE_void) {
+       if (!BAThvoid(b)) {
                BAT *x = VIEWcreate(b, dst);
                BBPreleaseref(dst->batCacheid);
                dst = x;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list