MonetDB: default - Set the correct bits when filling a msk bat.

[Sjoerd Mullender]

Changeset: e9691ec4faab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9691ec4faab
Modified Files:
        gdk/gdk_batop.c
Branch: default
Log Message:

Set the correct bits when filling a msk bat.


diffs (22 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -2432,10 +2432,14 @@ BATconstant(oid hseq, int tailtype, cons
                        BATtseqbase(bn, oid_nil);
                        break;
                case TYPE_msk:
-                       if (*(msk*)v)
-                               memset(p, 0xFF, (n + 7) / 8);
-                       else
-                               memset(p, 0x00, (n + 7) / 8);
+                       if (*(msk*)v) {
+                               memset(p, 0xFF, 4 * ((n + 31) / 32));
+                               if (n & 31) {
+                                       uint32_t *m = p;
+                                       m[n / 32] &= ~((1U << (n % 32)) - 1);
+                               }
+                       } else
+                               memset(p, 0x00, 4 * ((n + 31) / 32));
                        break;
                case TYPE_bte:
                        memset(p, *(bte*)v, n);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list