memcached 0.8.1 → 0.9

data/BENCHMARKS

@@ -10,63 +10,68 @@ You can easily run your own benchmarks, as long as you have memcached itself on
 These benchmarks were run on 32-bit Intel OS X 10.4:
 
                                        user     system      total        real
-  set:plain:noblock:memcached      0.120000   0.020000   0.140000 (  0.368084)
-  set:plain:memcached              0.270000   0.340000   0.610000 (  1.499177)
-  set:plain:memcache-client       47.310000   0.670000  47.980000 ( 50.628096)
-  set:ruby:noblock:memcached       0.190000   0.010000   0.200000 (  0.354409)
-  set:ruby:memcached               0.380000   0.340000   0.720000 (  1.454480)
-  set:ruby:caffeine                5.570000   0.890000   6.460000 (  7.456010)
-  set:ruby:memcache-client        48.340000   0.770000  49.110000 ( 52.899929)
-  get:plain:memcached              0.350000   0.330000   0.680000 (  1.410108)
-  get:plain:memcache-client       48.000000   0.670000  48.670000 ( 51.532252)
-  get:ruby:memcached               0.410000   0.340000   0.750000 (  1.432786)
-  get:ruby:caffeine                5.480000   0.910000   6.390000 (  7.269396)
-  get:ruby:memcache-client        48.320000   0.770000  49.090000 ( 52.790661)
-  missing:ruby:memcached           0.420000   0.370000   0.790000 (  1.458207)
-  missing:ruby:memcached:inline    0.430000   0.370000   0.800000 (  1.633660)
-  missing:ruby:caffeine            5.270000   0.900000   6.170000 (  7.442863)
-  missing:ruby:memcache-client    48.270000   0.750000  49.020000 ( 53.028126)
-  mixed:ruby:noblock:memcached     0.760000   0.900000   1.660000 (  2.935532)
-  mixed:ruby:memcached             0.770000   0.670000   1.440000 (  2.891710)
-  mixed:ruby:caffeine              9.850000   1.780000  11.630000 ( 13.339650)
-  mixed:ruby:memcache-client      97.490000   1.460000  98.950000 (105.600490)
-  hash:fnv1_32:memcached           1.270000   1.350000   2.620000 (  5.557949)
-  hash:fnv1_64:memcached           1.200000   1.350000   2.550000 (  5.446442)
-  hash:hsieh:memcached             1.210000   1.360000   2.570000 (  5.365423)
-  hash:md5:memcached               1.250000   1.340000   2.590000 (  5.457329)
-  hash:default:memcached           1.220000   1.340000   2.560000 (  5.455361)
-  hash:ketama:memcached            1.170000   1.350000   2.520000 (  5.361789)
-  hash:fnv1a_64:memcached          1.240000   1.350000   2.590000 (  5.389261)
-  hash:fnv1a_32:memcached          1.180000   1.350000   2.530000 (  5.332386)
-  hash:crc:memcached               1.220000   1.350000   2.570000 (  5.460113)
+  set:plain:noblock:memcached      0.120000   0.020000   0.140000 (  0.307926)
+  set:plain:memcached              0.260000   0.340000   0.600000 (  1.282603)
+  set:plain:memcache-client       46.690000   0.580000  47.270000 ( 48.749359)
+  set:ruby:noblock:memcached       0.190000   0.020000   0.210000 (  0.346802)
+  set:ruby:memcached               0.370000   0.340000   0.710000 (  1.396252)
+  set:ruby:caffeine                5.640000   0.890000   6.530000 (  7.364335)
+  set:ruby:memcache-client        46.900000   0.580000  47.480000 ( 48.988299)
+  get:plain:memcached              0.300000   0.340000   0.640000 (  1.273405)
+  get:plain:memcache-client       47.200000   0.570000  47.770000 ( 49.161767)
+  get:ruby:memcached               0.410000   0.350000   0.760000 (  1.447452)
+  get:ruby:caffeine                5.560000   0.910000   6.470000 (  7.207449)
+  get:ruby:memcache-client        47.230000   0.580000  47.810000 ( 51.481972)
+  multiget:ruby:memcached          0.160000   0.060000   0.220000 (  0.363161)
+  multiget:ruby:caffeine           4.800000   0.550000   5.350000 (  5.658651)
+  multiget:ruby:memcache-client   50.710000   0.410000  51.120000 ( 52.303405)
+  missing:ruby:memcached           0.430000   0.370000   0.800000 (  1.358393)
+  missing:ruby:memcached:inline    0.360000   0.370000   0.730000 (  1.353781)
+  missing:ruby:caffeine            4.740000   0.870000   5.610000 (  6.320854)
+  missing:ruby:memcache-client    46.840000   0.570000  47.410000 ( 48.789416)
+  mixed:ruby:noblock:memcached     0.750000   0.910000   1.660000 (  2.807438)
+  mixed:ruby:memcached             0.760000   0.690000   1.450000 (  4.057959)
+  mixed:ruby:caffeine              8.730000   1.780000  10.510000 ( 13.515564)
+  mixed:ruby:memcache-client      95.450000   1.160000  96.610000 (100.632132)
+  hash:crc:memcached               1.240000   1.360000   2.600000 (  5.149145)
+  hash:fnv1_32:memcached           1.260000   1.360000   2.620000 (  5.333619)
+  hash:hsieh:memcached             1.150000   1.370000   2.520000 (  6.256728)
+  hash:fnv1_64:memcached           1.220000   1.360000   2.580000 (  5.188369)
+  hash:ketama:memcached            1.150000   1.360000   2.510000 (  5.076080)
+  hash:md5:memcached               1.220000   1.360000   2.580000 (  6.622163)
+  hash:default:memcached           1.190000   1.350000   2.540000 (  5.185591)
+  hash:fnv1a_32:memcached          1.210000   1.360000   2.570000 (  5.759699)
+  hash:fnv1a_64:memcached          1.180000   1.360000   2.540000 (  5.097193)
 
 == x86-64 Linux
   
 These benchmarks were run on AMD64 RHEL4:
 
                                        user     system      total        real
