MonetDB: default - Merge with Jun2020 branch.

[Sjoerd Mullender]

Changeset: 783db94c9df0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=783db94c9df0
Modified Files:
        monetdb5/modules/mal/mkey.c
Branch: default
Log Message:

Merge with Jun2020 branch.


diffs (21 lines):

diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -483,7 +483,7 @@ MKEYconstbulk_rotate_xor_hash(bat *res, 
                        BATiter bi = bat_iterator(b);
                        for (BUN i = 0; i < n; i++) {
                                const char *restrict s = BUNtvar(bi, i);
-                               r[i] = GDK_ROTATE((ulng) *h, lbit, rbit) ^ 
(lng) ((const BUN *) s)[-1];
+                               r[i] = GDK_ROTATE((ulng) *h, lbit, rbit) ^ 
(ulng) ((const BUN *) s)[-1];
                        }
                        break;
                }
@@ -493,7 +493,7 @@ MKEYconstbulk_rotate_xor_hash(bat *res, 
                BUN (*hash)(const void *) = BATatoms[b->ttype].atomHash;
 
                for (BUN i = 0; i < n; i++)
-                       r[i] = GDK_ROTATE((ulng) *h, lbit, rbit) ^ (lng) 
(*hash)(BUNtail(bi, i));
+                       r[i] = GDK_ROTATE((ulng) *h, lbit, rbit) ^ (ulng) 
(*hash)(BUNtail(bi, i));
                break;
        }
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list