MonetDB: unlock - Fixes for using msk.

[Sjoerd Mullender]

Changeset: c688524ff846 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c688524ff846
Modified Files:
        gdk/gdk_cand.c
        gdk/gdk_select.c
Branch: unlock
Log Message:

Fixes for using msk.


diffs (39 lines):

diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -431,10 +431,10 @@ canditer_init(struct canditer *ci, BAT *
                return ci->ncand;
        }
 
-       assert(ATOMtype(s->ttype) == TYPE_oid);
-       assert(s->tsorted);
-       assert(s->tkey);
-       assert(s->tnonil);
+       assert(ATOMtype(s->ttype) == TYPE_oid || s->ttype == TYPE_msk);
+       assert(s->ttype == TYPE_msk|| s->tsorted);
+       assert(s->ttype == TYPE_msk|| s->tkey);
+       assert(s->ttype == TYPE_msk|| s->tnonil);
        assert(s->ttype == TYPE_void || s->tvheap == NULL);
 
        BUN cnt = BATcount(s);
@@ -998,7 +998,7 @@ static BAT *
 canditer_sliceval_mask(struct canditer *ci, oid lo1, oid hi1, BUN cnt1,
                       oid lo2, oid hi2, BUN cnt2)
 {
-       assert(!is_oid_nil(lo2) || cnt2 > 0);
+       assert(cnt2 == 0 || !is_oid_nil(lo2));
        assert(cnt2 == 0 || lo2 >= hi1);
        if (is_oid_nil(lo1) || lo1 < ci->mskoff + ci->firstbit)
                lo1 = ci->mskoff + ci->firstbit;
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1051,7 +1051,7 @@ BATselect(BAT *b, BAT *s, const void *tl
                return NULL;
        }
 
-       if (s && !BATtordered(s)) {
+       if (s && s->ttype != TYPE_msk && !BATtordered(s)) {
                GDKerror("invalid argument: s must be sorted.\n");
                return NULL;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list