-  set:plain:noblock:memcached      0.100000   0.010000   0.110000 (  3.387985)
-  set:plain:memcached              0.160000   0.310000   0.470000 (  0.744728)
-  set:plain:memcache-client       13.710000   0.110000  13.820000 ( 14.021691)
-  set:ruby:noblock:memcached       0.170000   0.000000   0.170000 (  3.513274)
-  set:ruby:memcached               0.210000   0.380000   0.590000 (  0.812180)
-  set:ruby:memcache-client        13.600000   0.220000  13.820000 ( 14.232239)
-  get:plain:memcached              0.150000   0.310000   0.460000 (  0.747339)
-  get:plain:memcache-client       14.020000   0.290000  14.310000 ( 14.706064)
-  get:ruby:memcached               0.320000   0.250000   0.570000 (  0.828972)
-  get:ruby:memcache-client        14.050000   0.220000  14.270000 ( 14.648995)
-  missing:ruby:memcached           0.530000   0.280000   0.810000 (  1.117403)
-  missing:ruby:memcache-client    13.660000   0.200000  13.860000 ( 14.315195)
-  mixed:ruby:noblock:memcached     0.500000   0.490000   0.990000 (  1.541679)
-  mixed:ruby:memcached             0.470000   0.550000   1.020000 (  1.691884)
-  mixed:ruby:memcache-client      27.640000   0.480000  28.120000 ( 28.921745)
-  hash:crc:memcached               0.650000   1.200000   1.850000 (  3.112681)
-  hash:fnv1_32:memcached           0.660000   1.140000   1.800000 (  2.985026)
-  hash:fnv1_64:memcached           0.630000   1.280000   1.910000 (  3.027491)
-  hash:default:memcached           0.680000   1.120000   1.800000 (  2.991388)
-  hash:hsieh:memcached             0.760000   1.220000   1.980000 (  3.074890)
-  hash:fnv1a_32:memcached          0.680000   1.190000   1.870000 (  2.996147)
-  hash:md5:memcached               0.650000   1.230000   1.880000 (  3.126424)
-  hash:ketama:memcached            0.650000   1.200000   1.850000 (  3.062838)
-  hash:fnv1a_64:memcached          0.610000   1.300000   1.910000 (  3.030487)
-  
+  set:plain:noblock:memcached      0.110000   0.010000   0.120000 (  1.350748)
+  set:plain:memcached              0.120000   0.350000   0.470000 (  0.772407)
+  set:plain:memcache-client       13.670000   0.190000  13.860000 ( 14.266996)
+  set:ruby:noblock:memcached       0.160000   0.020000   0.180000 (  2.259853)
+  set:ruby:memcached               0.210000   0.320000   0.530000 (  0.841844)
+  set:ruby:memcache-client        13.710000   0.190000  13.900000 ( 14.249961)
+  get:plain:memcached              0.170000   0.270000   0.440000 (  0.754607)
+  get:plain:memcache-client       14.200000   0.220000  14.420000 ( 14.761720)
+  get:ruby:memcached               0.230000   0.310000   0.540000 (  0.847958)
+  get:ruby:memcache-client        14.170000   0.230000  14.400000 ( 14.804035)
+  multiget:ruby:memcached          0.070000   0.010000   0.080000 (  0.177625)
+  multiget:ruby:memcache-client   14.860000   0.080000  14.940000 ( 15.092570)
+  missing:ruby:memcached           0.270000   0.310000   0.580000 (  0.856026)
+  missing:ruby:memcached:inline    0.280000   0.300000   0.580000 (  0.871487)
+  missing:ruby:memcache-client    14.110000   0.250000  14.360000 ( 14.765192)
+  mixed:ruby:noblock:memcached     0.480000   0.520000   1.000000 (  1.615341)
+  mixed:ruby:memcached             0.520000   0.590000   1.110000 (  1.668772)
+  mixed:ruby:memcache-client      27.710000   0.430000  28.140000 ( 28.788336)
+  hash:crc:memcached               0.790000   1.180000   1.970000 (  3.041880)
+  hash:fnv1a_64:memcached          0.760000   1.060000   1.820000 (  3.010219)
+  hash:fnv1_32:memcached           0.800000   1.050000   1.850000 (  3.006838)
+  hash:fnv1_64:memcached           0.710000   1.260000   1.970000 (  3.016661)
+  hash:default:memcached           0.660000   1.120000   1.780000 (  3.115817)
+  hash:hsieh:memcached             0.620000   1.070000   1.690000 (  3.106407)
+  hash:ketama:memcached            0.680000   1.180000   1.860000 (  3.046879)
+  hash:md5:memcached               0.700000   1.130000   1.830000 (  3.009488)
+  hash:fnv1a_32:memcached          0.620000   1.310000   1.930000 (  3.027653)  

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.9. Move to libmemcached 0.19. Add some failover tests, but we are still waiting on libmemcached's replication branch for them to actually be useful. Fix CAS bug (ktheory).
+
 v0.8.1. Disable NotFound backtraces for speed (Blaine Cook).
 
 v0.8. CAS support. Update to libmemcached 0.16.

