#include "common.h"
/* Defines */
-static uint64_t FNV_64_INIT= 0xcbf29ce484222325L;
-static uint64_t FNV_64_PRIME= 0x100000001b3L;
+static uint64_t FNV_64_INIT= 0xcbf29ce484222325LL;
+static uint64_t FNV_64_PRIME= 0x100000001b3LL;
-static uint32_t FNV_32_INIT= 2166136261L;
+static uint32_t FNV_32_INIT= 2166136261UL;
static uint32_t FNV_32_PRIME= 16777619;
/* Prototypes */
-static unsigned int 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_md5(char *key, size_t key_length);
-static uint32_t internal_generate_ketama_md5(char *key, size_t key_length);
+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);
unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length)
{
- uint32_t hash;
+ uint64_t hash= 1; /* Just here to remove compile warning */
unsigned int x;
+ WATCHPOINT_ASSERT(ptr->number_of_hosts);
+
switch (ptr->hash)
{
case MEMCACHED_HASH_DEFAULT:
case MEMCACHED_HASH_FNV1_64:
{
/* Thanks to pierre@demartines.com for the pointer */
- hash = FNV_64_INIT;
+ hash= FNV_64_INIT;
for (x= 0; x < key_length; x++)
{
hash *= FNV_64_PRIME;
return hash % ptr->number_of_hosts;
}
-static uint32_t internal_generate_hash(char *key, size_t key_length)
+static uint64_t internal_generate_hash(char *key, size_t key_length)
{
char *ptr= key;
- unsigned int value= 0;
+ uint64_t value= 0;
while (--key_length)
{
return value == 0 ? 1 : value;
}
-static uint32_t internal_generate_md5(char *key, size_t key_length)
+static uint64_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 (uint32_t)(( results[3] << 24 )
+ return (uint64_t)(( results[3] << 24 )
| ( results[2] << 16 )
| ( results[1] << 8 )
| results[0] );
}
-static uint32_t internal_generate_ketama_md5(char *key, size_t key_length)
+static uint64_t internal_generate_ketama_md5(char *key, size_t key_length)
{
unsigned char results[16];