Fix for 64 bit

diff --git a/ChangeLog b/ChangeLog
index 1d48faa43bfb50f4ebc62eee4a2e444d4fc60b39..e2ef7733048fc89c1b34cf78ec0541d1d865030d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 0.16
   * Work on the UDP protocol
   * Added get_by_key, set_by_key tests for C++ API
+  * Fix for limit_maxbytes to be 64bit in stats
   
 0.15 Tue Jan 29 14:55:44 PST 2008
   * More work on the C++ API.

diff --git a/include/memcached.h b/include/memcached.h
index 9fb5d1e2ce9a95b3c52d388389622b4c0cc5aabf..095ac4351a10221a7c94e625ccaa4820c29593a0 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -169,7 +169,7 @@ struct memcached_stat_st {
   uint32_t rusage_system_microseconds;
   uint32_t curr_items;
   uint32_t total_items;
-  uint32_t limit_maxbytes;
+  uint64_t limit_maxbytes;
   uint32_t curr_connections;
   uint32_t total_connections;
   uint32_t connection_structures;

diff --git a/lib/memcached_hash.c b/lib/memcached_hash.c
index 60c88e3bfb9da057c91eaafd4221245732479ed6..0b46a865561347a333731f1adceb3c29d7061e50 100644 (file)
--- a/lib/memcached_hash.c
+++ b/lib/memcached_hash.c
@@ -19,6 +19,9 @@ unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_le
 
   WATCHPOINT_ASSERT(ptr->number_of_hosts);
 
+  if (ptr->number_of_hosts == 1)
+    return 0;
+
   switch (ptr->hash)
   {
   case MEMCACHED_HASH_DEFAULT:

diff --git a/lib/memcached_stats.c b/lib/memcached_stats.c
index 56ec80df08a55a1901c39fc6ba2a7fad769a9745..a1ef99f3a945b374bdf7b5ad1d3bbc05e7da4a26 100644 (file)
--- a/lib/memcached_stats.c
+++ b/lib/memcached_stats.c
@@ -192,7 +192,7 @@ char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
   else if (!memcmp("bytes_written", key, strlen("bytes_written")))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->bytes_written);
   else if (!memcmp("limit_maxbytes", key, strlen("limit_maxbytes")))
-    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->limit_maxbytes);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->limit_maxbytes);
   else if (!memcmp("threads", key, strlen("threads")))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->threads);
   else