From 826216fe9ff2b734d4fd88d1af36e67e91412513 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Thu, 27 Dec 2007 22:10:38 -0800 Subject: [PATCH] Fixed issue between 32bit and 64bit hash calculations (compatibility issue with Java driver). --- lib/memcached_hash.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/memcached_hash.c b/lib/memcached_hash.c index 9906f5d9..60c88e3b 100644 --- a/lib/memcached_hash.c +++ b/lib/memcached_hash.c @@ -8,13 +8,13 @@ static uint32_t FNV_32_INIT= 2166136261UL; static uint32_t FNV_32_PRIME= 16777619; /* Prototypes */ -static uint64_t internal_generate_hash(char *key, size_t key_length); -static uint64_t internal_generate_md5(char *key, size_t key_length); -static uint64_t internal_generate_ketama_md5(char *key, size_t key_length); +static uint32_t internal_generate_hash(char *key, size_t key_length); +static uint32_t internal_generate_md5(char *key, size_t key_length); +static uint32_t internal_generate_ketama_md5(char *key, size_t key_length); unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length) { - uint64_t hash= 1; /* Just here to remove compile warning */ + uint32_t hash= 1; /* Just here to remove compile warning */ unsigned int x; WATCHPOINT_ASSERT(ptr->number_of_hosts); @@ -36,12 +36,15 @@ unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_le case MEMCACHED_HASH_FNV1_64: { /* Thanks to pierre@demartines.com for the pointer */ - hash= FNV_64_INIT; + uint64_t temp_hash; + + temp_hash= FNV_64_INIT; for (x= 0; x < key_length; x++) { - hash *= FNV_64_PRIME; - hash ^= key[x]; + temp_hash *= FNV_64_PRIME; + temp_hash ^= key[x]; } + hash= (uint32_t)temp_hash; } break; case MEMCACHED_HASH_FNV1A_64: @@ -102,10 +105,10 @@ unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_le } } -static uint64_t internal_generate_hash(char *key, size_t key_length) +static uint32_t internal_generate_hash(char *key, size_t key_length) { char *ptr= key; - uint64_t value= 0; + uint32_t value= 0; while (--key_length) { @@ -120,19 +123,19 @@ static uint64_t internal_generate_hash(char *key, size_t key_length) return value == 0 ? 1 : value; } -static uint64_t internal_generate_md5(char *key, size_t key_length) +static uint32_t internal_generate_md5(char *key, size_t key_length) { unsigned char results[16]; md5_signature((unsigned char*)key, (unsigned int)key_length, results); - return (uint64_t)(( results[3] << 24 ) + return (uint32_t)(( results[3] << 24 ) | ( results[2] << 16 ) | ( results[1] << 8 ) | results[0] ); } -static uint64_t internal_generate_ketama_md5(char *key, size_t key_length) +static uint32_t internal_generate_ketama_md5(char *key, size_t key_length) { unsigned char results[16]; -- 2.30.2