data/COMPATIBILITY

@@ -4,6 +4,7 @@
 This chart shows which versions of the Ruby library are compatible with which versions of libmemcached.
 
 <b>Library version</b>:: <b>libmemcached version</b>
+0.9:: 0.19
 0.8:: 0.16
 0.7:: 0.15
 0.6:: 0.13

data/README

@@ -22,14 +22,14 @@ The <b>memcached</b> library wraps the pure-C libmemcached client via SWIG.
 
 == Installation
 
-You need Ruby 1.8.6, and {libmemcached 0.16}[http://tangent.org/552/libmemcached.html]. Other versions are not supported. You also need {memcached itself}[http://www.danga.com/memcached/] if you want to test against a local server.
+You need Ruby 1.8.6, and {libmemcached 0.19}[http://tangent.org/552/libmemcached.html]. Other versions are not supported. You also need {memcached itself}[http://www.danga.com/memcached/] if you want to test against a local server.
 
-For Linux, download and extract the {libmemcached tarball}[http://download.tangent.org/libmemcached-0.16.tar.gz]. Then run:
+For Linux, download and extract the {libmemcached tarball}[http://download.tangent.org/libmemcached-0.19.tar.gz]. Then run:
   ./configure
   make && sudo make install
   
 For OS X, you may be able to install it from MacPorts:
-  sudo port install libmemcached @0.16_0
+  sudo port install libmemcached @0.19_0
   
 Now install the gem:
   sudo gem install memcached --no-rdoc --no-ri

data/TODO

@@ -1,2 +1,4 @@
 
+* Test consistent hashing
 * Verify libmemcached version
+* Support hostname looks with caching behavior

data/ext/extconf.rb

@@ -18,11 +18,18 @@ end
 dir_config 'rlibmemcached'
 
 # XXX There's probably a better way to do this
-unless find_library 'memcached', 'memcached_server_add', *ENV['LD_LIBRARY_PATH'].to_s.split(":")
-  raise "shared library 'libmemcached' not found"
-end
-unless find_header 'libmemcached/memcached.h', *ENV['INCLUDE_PATH'].to_s.split(":")
-  raise "header file 'libmemcached/memcached.h' not  found"
+raise "shared library 'libmemcached' not found" unless 
+  find_library('memcached', 'memcached_server_add', *ENV['LD_LIBRARY_PATH'].to_s.split(":"))
+
+[ 
+  'libmemcached/memcached.h', 
+  'libmemcached/memcached_constants.h', 
+  'libmemcached/memcached_storage.h',
+  'libmemcached/memcached_result.h',
+  'libmemcached/memcached_server.h'
+].each do |header|
+  raise "header file '#{include}' not  found" unless 
+    find_header(header, *ENV['INCLUDE_PATH'].to_s.split(":"))
 end
 
 create_makefile 'rlibmemcached'

data/ext/rlibmemcached.i

@@ -16,14 +16,7 @@
 %apply unsigned short { uint8_t };
 %apply unsigned int { uint16_t };
 %apply unsigned long { uint32_t flags, uint32_t offset };
-/* %apply unsigned long long { uint64_t cas }; */
-
-// For behavior's set interface
-%typemap(in) (void *data) {
-  int value = FIX2INT($input);
-  // printf("%d\n", value);
-  $1 = &value;
-};
+%apply unsigned long long {uint64_t data, uint64_t cas };
 
 // Array of strings map for multiget
 %typemap(in) (char **keys, size_t *key_length, unsigned int number_of_keys) {
@@ -54,14 +47,26 @@
   (char *value, size_t value_length)
 };
 
+// Key strings with same master key
+// XXX This will have to go once people start doing client-side replication and actually need to set the master key
+%typemap(in) (char *master_key, size_t master_key_length, char *key, size_t key_length) {
+ $3 = $1 = STR2CSTR($input);
+ $4 = $2 = (size_t) RSTRING($input)->len;
+};
+
+
 //// Output maps
 
-/* %apply unsigned long long { uint64_t cas }; */
 %apply unsigned short *OUTPUT {memcached_return *error}
 %apply unsigned int *OUTPUT {uint32_t *flags}
 %apply size_t *OUTPUT {size_t *value_length}
 %apply unsigned long long *OUTPUT {uint64_t *value}
 
+// Uint64
+%typemap(out) (uint64_t) {
+  $result = INT2FIX($1);
+};
+
 // String
 %typemap(in, numinputs=0) (char *key, size_t *key_length) {
   char string[256];
@@ -88,12 +93,17 @@
   free($1);
 };
 
+//// SWIG includes, for functions, constants, and structs
+
 %include "/opt/local/include/libmemcached/memcached.h"
+%include "/opt/local/include/libmemcached/memcached_constants.h"
+%include "/opt/local/include/libmemcached/memcached_storage.h"
+%include "/opt/local/include/libmemcached/memcached_result.h"
+%include "/opt/local/include/libmemcached/memcached_server.h"
 
 //// Custom C functions
 
 // Namespace and validate key. We could avoid several more dispatches and allocations if we called this from the libmemcached wrappers directly.
-
 VALUE ns(char *namespace, size_t namespace_length, char *key, size_t key_length);
 %{
 VALUE ns(char *namespace, size_t namespace_length, char *key, size_t key_length) {
@@ -180,3 +190,6 @@ memcached_stat_st *memcached_select_stat_at(memcached_st *in_ptr, memcached_stat
   return &(stat_ptr[index]);
 };
 %}
+
+// Expose the hash generation function, which is not included in any header
+unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length);