static uint32_t internal_generate_hash(const char *key, size_t key_length);
static uint32_t internal_generate_md5(const char *key, size_t key_length);
-uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm)
+uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash_t hash_algorithm)
{
uint32_t hash= 1; /* Just here to remove compile warning */
uint32_t x= 0;
hash= 1;
break;
/* FNV hash'es lifted from Dustin Sallings work */
- case MEMCACHED_HASH_FNV1_64:
+ case MEMCACHED_HASH_FNV1_64:
{
/* Thanks to pierre@demartines.com for the pointer */
uint64_t temp_hash;
temp_hash= FNV_64_INIT;
- for (x= 0; x < key_length; x++)
+ for (x= 0; x < key_length; x++)
{
temp_hash *= FNV_64_PRIME;
temp_hash ^= (uint64_t)key[x];
hash= (uint32_t)temp_hash;
}
break;
- case MEMCACHED_HASH_FNV1A_64:
+ case MEMCACHED_HASH_FNV1A_64:
{
hash= (uint32_t) FNV_64_INIT;
- for (x= 0; x < key_length; x++)
+ for (x= 0; x < key_length; x++)
{
uint32_t val= (uint32_t)key[x];
hash ^= val;
}
}
break;
- case MEMCACHED_HASH_FNV1_32:
+ case MEMCACHED_HASH_FNV1_32:
{
hash= FNV_32_INIT;
- for (x= 0; x < key_length; x++)
+ for (x= 0; x < key_length; x++)
{
uint32_t val= (uint32_t)key[x];
hash *= FNV_32_PRIME;
}
}
break;
- case MEMCACHED_HASH_FNV1A_32:
+ case MEMCACHED_HASH_FNV1A_32:
{
hash= FNV_32_INIT;
- for (x= 0; x < key_length; x++)
+ for (x= 0; x < key_length; x++)
{
uint32_t val= (uint32_t)key[x];
hash ^= val;
static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
{
- switch (ptr->distribution)
+ switch (ptr->distribution)
{
case MEMCACHED_DISTRIBUTION_CONSISTENT:
case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
+ case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
{
uint32_t num= ptr->continuum_points_counter;
WATCHPOINT_ASSERT(ptr->continuum);
if (right == end)
right= begin;
return right->index;
- }
+ }
case MEMCACHED_DISTRIBUTION_MODULA:
return hash % ptr->number_of_hosts;
case MEMCACHED_DISTRIBUTION_RANDOM:
/* NOTREACHED */
}
-/*
- One day make this public, and have it return the actual memcached_server_st
+/*
+ One day make this public, and have it return the actual memcached_server_st
to the calling application.
*/
uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length)
if (ptr->number_of_hosts == 1)
return 0;
- if (ptr->flags & MEM_HASH_WITH_PREFIX_KEY)
+ if (ptr->flags.hash_with_prefix_key)
{
size_t temp_length= ptr->prefix_key_length + key_length;
char temp[temp_length];
const char *ptr= key;
uint32_t value= 0;
- while (key_length--)
+ while (key_length--)
{
uint32_t val= (uint32_t) *ptr++;
value += val;
}
value += (value << 3);
value ^= (value >> 11);
- value += (value << 15);
+ value += (value << 15);
return value == 0 ? 1 : (uint32_t) value;
}