X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_get.c;h=05b317a6268b79d19b5a711d49dfb05cf4dc3cb1;hb=20b4431225d4ccd4aa22f6d7f67476c92d1c9546;hp=0418995601411a20c1bdc1690034a6cefec26e07;hpb=5f5b6bee7198f7091e2ed96ea52279efe0f3c472;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_get.c b/libmemcached/memcached_get.c
index 04189956..05b317a6 100644
--- a/libmemcached/memcached_get.c
+++ b/libmemcached/memcached_get.c
@@ -27,7 +27,7 @@ char *memcached_get_by_key(memcached_st *ptr,
   uint32_t dummy_flags;
   memcached_return dummy_error;
 
-  if (ptr->flags & MEM_USE_UDP)
+  unlikely (ptr->flags & MEM_USE_UDP)
   {
     *error= MEMCACHED_NOT_SUPPORTED;
     return NULL;
@@ -110,6 +110,7 @@ memcached_return memcached_mget(memcached_st *ptr,
 
 static memcached_return binary_mget_by_key(memcached_st *ptr,
                                            unsigned int master_server_key,
+                                           bool is_master_key_set,
                                            char **keys, size_t *key_length,
                                            unsigned int number_of_keys);
 
@@ -124,9 +125,10 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
   memcached_return rc= MEMCACHED_NOTFOUND;
   char *get_command= "get ";
   uint8_t get_command_length= 4;
-  unsigned int master_server_key= -1; /* 0 is a valid server id! */
+  unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
+  bool is_master_key_set= false;
 
-   if (ptr->flags & MEM_USE_UDP)
+   unlikely (ptr->flags & MEM_USE_UDP)
     return MEMCACHED_NOT_SUPPORTED;
 
   LIBMEMCACHED_MEMCACHED_MGET_START();
@@ -152,6 +154,7 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
     if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
       return MEMCACHED_BAD_KEY_PROVIDED;
     master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+    is_master_key_set= true;
   }
 
   /* 
@@ -175,7 +178,7 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
   }
   
   if (ptr->flags & MEM_BINARY_PROTOCOL)
-    return binary_mget_by_key(ptr, master_server_key, keys, 
+    return binary_mget_by_key(ptr, master_server_key, is_master_key_set, keys, 
                               key_length, number_of_keys);
 
   /* 
@@ -186,7 +189,7 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
   {
     unsigned int server_key;
 
-    if (master_server_key != -1)
+    if (is_master_key_set)
       server_key= master_server_key;
     else
       server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
@@ -255,6 +258,7 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
 
 static memcached_return binary_mget_by_key(memcached_st *ptr, 
                                            unsigned int master_server_key,
+                                           bool is_master_key_set,
                                            char **keys, size_t *key_length, 
                                            unsigned int number_of_keys)
 {
@@ -271,7 +275,7 @@ static memcached_return binary_mget_by_key(memcached_st *ptr,
   {
     unsigned int server_key;
 
-    if (master_server_key)
+    if (is_master_key_set)
       server_key= master_server_key;
     else
       server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
@@ -314,6 +318,9 @@ static memcached_return binary_mget_by_key(memcached_st *ptr,
       continue;
     }
     memcached_server_response_increment(&ptr->hosts[server_key]);    
+    if ((x > 0 && x == ptr->io_key_prefetch) &&
+        memcached_flush_buffers(ptr) != MEMCACHED_SUCCESS)
+      rc= MEMCACHED_SOME_ERRORS;
   }
 
   if (number_of_keys > 1)