memcached 1.4.3 → 1.4.5

data/ext/libmemcached-0.32/libmemcached/Makefile.am

@@ -14,9 +14,10 @@ pkginclude_HEADERS= memcached.h \
 		    memcached.hpp \
                     memcached_configure.h \
 		    memcached_constants.h \
+		    memcached_exist.h \
 		    memcached_get.h \
 		    memcached_result.h \
-                    memcached_sasl.h \
+				memcached_sasl.h \
 		    memcached_server.h \
 		    memcached_storage.h \
 		    memcached_string.h \
@@ -45,6 +46,7 @@ libmemcached_la_SOURCES = crc.c \
 			  memcached_delete.c \
 			  memcached_do.c \
 			  memcached_dump.c \
+			  memcached_exist.c \
 			  memcached_fetch.c \
 			  memcached_flush.c \
 			  memcached_get.c \
@@ -53,7 +55,7 @@ libmemcached_la_SOURCES = crc.c \
 			  memcached_hosts.c \
 			  memcached_io.c \
 			  memcached_purge.c \
-                          memcached_flush_buffers.c \
+				memcached_flush_buffers.c \
 			  md5.c \
 			  memcached_key.c \
 			  memcached_quit.c \
@@ -69,7 +71,7 @@ libmemcached_la_SOURCES = crc.c \
 			  memcached_version.c \
 			  murmur_hash.c \
 			  jenkins_hash.c \
-                          memcached_allocators.c
+				memcached_allocators.c
 
 
 if INCLUDE_HSIEH_SRC

data/ext/libmemcached-0.32/libmemcached/Makefile.in

@@ -109,7 +109,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__libmemcached_la_SOURCES_DIST = crc.c memcached.c memcached_auto.c \
 	memcached_analyze.c memcached_behavior.c memcached_connect.c \
-	memcached_delete.c memcached_do.c memcached_dump.c \
+	memcached_delete.c memcached_do.c memcached_dump.c memcached_exist.c \
 	memcached_fetch.c memcached_flush.c memcached_get.c \
 	memcached_touch.c memcached_hash.c memcached_hosts.c \
 	memcached_io.c memcached_purge.c memcached_flush_buffers.c \
@@ -132,6 +132,7 @@ am_libmemcached_la_OBJECTS = libmemcached_la-crc.lo \
 	libmemcached_la-memcached_delete.lo \
 	libmemcached_la-memcached_do.lo \
 	libmemcached_la-memcached_dump.lo \
+	libmemcached_la-memcached_exist.lo \
 	libmemcached_la-memcached_fetch.lo \
 	libmemcached_la-memcached_flush.lo \
 	libmemcached_la-memcached_get.lo \
@@ -169,7 +170,7 @@ libmemcachedcallbacks_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libmemcachedcallbacks_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = 
+DEFAULT_INCLUDES =
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -191,7 +192,7 @@ am__pkginclude_HEADERS_DIST = memcached.h memcached.hpp \
 	memcached_result.h memcached_sasl.h memcached_server.h \
 	memcached_storage.h memcached_string.h memcached_touch.h \
 	memcached_types.h memcached_watchpoint.h visibility.h \
-	memcached_util.h memcached_pool.h
+	memcached_util.h memcached_pool.h memcached_exist.h
 HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -362,7 +363,7 @@ top_srcdir = @top_srcdir@
 EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
              memcached_configure.h.in
 
-EXTRA_HEADERS = 
+EXTRA_HEADERS =
 BUILT_SOURCES = $(am__append_6)
 noinst_HEADERS = libmemcached_probes.h \
                  memcached_io.h \
@@ -371,7 +372,7 @@ noinst_HEADERS = libmemcached_probes.h \
                  memcached/protocol_binary.h
 
 pkginclude_HEADERS = memcached.h memcached.hpp memcached_configure.h \
-	memcached_constants.h memcached_get.h memcached_result.h \
+	memcached_constants.h memcached_get.h memcached_exist.h memcached_result.h \
 	memcached_sasl.h memcached_server.h memcached_storage.h \
 	memcached_string.h memcached_touch.h memcached_types.h \
 	memcached_watchpoint.h visibility.h $(am__append_1)
