Added behavior method around testing of keys.

[m6w6/libmemcached] / lib / memcached_get.c

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index b4266130e652f4baa2fb9b33e2ef6a825feecdcd..8cc7ce30b04adee6eb7d62555ed9fd90b0c8ecd4 100644 (file)
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -43,6 +43,7 @@ char *memcached_get_by_key(memcached_st *ptr,
   (void)memcached_fetch(ptr, NULL, NULL, 
                         &dummy_length, &dummy_flags, 
                         &dummy_error);
+  WATCHPOINT_ASSERT(dummy_length == 0);
 
   return value;
 }
@@ -74,6 +75,9 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
   if (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
+    return MEMCACHED_BAD_KEY_PROVIDED;
+
   if (ptr->flags & MEM_SUPPORT_CAS)
   {
     get_command= "gets ";
@@ -91,15 +95,15 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
   */
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    if (memcached_server_response_count(ptr, x))
+    if (memcached_server_response_count(&ptr->hosts[x]))
     {
       char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
       if (ptr->flags & MEM_NO_BLOCK)
-        (void)memcached_io_write(ptr, x, NULL, 0, 1);
+        (void)memcached_io_write(&ptr->hosts[x], NULL, 0, 1);
 
-      while(memcached_server_response_count(ptr, x))
-        (void)memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result, x);
+      while(memcached_server_response_count(&ptr->hosts[x]))
+        (void)memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
     }
   }
 
@@ -116,30 +120,33 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
     else
       server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
 
-    if (memcached_server_response_count(ptr, server_key) == 0)
+    if (memcached_server_response_count(&ptr->hosts[server_key]) == 0)
     {
-      rc= memcached_connect(ptr, server_key);
+      rc= memcached_connect(&ptr->hosts[server_key]);
+
+      if (rc != MEMCACHED_SUCCESS)
+        continue;
 
-      if ((memcached_io_write(ptr, server_key, get_command, get_command_length, 0)) == -1)
+      if ((memcached_io_write(&ptr->hosts[server_key], get_command, get_command_length, 0)) == -1)
       {
         rc= MEMCACHED_SOME_ERRORS;
         continue;
       }
       WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
-      memcached_server_response_increment(ptr, server_key);
+      memcached_server_response_increment(&ptr->hosts[server_key]);
       WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 1);
     }
 
-    if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1)
+    if ((memcached_io_write(&ptr->hosts[server_key], keys[x], key_length[x], 0)) == -1)
     {
-      memcached_server_response_reset(ptr, server_key);
+      memcached_server_response_reset(&ptr->hosts[server_key]);
       rc= MEMCACHED_SOME_ERRORS;
       continue;
     }
 
-    if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
+    if ((memcached_io_write(&ptr->hosts[server_key], " ", 1, 0)) == -1)
     {
-      memcached_server_response_reset(ptr, server_key);
+      memcached_server_response_reset(&ptr->hosts[server_key]);
       rc= MEMCACHED_SOME_ERRORS;
       continue;
     }
@@ -150,10 +157,10 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
   */
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    if (memcached_server_response_count(ptr, x))
+    if (memcached_server_response_count(&ptr->hosts[x]))
     {
       /* We need to do something about non-connnected hosts in the future */
-      if ((memcached_io_write(ptr, x, "\r\n", 2, 1)) == -1)
+      if ((memcached_io_write(&ptr->hosts[x], "\r\n", 2, 1)) == -1)
       {
         rc= MEMCACHED_SOME_ERRORS;
       }