Changeset: 9470908160c7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9470908160c7 Modified Files: gdk/gdk_search.h Branch: default Log Message:
Call hash_int/hash_lng for hash_oid/hash_wrd. This way we can easily see that they are actually the same. diffs (22 lines): diff --git a/gdk/gdk_search.h b/gdk/gdk_search.h --- a/gdk/gdk_search.h +++ b/gdk/gdk_search.h @@ -89,14 +89,14 @@ gdk_export BUN HASHlist(Hash *h, BUN i); /* XXX return size_t-sized value for 8-byte oid? */ #define hash_lng(H,V) ((BUN) mix_int((unsigned int) (*(const lng *)(V) ^ (*(lng *)(V) >> 32))) & (H)->mask) #if SIZEOF_OID == SIZEOF_INT -#define hash_oid(H,V) ((BUN) mix_int((unsigned int) *((const oid*) (V))) & (H)->mask) +#define hash_oid(H,V) hash_int(H,V) #else -#define hash_oid(H,V) ((BUN) mix_int((unsigned int) (*(const oid *)(V) ^ (*(const oid *)(V) >> 32))) & (H)->mask) +#define hash_oid(H,V) hash_lng(H,V) #endif #if SIZEOF_WRD == SIZEOF_INT -#define hash_wrd(H,V) ((BUN) mix_int((unsigned int) *((const wrd*) (V))) & (H)->mask) +#define hash_wrd(H,V) hash_int(H,V) #else -#define hash_wrd(H,V) ((BUN) mix_int((unsigned int) (*(const wrd *)(V) ^ (*(const wrd *)(V) >> 32))) & (H)->mask) +#define hash_wrd(H,V) hash_lng(H,V) #endif #define hash_flt(H,V) hash_int(H,V) _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