@@ -383,7 +384,7 @@ libmemcached_la_CFLAGS = ${AM_CFLAGS} ${NO_CONVERSION}
 libmemcached_la_SOURCES = crc.c memcached.c memcached_auto.c \
 	memcached_analyze.c memcached_behavior.c memcached_connect.c \
 	memcached_delete.c memcached_do.c memcached_dump.c \
-	memcached_fetch.c memcached_flush.c memcached_get.c \
+	memcached_exist.c memcached_fetch.c memcached_flush.c memcached_get.c \
 	memcached_touch.c memcached_hash.c memcached_hosts.c \
 	memcached_io.c memcached_purge.c memcached_flush_buffers.c \
 	md5.c memcached_key.c memcached_quit.c memcached_parse.c \
@@ -476,9 +477,9 @@ clean-noinstLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libmemcached.la: $(libmemcached_la_OBJECTS) $(libmemcached_la_DEPENDENCIES) 
+libmemcached.la: $(libmemcached_la_OBJECTS) $(libmemcached_la_DEPENDENCIES)
 	$(libmemcached_la_LINK) -rpath $(libdir) $(libmemcached_la_OBJECTS) $(libmemcached_la_LIBADD) $(LIBS)
-libmemcachedcallbacks.la: $(libmemcachedcallbacks_la_OBJECTS) $(libmemcachedcallbacks_la_DEPENDENCIES) 
+libmemcachedcallbacks.la: $(libmemcachedcallbacks_la_OBJECTS) $(libmemcachedcallbacks_la_DEPENDENCIES)
 	$(libmemcachedcallbacks_la_LINK)  $(libmemcachedcallbacks_la_OBJECTS) $(libmemcachedcallbacks_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -613,6 +614,13 @@ libmemcached_la-memcached_dump.lo: memcached_dump.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_la_CFLAGS) $(CFLAGS) -c -o libmemcached_la-memcached_dump.lo `test -f 'memcached_dump.c' || echo '$(srcdir)/'`memcached_dump.c
 
+libmemcached_la-memcached_exist.lo: memcached_exist.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_la_CFLAGS) $(CFLAGS) -MT libmemcached_la-memcached_exist.lo -MD -MP -MF $(DEPDIR)/libmemcached_la-memcached_exist.Tpo -c -o libmemcached_la-memcached_exist.lo `test -f 'memcached_exist.c' || echo '$(srcdir)/'`memcached_exist.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmemcached_la-memcached_exist.Tpo $(DEPDIR)/libmemcached_la-memcached_exist.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='memcached_exist.c' object='libmemcached_la-memcached_exist.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_la_CFLAGS) $(CFLAGS) -c -o libmemcached_la-memcached_exist.lo `test -f 'memcached_exist.c' || echo '$(srcdir)/'`memcached_exist.c
+
 libmemcached_la-memcached_fetch.lo: memcached_fetch.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_la_CFLAGS) $(CFLAGS) -MT libmemcached_la-memcached_fetch.lo -MD -MP -MF $(DEPDIR)/libmemcached_la-memcached_fetch.Tpo -c -o libmemcached_la-memcached_fetch.lo `test -f 'memcached_fetch.c' || echo '$(srcdir)/'`memcached_fetch.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libmemcached_la-memcached_fetch.Tpo $(DEPDIR)/libmemcached_la-memcached_fetch.Plo

data/ext/libmemcached-0.32/libmemcached/common.h

@@ -136,6 +136,12 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death);
 LIBMEMCACHED_LOCAL
 memcached_return memcached_do(memcached_server_st *ptr, const void *commmand,
                               size_t command_length, uint8_t with_flush);
