MonetDB: msk-type - Change mskGet to mskGetVal to be more like m...

[Sjoerd Mullender]

Changeset: 7a1b42ef9787 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a1b42ef9787
Modified Files:
        gdk/gdk.h
        gdk/gdk_bat.c
        gdk/gdk_batop.c
Branch: msk-type
Log Message:

Change mskGet to mskGetVal to be more like mskSetVal.


diffs (81 lines):

diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -801,7 +801,7 @@ mskSetVal(BAT *b, BUN p, msk v)
 }
 
 static inline msk
-mskGet(BAT *b, BUN p)
+mskGetVal(BAT *b, BUN p)
 {
        return ((uint32_t *) b->theap.base)[p / 32] & (1U << (p % 32));
 }
@@ -1818,7 +1818,7 @@ Tpos(BATiter *bi, BUN p)
 static inline void *
 Tmsk(BATiter *bi, BUN p)
 {
-       bi->tmsk = mskGet(bi->b, p);
+       bi->tmsk = mskGetVal(bi->b, p);
        return &bi->tmsk;
 }
 
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1178,7 +1178,7 @@ BUNdelete(BAT *b, oid o)
                    BATmaterialize(b) != GDK_SUCCEED)
                        return GDK_FAIL;
                if (ATOMstorage(b->ttype) == TYPE_msk) {
-                       mskSetVal(b, p, mskGet(b, BUNlast(b) - 1));
+                       mskSetVal(b, p, mskGetVal(b, BUNlast(b) - 1));
                } else {
                        memcpy(Tloc(b, p), Tloc(b, BUNlast(b) - 1), Tsize(b));
                }
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -639,7 +639,7 @@ append_msk_bat(BAT *b, BAT *n, struct ca
                                o = canditer_next(ci);
                                if (is_oid_nil(o))
                                        break;
-                               v |= (uint32_t) mskGet(n, o - n->hseqbase) << i;
+                               v |= (uint32_t) mskGetVal(n, o - n->hseqbase) 
<< i;
                        }
                        *bp++ = v;
                        v = 0;
@@ -929,7 +929,7 @@ BATdel(BAT *b, BAT *d)
                                 * how much this is used */
                                for (BUN i = 0; i < n; i++)
                                        mskSetVal(b, o + i,
-                                                 mskGet(b, o + c + i));
+                                                 mskGetVal(b, o + c + i));
                        } else {
                                memmove(Tloc(b, o),
                                        Tloc(b, o + c),
@@ -985,7 +985,7 @@ BATdel(BAT *b, BAT *d)
                                         * used */
                                        for (BUN i = 0; i < n; i++) {
                                                mskSetVal(b, pos + i,
-                                                         mskGet(b, opos + i));
+                                                         mskGetVal(b, opos + 
i));
                                        }
                                        pos += n;
                                } else {
@@ -1270,7 +1270,7 @@ BATreplace(BAT *b, BAT *p, BAT *n, bool 
                                return GDK_FAIL;
                        }
 
-                       mskSetVal(b, updid, mskGet(n, i));
+                       mskSetVal(b, updid, mskGetVal(n, i));
                }
        } else {
                for (BUN i = 0, j = BATcount(p); i < j; i++) {
@@ -1543,7 +1543,7 @@ BATkeyed(BAT *b)
                if (BATcount(b) > 2)
                        return false;
                /* there are exactly two values */
-               return mskGet(b, 0) != mskGet(b, 1);
+               return mskGetVal(b, 0) != mskGetVal(b, 1);
        }
        if (b->twidth < SIZEOF_BUN &&
            BATcount(b) > (BUN) 1 << (8 * b->twidth)) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list