X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fget.c;h=8d76507cd29dbd1564b6d6b12617f5efa4a4679f;hb=c63b3f26c9e8d0214d3e1c70fb761f7700d61d2d;hp=1ccd2046cb1eac72ba0ab9b0e8773c52d50a4579;hpb=ce11ec5eadbc51ff26aa6b64f52cf36e6b703f46;p=m6w6%2Flibmemcached

diff --git a/libmemcached/get.c b/libmemcached/get.c
index 1ccd2046..8d76507c 100644
--- a/libmemcached/get.c
+++ b/libmemcached/get.c
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
+ * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -144,7 +144,6 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
                                                      size_t number_of_keys,
                                                      bool mget_mode)
 {
-  unsigned int x;
   memcached_return_t rc= MEMCACHED_NOTFOUND;
   const char *get_command= "get ";
   uint8_t get_command_length= 4;
@@ -169,7 +168,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
   {
     if (ptr->flags.verify_key && (memcached_key_test((const char * const *)&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);
+    master_server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length);
     is_master_key_set= true;
   }
 
@@ -179,9 +178,9 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
 
     It might be optimum to bounce the connection if count > some number.
   */
-  for (x= 0; x < memcached_server_count(ptr); x++)
+  for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
-    memcached_server_instance_st *instance=
+    memcached_server_write_instance_st instance=
       memcached_server_instance_fetch(ptr, x);
 
     if (memcached_server_response_count(instance))
@@ -189,7 +188,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
       char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
       if (ptr->flags.no_block)
-        (void)memcached_io_write(instance, NULL, 0, 1);
+        (void)memcached_io_write(instance, NULL, 0, true);
 
       while(memcached_server_response_count(instance))
         (void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
@@ -197,8 +196,10 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
   }
 
   if (ptr->flags.binary_protocol)
+  {
     return binary_mget_by_key(ptr, master_server_key, is_master_key_set, keys,
                               key_length, number_of_keys, mget_mode);
+  }
 
   if (ptr->flags.support_cas)
   {
@@ -210,9 +211,9 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
     If a server fails we warn about errors and start all over with sending keys
     to the server.
   */
-  for (x= 0; x < number_of_keys; x++)
+  for (uint32_t x= 0; x < number_of_keys; x++)
   {
-    memcached_server_instance_st *instance;
+    memcached_server_write_instance_st instance;
     uint32_t server_key;
 
     if (is_master_key_set)
@@ -221,11 +222,20 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
     }
     else
     {
-      server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+      server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
     }
 
     instance= memcached_server_instance_fetch(ptr, server_key);
 
+    struct libmemcached_io_vector_st vector[]=
+    {
+      { .length= get_command_length, .buffer= get_command },
+      { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+      { .length= key_length[x], .buffer= keys[x] },
+      { .length= 1, .buffer= " " }
+    };
+
+
     if (memcached_server_response_count(instance) == 0)
     {
       rc= memcached_connect(instance);
@@ -233,7 +243,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
       if (rc != MEMCACHED_SUCCESS)
         continue;
 
-      if ((memcached_io_write(instance, get_command, get_command_length, 0)) == -1)
+      if ((memcached_io_writev(instance, vector, 4, false)) == -1)
       {
         rc= MEMCACHED_SOME_ERRORS;
         continue;
@@ -242,45 +252,29 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
       memcached_server_response_increment(instance);
       WATCHPOINT_ASSERT(instance->cursor_active == 1);
     }
-
-    /* Only called when we have a prefix key */
-    if (ptr->prefix_key_length)
+    else
     {
-      if ((memcached_io_write(instance, ptr->prefix_key, ptr->prefix_key_length, 0)) == -1)
+      if ((memcached_io_writev(instance, (vector + 1), 3, false)) == -1)
       {
         memcached_server_response_reset(instance);
         rc= MEMCACHED_SOME_ERRORS;
         continue;
       }
     }
-
-    if ((memcached_io_write(instance, keys[x], key_length[x], 0)) == -1)
-    {
-      memcached_server_response_reset(instance);
-      rc= MEMCACHED_SOME_ERRORS;
-      continue;
-    }
-
-    if ((memcached_io_write(instance, " ", 1, 0)) == -1)
-    {
-      memcached_server_response_reset(instance);
-      rc= MEMCACHED_SOME_ERRORS;
-      continue;
-    }
   }
 
   /*
     Should we muddle on if some servers are dead?
   */
-  for (x= 0; x < memcached_server_count(ptr); x++)
+  for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
-    memcached_server_instance_st *instance=
+    memcached_server_write_instance_st instance=
       memcached_server_instance_fetch(ptr, x);
 
     if (memcached_server_response_count(instance))
     {
       /* We need to do something about non-connnected hosts in the future */
-      if ((memcached_io_write(instance, "\r\n", 2, 1)) == -1)
+      if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
       {
         rc= MEMCACHED_SOME_ERRORS;
       }
@@ -351,7 +345,6 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
                                              size_t number_of_keys, bool mget_mode)
 {
   memcached_return_t rc= MEMCACHED_NOTFOUND;
-  uint32_t x;
 
   int flush= number_of_keys == 1;
 
@@ -359,10 +352,10 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
     If a server fails we warn about errors and start all over with sending keys
     to the server.
   */
-  for (x= 0; x < number_of_keys; x++)
+  for (uint32_t x= 0; x < number_of_keys; ++x)
   {
     uint32_t server_key;
-    memcached_server_instance_st *instance;
+    memcached_server_write_instance_st instance;
 
     if (is_master_key_set)
     {
@@ -370,7 +363,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
     }
     else
     {
-      server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+      server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
     }
 
     instance= memcached_server_instance_fetch(ptr, server_key);
@@ -402,14 +395,18 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
       return vk;
     }
 
-    request.message.header.request.keylen= htons((uint16_t)key_length[x]);
+    request.message.header.request.keylen= htons((uint16_t)(key_length[x] + ptr->prefix_key_length));
     request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
-    request.message.header.request.bodylen= htonl((uint32_t) key_length[x]);
+    request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] + ptr->prefix_key_length));
 
-    if ((memcached_io_write(instance, request.bytes,
-                            sizeof(request.bytes), 0) == -1) ||
-        (memcached_io_write(instance, keys[x],
-                            key_length[x], (char) flush) == -1))
+    struct libmemcached_io_vector_st vector[]=
+    {
+      { .length= sizeof(request.bytes), .buffer= request.bytes },
+      { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+      { .length= key_length[x], .buffer= keys[x] }
+    };
+
+    if (memcached_io_writev(instance, vector, 3, flush) == -1)
     {
       memcached_server_response_reset(instance);
       rc= MEMCACHED_SOME_ERRORS;
@@ -419,9 +416,10 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
     /* We just want one pending response per server */
     memcached_server_response_reset(instance);
     memcached_server_response_increment(instance);
-    if ((x > 0 && x == ptr->io_key_prefetch) &&
-        memcached_flush_buffers(ptr) != MEMCACHED_SUCCESS)
+    if ((x > 0 && x == ptr->io_key_prefetch) && memcached_flush_buffers(ptr) != MEMCACHED_SUCCESS)
+    {
       rc= MEMCACHED_SOME_ERRORS;
+    }
   }
 
   if (mget_mode)
@@ -434,14 +432,14 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_NOOP;
     request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
 
-    for (x= 0; x < memcached_server_count(ptr); x++)
+    for (uint32_t x= 0; x < memcached_server_count(ptr); ++x)
     {
-      memcached_server_instance_st *instance=
+      memcached_server_write_instance_st instance=
         memcached_server_instance_fetch(ptr, x);
 
       if (memcached_server_response_count(instance))
       {
-        if (memcached_io_write(instance, NULL, 0, 1) == -1)
+        if (memcached_io_write(instance, NULL, 0, true) == -1)
         {
           memcached_server_response_reset(instance);
           memcached_io_reset(instance);
@@ -449,7 +447,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
         }
 
         if (memcached_io_write(instance, request.bytes,
-                               sizeof(request.bytes), 1) == -1)
+                               sizeof(request.bytes), true) == -1)
         {
           memcached_server_response_reset(instance);
           memcached_io_reset(instance);
@@ -471,7 +469,7 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
                                                   size_t number_of_keys)
 {
   memcached_return_t rc= MEMCACHED_NOTFOUND;
-  uint32_t x, start= 0;
+  uint32_t start= 0;
   uint64_t randomize_read= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ);
 
   if (randomize_read)
@@ -482,9 +480,9 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
   {
     bool success= true;
 
-    for (x= 0; x < number_of_keys; ++x)
+    for (uint32_t x= 0; x < number_of_keys; ++x)
     {
-      memcached_server_instance_st *instance;
+      memcached_server_write_instance_st instance;
 
       if (hash[x] == memcached_server_count(ptr))
         continue; /* Already successfully sent */
@@ -519,9 +517,9 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
         .message.header.request= {
           .magic= PROTOCOL_BINARY_REQ,
           .opcode= PROTOCOL_BINARY_CMD_GETK,
-          .keylen= htons((uint16_t)key_length[x]),
+          .keylen= htons((uint16_t)(key_length[x] + ptr->prefix_key_length)),
           .datatype= PROTOCOL_BINARY_RAW_BYTES,
-          .bodylen= htonl((uint32_t)key_length[x])
+          .bodylen= htonl((uint32_t)(key_length[x] + ptr->prefix_key_length))
         }
       };
 
@@ -535,10 +533,14 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
        * that we might have processed some of the responses etc. For now,
        * just make sure we work _correctly_
      */
-      if ((memcached_io_write(instance, request.bytes,
-                              sizeof(request.bytes), 0) == -1) ||
-          (memcached_io_write(instance, keys[x],
-                              key_length[x], 1) == -1))
+      struct libmemcached_io_vector_st vector[]=
+      {
+        { .length= sizeof(request.bytes), .buffer= request.bytes },
+        { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+        { .length= key_length[x], .buffer= keys[x] }
+      };
+
+      if (memcached_io_writev(instance, vector, 3, true) == -1)
       {
         memcached_io_reset(instance);
         dead_servers[server]= true;
@@ -577,28 +579,36 @@ static memcached_return_t binary_mget_by_key(memcached_st *ptr,
     uint32_t* hash;
     bool* dead_servers;
 
-    hash= ptr->call_malloc(ptr, sizeof(uint32_t) * number_of_keys);
-    dead_servers= ptr->call_calloc(ptr, memcached_server_count(ptr), sizeof(bool));
+    hash= libmemcached_malloc(ptr, sizeof(uint32_t) * number_of_keys);
+    dead_servers= libmemcached_calloc(ptr, memcached_server_count(ptr), sizeof(bool));
 
     if (hash == NULL || dead_servers == NULL)
     {
-      ptr->call_free(ptr, hash);
-      ptr->call_free(ptr, dead_servers);
+      libmemcached_free(ptr, hash);
+      libmemcached_free(ptr, dead_servers);
       return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
     }
 
     if (is_master_key_set)
-      for (unsigned int x= 0; x < number_of_keys; x++)
+    {
+      for (size_t x= 0; x < number_of_keys; x++)
+      {
         hash[x]= master_server_key;
+      }
+    }
     else
-      for (unsigned int x= 0; x < number_of_keys; x++)
-        hash[x]= memcached_generate_hash(ptr, keys[x], key_length[x]);
+    {
+      for (size_t x= 0; x < number_of_keys; x++)
+      {
+        hash[x]= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
+      }
+    }
 
     rc= replication_binary_mget(ptr, hash, dead_servers, keys,
                                 key_length, number_of_keys);
 
-    ptr->call_free(ptr, hash);
-    ptr->call_free(ptr, dead_servers);
+    libmemcached_free(ptr, hash);
+    libmemcached_free(ptr, dead_servers);
 
     return MEMCACHED_SUCCESS;
   }