+
+LIBMEMCACHED_LOCAL
+memcached_return memcached_vdo(memcached_server_st *ptr,
+                               const struct libmemcached_io_vector_st *vector, size_t count,
+                               uint8_t with_flush);
+
 LIBMEMCACHED_LOCAL
 memcached_return value_fetch(memcached_server_st *ptr,
                              char *buffer,
@@ -161,11 +167,11 @@ extern uint64_t htonll(uint64_t);
 LIBMEMCACHED_LOCAL
 memcached_return memcached_purge(memcached_server_st *ptr);
 
-static inline memcached_return memcached_validate_key_length(size_t key_length, 
+static inline memcached_return memcached_validate_key_length(size_t key_length,
                                                              bool binary) {
   unlikely (key_length == 0)
     return MEMCACHED_BAD_KEY_PROVIDED;
-  
+
   if (binary)
   {
     unlikely (key_length > 0xffff)
@@ -173,7 +179,7 @@ static inline memcached_return memcached_validate_key_length(size_t key_length,
   }
   else
   {
-    unlikely (key_length >= MEMCACHED_MAX_KEY) 
+    unlikely (key_length >= MEMCACHED_MAX_KEY)
       return MEMCACHED_BAD_KEY_PROVIDED;
   }
 

data/ext/libmemcached-0.32/libmemcached/memcached.h

@@ -28,6 +28,7 @@
 #include <libmemcached/memcached_string.h>
 #include <libmemcached/memcached_result.h>
 #include <libmemcached/memcached_storage.h>
+#include <libmemcached/memcached_exist.h>
 #include <libmemcached/memcached_sasl.h>
 
 #ifdef __cplusplus

data/ext/libmemcached-0.32/libmemcached/memcached_do.c

@@ -1,6 +1,6 @@
 #include "common.h"
 
-memcached_return memcached_do(memcached_server_st *ptr, const void *command, 
+memcached_return memcached_do(memcached_server_st *ptr, const void *command,
                               size_t command_length, uint8_t with_flush)
 {
   memcached_return rc;
@@ -32,3 +32,39 @@ memcached_return memcached_do(memcached_server_st *ptr, const void *command,
 
   return rc;
 }
+
+memcached_return memcached_vdo(memcached_server_st *ptr,
+                               const struct libmemcached_io_vector_st *vector, size_t count,
+                               uint8_t with_flush)
+{
+  memcached_return rc;
+  ssize_t sent_length;
+
+  WATCHPOINT_ASSERT(count);
+  WATCHPOINT_ASSERT(vector);
+
+  if ((rc= memcached_connect(ptr)) != MEMCACHED_SUCCESS)
+  {
+    WATCHPOINT_ERROR(rc);
+    return rc;
+  }
+
+  if (ptr->type == MEMCACHED_CONNECTION_UDP && with_flush && ptr->write_buffer_offset > UDP_DATAGRAM_HEADER_LENGTH)
+  {
+    memcached_io_write(ptr, NULL, 0, true);
+  }
+
+  sent_length= memcached_io_writev(ptr, vector, count, (char) with_flush);
+
+  size_t command_length = 0;
+  for (uint32_t x= 0; x < count; ++x, vector++)
+    command_length+= vector->length;
+
+  if (sent_length == -1 || (size_t)sent_length != command_length) {
+    rc = MEMCACHED_WRITE_FAILURE;
+    WATCHPOINT_ERROR(rc);
+  } else if ((ptr->root->flags & MEM_NOREPLY) == 0)
+    memcached_server_response_increment(ptr);
+
+  return rc;
+}

data/ext/libmemcached-0.32/libmemcached/memcached_exist.c

@@ -0,0 +1,114 @@
+#include <libmemcached/common.h>
+
+static memcached_return binary_exist(memcached_st *ptr, memcached_server_st *server,
+                                     const char* key, size_t key_length)
+{
+  protocol_binary_request_set request= {.bytes= {0}};
+  size_t send_length= sizeof(request.bytes);
+
+  request.message.header.request.magic= PROTOCOL_BINARY_REQ;
+  request.message.header.request.opcode= PROTOCOL_BINARY_CMD_ADD;
+  request.message.header.request.keylen= htons((uint16_t)(ptr->prefix_key_length + key_length));
+  request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
+  request.message.header.request.extlen= 8;
+  request.message.body.flags= 0;
+  request.message.body.expiration= htonl(2678400);
+
+  request.message.header.request.bodylen= htonl((uint32_t) (key_length
+                                                            +ptr->prefix_key_length
+                                                            +request.message.header.request.extlen));
+
+
+  struct libmemcached_io_vector_st vector[]=
+  {
+    { send_length, request.bytes },
+    { strlen(ptr->prefix_key), ptr->prefix_key },
+    { key_length, key }
+  };
+
+  memcached_return rc= memcached_vdo(server, vector, 3, 1);
+  if (rc != MEMCACHED_SUCCESS)
+  {
+    memcached_io_reset(server);
+    return (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;
+  }
+
+  rc= memcached_response(server, NULL, 0, NULL);
+
+  if (rc == MEMCACHED_SUCCESS)
+    rc= MEMCACHED_NOTFOUND;
+
+  if (rc == MEMCACHED_DATA_EXISTS)
+    rc= MEMCACHED_SUCCESS;
+
+  return rc;
+}
+
+static memcached_return ascii_exist(memcached_st *ptr, memcached_server_st *server,
+                                     const char* key, size_t key_length)
+{
+  struct libmemcached_io_vector_st vector[]=
+  {
+    { sizeof("add ") -1, "add " },
+    { strlen(ptr->prefix_key), ptr->prefix_key },
+    { key_length, key },
+    { sizeof(" 0") -1, " 0" },
+    { sizeof(" 2678400") -1, " 2678400" },
+    { sizeof(" 0") -1, " 0" },
+    { 2, "\r\n" },
+    { 2, "\r\n" }
+  };
+
+  memcached_return rc = memcached_vdo(server, vector, 8, 1);
+
+  if (rc == MEMCACHED_SUCCESS)
+  {
+    char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+    rc= memcached_response(server, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+
+    if (rc == MEMCACHED_NOTSTORED)
+      rc= MEMCACHED_SUCCESS;
+
+    if (rc == MEMCACHED_STORED)
+      rc= MEMCACHED_NOTFOUND;
+  }
+
+  if (rc == MEMCACHED_WRITE_FAILURE)
+    memcached_io_reset(server);
+
+  return rc;
+}
+
+memcached_return memcached_exist(memcached_st *ptr, const char *key, size_t key_length)
+{
+  return memcached_exist_by_key(ptr, key, key_length, key, key_length);
+}
+
+memcached_return memcached_exist_by_key(memcached_st *ptr,
+                                        const char *group_key, size_t group_key_length,
+                                        const char *key, size_t key_length)
+{
+  unlikely (ptr->flags & MEM_USE_UDP)
+    return MEMCACHED_NOT_SUPPORTED;
+
+  if (ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
+
+  if (ptr->flags & MEM_NOREPLY)
+  {
+    size_t dummy_length;
+    uint32_t dummy_flags;
+    memcached_return dummy_error;
+
+    memcached_get(ptr, key, key_length, &dummy_length, &dummy_flags, &dummy_error);
+    return dummy_error;
+  }
+
+  unsigned int server_key= memcached_generate_hash(ptr, key, key_length);
+  memcached_server_st *server= &ptr->hosts[server_key];
+
+  if (ptr->flags & MEM_BINARY_PROTOCOL)
+    return binary_exist(ptr, server, key, key_length);
+  else
+    return ascii_exist(ptr, server, key, key_length);
+}

data/ext/libmemcached-0.32/libmemcached/memcached_exist.h

@@ -0,0 +1,20 @@
+#ifndef __MEMCACHED_EXIST_H__
+#define __MEMCACHED_EXIST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LIBMEMCACHED_API
+memcached_return memcached_exist(memcached_st *memc, const char *key, size_t key_length);
+
+LIBMEMCACHED_API
+memcached_return memcached_exist_by_key(memcached_st *memc,
+                                          const char *group_key, size_t group_key_length,
+                                          const char *key, size_t key_length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MEMCACHED_EXIST_H__ */

data/ext/libmemcached-0.32/libmemcached/memcached_io.c

@@ -178,8 +178,8 @@ memcached_return memcached_io_read(memcached_server_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-ssize_t memcached_io_write(memcached_server_st *ptr,
-                           const void *buffer, size_t length, char with_flush)
+static ssize_t _io_write(memcached_server_st *ptr,
+                         const void *buffer, size_t length, char with_flush)
 {
   size_t original_length;
   const char* buffer_ptr;
@@ -245,6 +245,34 @@ ssize_t memcached_io_write(memcached_server_st *ptr,
   return (ssize_t) original_length;
 }
 
+ssize_t memcached_io_write(memcached_server_st *ptr,
+                           const void *buffer, size_t length, char with_flush)
+{
+  return _io_write(ptr, buffer, length, with_flush);
+}
+
+ssize_t memcached_io_writev(memcached_server_st *ptr,
+                            const struct libmemcached_io_vector_st *vector,
+                            size_t number_of, char with_flush)
+{
+  ssize_t total = 0;
+  char f = (char)false;
+
+  for (size_t x = 0; x < number_of; x++, vector++)
+  {
+    ssize_t returnable;
+    if ((returnable= _io_write(ptr, vector->buffer, vector->length, f)) == -1)
+      return -1;
+
+    total+= returnable;
+  }
+
+  if (with_flush && _io_write(ptr, NULL, 0, (char)true) == -1)
+    return -1;
+
+  return total;
+}
+
 memcached_return memcached_io_close(memcached_server_st *ptr)
 {
   int r;
@@ -429,7 +457,7 @@ static ssize_t io_flush(memcached_server_st *ptr,
   return (ssize_t) return_length;
 }
 
-/* 
+/*
   Eventually we will just kill off the server with the problem.
 */
 void memcached_io_reset(memcached_server_st *ptr)
@@ -439,7 +467,7 @@ void memcached_io_reset(memcached_server_st *ptr)
 
 /**
  * Read a given number of bytes from the server and place it into a specific
- * buffer. Reset the IO channel on this server if an error occurs. 
+ * buffer. Reset the IO channel on this server if an error occurs.
  */
 memcached_return memcached_safe_read(memcached_server_st *ptr,
                                      void *dta,
@@ -526,7 +554,7 @@ static void increment_udp_message_id(memcached_server_st *ptr)
   uint16_t cur_req= get_udp_datagram_request_id(header);
   int msg_num= get_msg_num_from_request_id(cur_req);
   int thread_id= get_thread_id_from_request_id(cur_req);
-  
+
   if (((++msg_num) & UDP_REQUEST_ID_THREAD_MASK) != 0)
     msg_num= 0;
 

data/ext/libmemcached-0.32/libmemcached/memcached_io.h

@@ -32,8 +32,21 @@ struct udp_datagram_header_st {
   uint16_t reserved;
 };
 
+struct libmemcached_io_vector_st
+{
+  size_t length;
+  const void *buffer;
+};
+
+LIBMEMCACHED_LOCAL
 ssize_t memcached_io_write(memcached_server_st *ptr,
                            const void *buffer, size_t length, char with_flush);
+
+LIBMEMCACHED_LOCAL
+ssize_t memcached_io_writev(memcached_server_st *ptr,
+                            const struct libmemcached_io_vector_st *vector,
+                            size_t number_of, char with_flush);
+
 void memcached_io_reset(memcached_server_st *ptr);
 memcached_return memcached_io_read(memcached_server_st *ptr,
                                    void *buffer, size_t length, ssize_t *nread);
@@ -43,8 +56,8 @@ memcached_return memcached_io_readline(memcached_server_st *ptr,
                                        size_t size);
 memcached_return memcached_io_close(memcached_server_st *ptr);
 /* Read n bytes of data from the server and store them in dta */
-memcached_return memcached_safe_read(memcached_server_st *ptr, 
-                                     void *dta, 
+memcached_return memcached_safe_read(memcached_server_st *ptr,
+                                     void *dta,
                                      size_t size);
 /* Read a single response from the server */
 memcached_return memcached_read_one_response(memcached_server_st *ptr,