projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
pandora-build v0.79. Added support for generating HEX version.
[awesomized/libmemcached]
/
libmemcached
/
memcached_hash.c
diff --git
a/libmemcached/memcached_hash.c
b/libmemcached/memcached_hash.c
index 5abc1e0761731627bcc49b1caaf1401f7f32e18b..959fc296af562c3f815d0e7a48952759564c9848 100644
(file)
--- a/
libmemcached/memcached_hash.c
+++ b/
libmemcached/memcached_hash.c
@@
-31,46
+31,49
@@
uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memca
hash= 1;
break;
/* FNV hash'es lifted from Dustin Sallings work */
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;
{
/* 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 *= FNV_64_PRIME;
- temp_hash ^= key[x];
+ temp_hash ^=
(uint64_t)
key[x];
}
hash= (uint32_t)temp_hash;
}
break;
}
hash= (uint32_t)temp_hash;
}
break;
- case MEMCACHED_HASH_FNV1A_64:
+ case MEMCACHED_HASH_FNV1A_64:
{
hash= (uint32_t) FNV_64_INIT;
{
hash= (uint32_t) FNV_64_INIT;
- for (x= 0; x < key_length; x++)
+ for (x= 0; x < key_length; x++)
{
{
- hash ^= key[x];
+ uint32_t val= (uint32_t)key[x];
+ hash ^= val;
hash *= (uint32_t) FNV_64_PRIME;
}
}
break;
hash *= (uint32_t) FNV_64_PRIME;
}
}
break;
- case MEMCACHED_HASH_FNV1_32:
+ case MEMCACHED_HASH_FNV1_32:
{
hash= FNV_32_INIT;
{
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;
hash *= FNV_32_PRIME;
- hash ^=
key[x]
;
+ hash ^=
val
;
}
}
break;
}
}
break;
- case MEMCACHED_HASH_FNV1A_32:
+ case MEMCACHED_HASH_FNV1A_32:
{
hash= FNV_32_INIT;
{
hash= FNV_32_INIT;
- for (x= 0; x < key_length; x++)
+ for (x= 0; x < key_length; x++)
{
{
- hash ^= key[x];
+ uint32_t val= (uint32_t)key[x];
+ hash ^= val;
hash *= FNV_32_PRIME;
}
}
hash *= FNV_32_PRIME;
}
}
@@
-118,10
+121,11
@@
uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length)
static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
{
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:
case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
+ case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
{
uint32_t num= ptr->continuum_points_counter;
WATCHPOINT_ASSERT(ptr->continuum);
{
uint32_t num= ptr->continuum_points_counter;
WATCHPOINT_ASSERT(ptr->continuum);
@@
-142,7
+146,7
@@
static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
if (right == end)
right= begin;
return right->index;
if (right == end)
right= begin;
return right->index;
- }
+ }
case MEMCACHED_DISTRIBUTION_MODULA:
return hash % ptr->number_of_hosts;
case MEMCACHED_DISTRIBUTION_RANDOM:
case MEMCACHED_DISTRIBUTION_MODULA:
return hash % ptr->number_of_hosts;
case MEMCACHED_DISTRIBUTION_RANDOM:
@@
-155,8
+159,8
@@
static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
/* NOTREACHED */
}
/* 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)
to the calling application.
*/
uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length)
@@
-201,17
+205,18
@@
uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_
static uint32_t internal_generate_hash(const char *key, size_t key_length)
{
const char *ptr= key;
static uint32_t internal_generate_hash(const char *key, size_t key_length)
{
const char *ptr= key;
- int32_t value= 0;
+
u
int32_t value= 0;
- while (key_length--)
+ while (key_length--)
{
{
- value += (int32_t) *ptr++;
+ uint32_t val= (uint32_t) *ptr++;
+ value += val;
value += (value << 10);
value ^= (value >> 6);
}
value += (value << 3);
value ^= (value >> 11);
value += (value << 10);
value ^= (value >> 6);
}
value += (value << 3);
value ^= (value >> 11);
- value += (value << 15);
+ value += (value << 15);
return value == 0 ? 1 : (uint32_t) value;
}
return value == 0 ? 1 : (uint32_t) value;
}