RubyGems - memcached - Versions diffs - 1.1 → 1.1.1 - Mend

memcached 1.1 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

data.tar.gz.sig +3 -4
data/BENCHMARKS +102 -104
data/CHANGELOG +2 -0
data/Manifest +4 -1
data/Rakefile +12 -6
data/lib/memcached/memcached.rb +33 -27
data/lib/rlibmemcached.bundle.dSYM/Contents/Info.plist +20 -0
data/memcached.gemspec +4 -4
data/test/profile/benchmark.rb +4 -0
data/test/profile/c_profiler.rb +14 -0
data/test/profile/exercise.rb +150 -0
data/test/profile/rb_profiler.rb +21 -0
data/test/profile/valgrind.rb +1 -147
data/test/unit/memcached_test.rb +30 -16
metadata +9 -5
metadata.gz.sig +0 -0
data/test/profile/profile.rb +0 -14

data.tar.gz.sig CHANGED

@@ -1,4 +1,3 @@
-��c(�8>%�X?�n�R�
-w�y�� ��Hy��c@,ȫLV�+V��,��lڸ)��d,��T�vd�ދ�]#�J����y�7�&��Y�څ��o�D�lU?4e�Q5
-69sT���~�b׆N��\���w�\_f�E2)-����N�
-㩙O���6@k�Š��ު��y�"�
+�MY���i�3+�7T3��Lلh���<����s$��.:��?���ZU�&���ZVc<f�Bf�}Fe��Ft0y�h�h?=8Irk���W��X�s�{���G��:/)
+�������4��"+�x5x��A����A���Fc}���C:<�����r��ʶ�V��w����d����c��7M���nޟc8�B����]y�ik�\	��$�A���99!��k���!GP�ґ�A�y��{&�F��

data/BENCHMARKS CHANGED

@@ -20,117 +20,115 @@ These benchmarks were run on a 64-bit OS X machine, with memcached 1.4.5:
   RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
   RUBY_VERSION=ree-1.8.7-2010.02
   Ruby 1.8.7p253
-  Loaded memcached 1.1
+  Loaded memcached 1.1.1
   Loaded remix-stash 1.1.3
   Loaded memcache-client 1.8.5
   Loaded kgio 2.0.0
   Loaded dalli 1.0.2
+  PID is 21173
   Loops is 20000
   Stack depth is 0
   Small value size is: 13 bytes
   Large value size is: 4158 bytes
                                             user     system      total        real
-  set: dalli:bin                        4.260000   1.390000   5.650000 (  7.781403)
-  set: libm:ascii                       0.620000   1.000000   1.620000 (  3.850559)
-  set: libm:ascii:pipeline              0.250000   0.010000   0.260000 (  0.257739)
-  set: libm:ascii:udp                   0.540000   0.560000   1.100000 (  2.628061)
-  set: libm:bin                         0.500000   0.870000   1.370000 (  3.304144)
-  set: libm:bin:buffer                  0.270000   0.110000   0.380000 (  0.868976)
-  set: mclient:ascii                    7.090000   1.940000   9.030000 (  9.799150)
-  set: stash:bin                        2.660000   1.090000   3.750000 (  6.359556)
-  get: dalli:bin                        4.630000   1.510000   6.140000 (  8.750410)
-  get: libm:ascii                       0.750000   0.980000   1.730000 (  4.106665)
-  get: libm:ascii:pipeline              0.790000   1.190000   1.980000 (  4.097790)
-  get: libm:ascii:udp                   0.710000   0.580000   1.290000 (  3.024444)
-  get: libm:bin                         0.640000   0.980000   1.620000 (  3.675987)
-  get: libm:bin:buffer                  0.660000   1.100000   1.760000 (  4.125261)
-  get: mclient:ascii                    8.570000   1.860000  10.430000 ( 11.258154)
-  get: stash:bin                        2.320000   1.010000   3.330000 (  5.785865)
-  get-multi: dalli:bin                  7.900000   2.310000  10.210000 ( 11.062836)
-  get-multi: libm:ascii                 0.830000   0.580000   1.410000 (  2.314816)
-  get-multi: libm:ascii:pipeline        0.780000   0.590000   1.370000 (  2.505246)
-  get-multi: libm:ascii:udp             0.820000   0.460000   1.280000 (  1.778208)
-  get-multi: libm:bin                   0.820000   0.750000   1.570000 (  3.781036)
-  get-multi: libm:bin:buffer            0.820000   0.710000   1.530000 (  3.197627)
-  append: dalli:bin                     3.770000   1.260000   5.030000 (  9.071970)
-  append: libm:ascii                    0.660000   0.990000   1.650000 (  5.801622)
-  append: libm:ascii:pipeline           0.270000   0.010000   0.280000 (  0.875748)
-  append: libm:ascii:udp                0.570000   0.600000   1.170000 (  4.486811)
-  append: libm:bin                      0.540000   0.880000   1.420000 (  5.101226)
-  append: libm:bin:buffer               0.560000   0.770000   1.330000 (  2.742466)
-  append: mclient:ascii                 7.410000   1.820000   9.230000 ( 11.881533)
-  prepend: dalli:bin                    3.600000   1.190000   4.790000 (  8.895472)
-  prepend: libm:ascii                   0.670000   1.000000   1.670000 (  5.946532)
-  prepend: libm:ascii:pipeline          0.280000   0.010000   0.290000 (  0.766421)
-  prepend: libm:ascii:udp               0.640000   0.570000   1.210000 (  4.405895)
-  prepend: libm:bin                     0.540000   0.900000   1.440000 (  4.795609)
-  prepend: libm:bin:buffer              0.490000   0.760000   1.250000 (  2.440978)
-  prepend: mclient:ascii                7.130000   1.680000   8.810000 ( 11.276423)
-  delete: dalli:bin                     3.830000   1.400000   5.230000 (  7.029441)
-  delete: libm:ascii                    1.340000   0.960000   2.300000 (  4.673076)
-  delete: libm:ascii:pipeline           0.330000   0.340000   0.670000 (  0.727365)
-  delete: libm:ascii:udp                1.260000   0.690000   1.950000 (  3.978592)
-  delete: libm:bin                      1.170000   0.950000   2.120000 (  4.623145)
-  delete: libm:bin:buffer               0.270000   0.330000   0.600000 (  1.233183)
-  delete: mclient:ascii                 6.840000   1.590000   8.430000 (  9.413134)
-  get-missing: dalli:bin                3.750000   1.360000   5.110000 (  7.640075)
-  get-missing: libm:ascii               1.390000   0.960000   2.350000 (  4.956339)
-  get-missing: libm:ascii:pipeline      1.460000   1.290000   2.750000 (  5.100596)
-  get-missing: libm:ascii:udp           1.290000   0.660000   1.950000 (  3.916012)
-  get-missing: libm:bin                 1.370000   0.950000   2.320000 (  4.699251)
-  get-missing: libm:bin:buffer          1.430000   1.250000   2.680000 (  5.016395)
-  get-missing: mclient:ascii            7.030000   1.630000   8.660000 ( 10.143076)
-  append-missing: dalli:bin             3.870000   1.360000   5.230000 (  7.454089)
-  append-missing: libm:ascii            1.430000   0.950000   2.380000 (  5.313864)
-  append-missing: libm:ascii:pipeline   0.250000   0.010000   0.260000 (  0.262928)
-  append-missing: libm:ascii:udp        1.330000   0.680000   2.010000 (  4.366685)
-  append-missing: libm:bin              1.350000   0.940000   2.290000 (  5.314118)
-  append-missing: mclient:ascii         6.510000   1.510000   8.020000 ( 10.445953)
-  prepend-missing: dalli:bin            3.930000   1.400000   5.330000 (  7.723462)
-  prepend-missing: libm:ascii           1.440000   0.980000   2.420000 (  5.013569)
-  prepend-missing: libm:ascii:pipeline  0.260000   0.010000   0.270000 (  0.268678)
-  prepend-missing: libm:ascii:udp       1.370000   0.720000   2.090000 (  4.132354)
-  prepend-missing: libm:bin             1.340000   0.930000   2.270000 (  5.525098)
-  prepend-missing: mclient:ascii        7.030000   1.670000   8.700000 (  9.769180)
-  set-large: dalli:bin                  4.950000   1.670000   6.620000 (  9.261310)
-  set-large: libm:ascii                 0.670000   1.060000   1.730000 (  4.484607)
-  set-large: libm:ascii:pipeline        0.400000   0.260000   0.660000 (  0.879186)
-  set-large: libm:ascii:udp             0.620000   0.690000   1.310000 (  4.016410)
-  set-large: libm:bin                   0.540000   1.010000   1.550000 (  3.763049)
-  set-large: libm:bin:buffer            0.370000   0.440000   0.810000 (  1.543509)
-  set-large: mclient:ascii              7.570000   2.120000   9.690000 ( 10.677677)
-  set-large: stash:bin                  3.950000   1.080000   5.030000 (  7.506158)
-  get-large: dalli:bin                  4.580000   1.370000   5.950000 (  7.917984)
-  get-large: libm:ascii                 0.740000   0.900000   1.640000 (  3.994640)
-  get-large: libm:ascii:pipeline        0.800000   1.190000   1.990000 (  4.067327)
-  get-large: libm:ascii:udp             0.750000   0.560000   1.310000 (  2.875825)
-  get-large: libm:bin                   0.630000   0.990000   1.620000 (  3.536786)
-  get-large: libm:bin:buffer            0.690000   1.140000   1.830000 (  3.937316)
-  get-large: mclient:ascii              8.840000   1.980000  10.820000 ( 11.897647)
-  get-large: stash:bin                  2.450000   0.960000   3.410000 (  5.595178)
-  hash:murmur                           0.240000   0.000000   0.240000 (  0.244843)
-  hash:md5                              0.580000   0.000000   0.580000 (  0.584214)
-  hash:fnv1a_64                         0.360000   0.000000   0.360000 (  0.382996)
-  hash:fnv1a_32                         0.310000   0.010000   0.320000 (  0.332762)
-  hash:jenkins                          0.270000   0.000000   0.270000 (  0.282539)
-  hash:default                          0.380000   0.000000   0.380000 (  0.387484)
-  hash:crc                              0.390000   0.000000   0.390000 (  0.388273)
-  hash:hsieh                            0.210000   0.000000   0.210000 (  0.208599)
-  hash:fnv1_32                          0.310000   0.000000   0.310000 (  0.314305)
-  hash:fnv1_64                          0.430000   0.000000   0.430000 (  0.425971)
-  hash:none                             0.230000   0.000000   0.230000 (  0.225403)
+  set: libm:ascii                       0.600000   0.960000   1.560000 (  3.790868)
+  set: libm:ascii:pipeline              0.230000   0.010000   0.240000 (  0.240365)
+  set: libm:ascii:udp                   0.530000   0.580000   1.110000 (  2.573610)
+  set: libm:bin                         0.480000   0.860000   1.340000 (  3.355849)
+  set: libm:bin:buffer                  0.250000   0.100000   0.350000 (  0.859416)
+  set: dalli:bin                        4.270000   1.380000   5.650000 (  7.673922)
+  set: mclient:ascii                    7.020000   1.920000   8.940000 (  9.739894)
+  set: stash:bin                        2.640000   1.060000   3.700000 (  6.100208)
+  get: libm:ascii                       0.830000   0.990000   1.820000 (  3.912925)
+  get: libm:ascii:pipeline              0.780000   1.070000   1.850000 (  4.166414)
+  get: libm:ascii:udp                   0.680000   0.620000   1.300000 (  2.872687)
+  get: libm:bin                         0.690000   1.020000   1.710000 (  3.588579)
+  get: libm:bin:buffer                  0.690000   1.210000   1.900000 (  3.927647)
+  get: dalli:bin                        4.530000   1.490000   6.020000 (  8.197772)
+  get: mclient:ascii                    8.660000   1.870000  10.530000 ( 11.176572)
+  get: stash:bin                        2.310000   1.000000   3.310000 (  5.581331)
+  get-multi: libm:ascii                 0.650000   0.560000   1.210000 (  2.101080)
+  get-multi: libm:ascii:pipeline        0.750000   0.560000   1.310000 (  2.188553)
+  get-multi: libm:ascii:udp             0.710000   0.470000   1.180000 (  1.680744)
+  get-multi: libm:bin                   0.730000   0.800000   1.530000 (  4.046271)
+  get-multi: libm:bin:buffer            0.710000   0.670000   1.380000 (  2.853617)
+  get-multi: dalli:bin                  7.700000   2.190000   9.890000 ( 10.021851)
+  append: libm:ascii                    0.740000   1.000000   1.740000 (  5.609197)
+  append: libm:ascii:pipeline           0.250000   0.010000   0.260000 (  0.875205)
+  append: libm:ascii:udp                0.570000   0.560000   1.130000 (  4.695231)
+  append: libm:bin                      0.540000   0.900000   1.440000 (  4.962085)
+  append: libm:bin:buffer               0.560000   0.780000   1.340000 (  2.669085)
+  append: dalli:bin                     3.620000   1.240000   4.860000 (  8.718248)
+  append: mclient:ascii                 7.220000   1.750000   8.970000 ( 11.657408)
+  prepend: libm:ascii                   0.660000   1.040000   1.700000 (  5.461676)
+  prepend: libm:ascii:pipeline          0.260000   0.010000   0.270000 (  0.760103)
+  prepend: libm:ascii:udp               0.670000   0.600000   1.270000 (  4.324850)
+  prepend: libm:bin                     0.560000   0.900000   1.460000 (  5.801869)
+  prepend: libm:bin:buffer              0.530000   0.800000   1.330000 (  3.631074)
+  prepend: dalli:bin                    3.620000   1.240000   4.860000 (  8.531561)
+  prepend: mclient:ascii                6.400000   1.590000   7.990000 ( 12.047692)
+  delete: libm:ascii                    1.350000   0.920000   2.270000 (  4.693438)
+  delete: libm:ascii:pipeline           0.320000   0.320000   0.640000 (  0.706662)
+  delete: libm:ascii:udp                1.270000   0.660000   1.930000 (  3.851781)
+  delete: libm:bin                      1.190000   0.960000   2.150000 (  4.456707)
+  delete: libm:bin:buffer               0.230000   0.250000   0.480000 (  0.911735)
+  delete: dalli:bin                     3.850000   1.440000   5.290000 (  7.160706)
+  delete: mclient:ascii                 7.270000   1.670000   8.940000 (  9.618969)
+  get-missing: libm:ascii               1.430000   0.970000   2.400000 (  4.982100)
+  get-missing: libm:ascii:pipeline      1.480000   1.200000   2.680000 (  5.505560)
+  get-missing: libm:ascii:udp           1.340000   0.690000   2.030000 (  3.706029)
+  get-missing: libm:bin                 1.390000   0.960000   2.350000 (  4.676127)
+  get-missing: libm:bin:buffer          1.460000   1.230000   2.690000 (  5.048332)
+  get-missing: dalli:bin                3.810000   1.380000   5.190000 (  7.874001)
+  get-missing: mclient:ascii            6.920000   1.600000   8.520000 (  9.999317)
+  append-missing: libm:ascii            1.370000   0.990000   2.360000 (  5.073530)
+  append-missing: libm:ascii:pipeline   0.330000   0.010000   0.340000 (  0.374423)
+  append-missing: libm:ascii:udp        1.300000   0.690000   1.990000 (  4.005369)
+  append-missing: libm:bin              1.340000   0.920000   2.260000 (  5.339037)
+  append-missing: dalli:bin             4.020000   1.420000   5.440000 (  8.193874)
+  append-missing: mclient:ascii         6.930000   1.630000   8.560000 ( 10.637547)
+  prepend-missing: libm:ascii           1.460000   0.970000   2.430000 (  5.002199)
+  prepend-missing: libm:ascii:pipeline  0.240000   0.010000   0.250000 (  0.253590)
+  prepend-missing: libm:ascii:udp       1.370000   0.710000   2.080000 (  4.243274)
+  prepend-missing: libm:bin             1.360000   0.950000   2.310000 (  4.946014)
+  prepend-missing: dalli:bin            3.910000   1.430000   5.340000 (  7.407236)
+  prepend-missing: mclient:ascii        7.380000   1.730000   9.110000 ( 10.140385)
+  set-large: libm:ascii                 0.670000   0.980000   1.650000 (  5.181314)
+  set-large: libm:ascii:pipeline        0.410000   0.330000   0.740000 (  1.757769)
+  set-large: libm:ascii:udp             0.590000   0.670000   1.260000 (  3.510175)
+  set-large: libm:bin                   0.540000   0.980000   1.520000 (  3.878854)
+  set-large: libm:bin:buffer            0.350000   0.440000   0.790000 (  2.036610)
+  set-large: dalli:bin                  5.010000   1.670000   6.680000 (  9.884379)
+  set-large: mclient:ascii              7.500000   2.130000   9.630000 ( 11.357448)
+  set-large: stash:bin                  3.920000   1.130000   5.050000 (  7.488534)
+  get-large: libm:ascii                 0.760000   0.950000   1.710000 (  4.151140)
+  get-large: libm:ascii:pipeline        0.820000   1.190000   2.010000 (  4.079482)
+  get-large: libm:ascii:udp             0.770000   0.580000   1.350000 (  2.763797)
+  get-large: libm:bin                   0.640000   0.970000   1.610000 (  3.686591)
+  get-large: libm:bin:buffer            0.690000   1.110000   1.800000 (  3.974967)
+  get-large: dalli:bin                  4.710000   1.430000   6.140000 (  8.011834)
+  get-large: mclient:ascii              8.860000   1.970000  10.830000 ( 12.136812)
+  get-large: stash:bin                  2.420000   0.970000   3.390000 (  5.643309)
+  hash:murmur                           0.250000   0.000000   0.250000 (  0.250730)
+  hash:md5                              0.670000   0.000000   0.670000 (  0.680286)
+  hash:fnv1a_64                         0.320000   0.000000   0.320000 (  0.319818)
+  hash:fnv1a_32                         0.310000   0.000000   0.310000 (  0.328325)
+  hash:jenkins                          0.270000   0.010000   0.280000 (  0.270705)
+  hash:default                          0.410000   0.000000   0.410000 (  0.412068)
+  hash:crc                              0.380000   0.000000   0.380000 (  0.377563)
+  hash:hsieh                            0.210000   0.000000   0.210000 (  0.212948)
+  hash:fnv1_32                          0.310000   0.000000   0.310000 (  0.316208)
+  hash:fnv1_64                          0.450000   0.000000   0.450000 (  0.453148)
+  hash:none                             0.210000   0.000000   0.210000 (  0.213811)

data/CHANGELOG CHANGED

@@ -1,3 +1,5 @@
+v1.1.1. Speed up multiget. Don't cast types on unmarshalled set.
 v1.1. TTL interface requires Fixnums.
 v1.0.7. Fix build on BSD (Stew Mckinney). Fix build on Rubinius (brixen).

data/Manifest CHANGED

@@ -24,8 +24,11 @@ lib/memcached/exceptions.rb
 lib/memcached/experimental.rb
 lib/memcached/memcached.rb
 lib/memcached/rails.rb
+lib/rlibmemcached.bundle.dSYM/Contents/Info.plist
 test/profile/benchmark.rb
-test/profile/profile.rb
+test/profile/c_profiler.rb
+test/profile/exercise.rb
+test/profile/rb_profiler.rb
 test/profile/valgrind.rb
 test/setup.rb
 test/teardown.rb

data/Rakefile CHANGED

@@ -4,8 +4,6 @@ Echoe.new("memcached") do |p|
   p.author = "Evan Weaver"
   p.project = "fauna"
   p.summary = "An interface to the libmemcached C client."
-  p.url = "http://blog.evanweaver.com/files/doc/fauna/memcached/"
-  p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
   p.rdoc_pattern = /README|TODO|LICENSE|CHANGELOG|BENCH|COMPAT|exceptions|experimental.rb|behaviors|rails.rb|memcached.rb/
   p.clean_pattern += ["ext/lib", "ext/include", "ext/share", "ext/libmemcached-?.??", "ext/bin", "ext/conftest.dSYM"]
 end
@@ -22,10 +20,18 @@ task :exceptions do
   end
 end
-task :valgrind do
-  exec("valgrind  --tool=memcheck --leak-check=full --show-reachable=no --num-callers=15 --track-fds=yes --workaround-gcc296-bugs=yes --max-stackframe=7304328 --dsymutil=yes --track-origins=yes ruby #{File.dirname(__FILE__)}/test/profile/valgrind.rb")
+task :benchmark do
+ exec("ruby #{File.dirname(__FILE__)}/test/profile/benchmark.rb")
+end
+task :rb_profile do
+ exec("ruby #{File.dirname(__FILE__)}/test/profile/rb_profiler.rb")
 end
-task :profile do
- exec("ruby #{File.dirname(__FILE__)}/test/profile/profile.rb")
+task :c_profile do
+ exec("ruby #{File.dirname(__FILE__)}/test/profile/c_profiler.rb")
+end
+task :valgrind do
+ exec("ruby #{File.dirname(__FILE__)}/test/profile/valgrind.rb")
 end

data/lib/memcached/memcached.rb CHANGED

@@ -308,7 +308,7 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
   # Also accepts a <tt>marshal</tt> value, which defaults to <tt>true</tt>. Set <tt>marshal</tt> to <tt>false</tt> if you want the <tt>value</tt> to be set directly.
   #
   def set(key, value, ttl=@default_ttl, marshal=true, flags=FLAGS)
-    value = marshal ? Marshal.dump(value) : value.to_s
+    value = marshal ? Marshal.dump(value) : value
     begin
       check_return_code(
         Lib.memcached_set(@struct, key, value, ttl, flags),
@@ -325,7 +325,7 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
   # Add a key/value pair. Raises <b>Memcached::NotStored</b> if the key already exists on the server. The parameters are the same as <tt>set</tt>.
   def add(key, value, ttl=@default_ttl, marshal=true, flags=FLAGS)
-    value = marshal ? Marshal.dump(value) : value.to_s
+    value = marshal ? Marshal.dump(value) : value
     begin
       check_return_code(
         Lib.memcached_add(@struct, key, value, ttl, flags),
@@ -374,7 +374,7 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
   # Replace a key/value pair. Raises <b>Memcached::NotFound</b> if the key does not exist on the server. The parameters are the same as <tt>set</tt>.
   def replace(key, value, ttl=@default_ttl, marshal=true, flags=FLAGS)
-    value = marshal ? Marshal.dump(value) : value.to_s
+    value = marshal ? Marshal.dump(value) : value
     begin
       check_return_code(
          Lib.memcached_replace(@struct, key, value, ttl, flags),
@@ -504,14 +504,14 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
       check_return_code(ret, keys)
       hash = {}
-      keys.each do
-        value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
-        break if ret == Lib::MEMCACHED_END
-        if ret != Lib::MEMCACHED_NOTFOUND
-          check_return_code(ret, key)
-          # Assign the value
+      value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
+      while ret != 21 do # Lib::MEMCACHED_END
+        if ret == 0 # Lib::MEMCACHED_SUCCESS
           hash[key] = (marshal ? Marshal.load(value) : value)
+        elsif ret != 16 # Lib::MEMCACHED_NOTFOUND
+          check_return_code(ret, key)
         end
+        value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
       end
       hash
     else
@@ -591,28 +591,34 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
   # Checks the return code from Rlibmemcached against the exception list. Raises the corresponding exception if the return code is not Memcached::Success or Memcached::ActionQueued. Accepts an integer return code and an optional key, for exception messages.
   def check_return_code(ret, key = nil) #:doc:
-    if ret == 0 # Memcached::Success
-    elsif ret == Lib::MEMCACHED_BUFFERED # Memcached::ActionQueued
-    elsif ret == Lib::MEMCACHED_NOTFOUND and @not_found
-      raise @not_found
-    elsif ret == Lib::MEMCACHED_NOTSTORED and @not_stored
-      raise @not_stored
+    if ret == 0 # Lib::MEMCACHED_SUCCESS
+    elsif ret == 32 # Lib::MEMCACHED_BUFFERED
+    elsif ret == 16
+      raise @not_found # Lib::MEMCACHED_NOTFOUND
+    elsif ret == 14
+      raise @not_stored # Lib::MEMCACHED_NOTSTORED
     else
-      message = "Key #{inspect_keys(key, (detect_failure if ret == Lib::MEMCACHED_SERVER_MARKED_DEAD)).inspect}"
-      if key.is_a?(String)
-        if ret == Lib::MEMCACHED_ERRNO
-          if (server = Lib.memcached_server_by_key(@struct, key)).is_a?(Array)
-            errno = server.first.cached_errno
-            message = "Errno #{errno}: #{ERRNO_HASH[errno].inspect}. #{message}"
-          end
-        elsif ret == Lib::MEMCACHED_SERVER_ERROR
-          if (server = Lib.memcached_server_by_key(@struct, key)).is_a?(Array)
-            message = "\"#{server.first.cached_server_error}\". #{message}."
-          end
+      reraise(key, ret)
+    end
+  rescue TypeError
+    reraise(key, ret)
+  end
+  def reraise(key, ret)
+    message = "Key #{inspect_keys(key, (detect_failure if ret == Lib::MEMCACHED_SERVER_MARKED_DEAD)).inspect}"
+    if key.is_a?(String)
+      if ret == Lib::MEMCACHED_ERRNO
+        if (server = Lib.memcached_server_by_key(@struct, key)).is_a?(Array)
+          errno = server.first.cached_errno
+          message = "Errno #{errno}: #{ERRNO_HASH[errno].inspect}. #{message}"
+        end
+      elsif ret == Lib::MEMCACHED_SERVER_ERROR
+        if (server = Lib.memcached_server_by_key(@struct, key)).is_a?(Array)
+          message = "\"#{server.first.cached_server_error}\". #{message}."
         end
       end
-      raise EXCEPTIONS[ret], message
     end
+    raise EXCEPTIONS[ret], message
   end
   # Turn an array of keys into a hash of keys to servers.

data/lib/rlibmemcached.bundle.dSYM/Contents/Info.plist ADDED

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.rlibmemcached.bundle</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>

data/memcached.gemspec CHANGED

@@ -2,18 +2,18 @@
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.1"
+  s.version = "1.1.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-02-23}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
-  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/profile.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
-  s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/memcached/}
+  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/rlibmemcached.bundle.dSYM/Contents/Info.plist", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
+  s.homepage = %q{http://fauna.github.com/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{fauna}

data/test/profile/benchmark.rb CHANGED

@@ -120,8 +120,12 @@ class Bench
   end
   def benchmark_clients(test_name, populate_keys = true)
+    return if ENV["TEST"] and !test_name.include?(ENV["TEST"])
     @clients.keys.sort.each do |client_name|
+      next if ENV["CLIENT"] and !client_name.include?(ENV["CLIENT"])
       next if client_name == "stash" and test_name == "set-large" # Don't let stash break the world
       client = @clients[client_name]
       begin
         if populate_keys

data/test/profile/c_profiler.rb ADDED

@@ -0,0 +1,14 @@
+require "#{File.dirname(__FILE__)}/../setup"
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib/"
+require 'memcached'
+profile = "/tmp/memcached_#{Memcached::VERSION}_c"
+system("env CPUPROFILE_FREQUENCY=500 CPUPROFILE=#{profile}.out DYLD_INSERT_LIBRARIES=/opt/local/lib/libprofiler.dylib ruby -r#{File.dirname(__FILE__)}/exercise -e \"Worker.new('mixed', 200000).work\"")
+ruby = `which ruby`.chomp
+system("pprof --nodefraction=0.0000001 --text #{ruby} #{profile}.out")
+system("pprof --nodefraction=0.0000001 --pdf #{ruby} #{profile}.out > #{profile}.pdf")
+system("open #{profile}.pdf")

data/test/profile/exercise.rb ADDED

@@ -0,0 +1,150 @@
+require "#{File.dirname(__FILE__)}/../setup"
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib/"
+require 'memcached'
+require 'rubygems'
+require 'ostruct'
+GC.copy_on_write_friendly = true if GC.respond_to?("copy_on_write_friendly=")
+Struct
+class Worker
+  def initialize(method_name, iterations, with_memory = 'false')
+    @method = method_name || 'mixed'
+    @i = (iterations || 10000).to_i
+    @with_memory = with_memory
+    puts "*** Running #{@method.inspect} test for #{@i} loops. ***"
+    @key1 = "key1--------------------------------"
+    @key2 = "key2--------------------------------"
+    @key3 = "key3--------------------------------"
+    @value = OpenStruct.new(
+      :a => 1, :b => 2, "array" => [1, 2, 3], "hash" => {:badger => 1}
+    )
+    @marshalled = Marshal.dump(@value)
+    @opts = [
+      ['localhost:43042', 'localhost:43043', 'localhost:43044'],
+      {
+        :buffer_requests => true,
+        :no_block => true,
+        :noreply => true,
+        :namespace => "namespace"
+      }
+    ]
+    @cache = Memcached::Rails.new(*@opts)
+    @cache.set @key1, @value
+  end
+  def work
+    case @method
+      when "set"
+        @i.times do
+          @cache.set @key1, @value
+        end
+      when "get"
+        @i.times do
+          @cache.get @key1
+        end
+      when "delete"
+        @i.times do
+          @cache.set @key1, @value
+          @cache.delete @key1
+        end
+      when "delete-miss"
+        @i.times do
+          @cache.delete @key1
+        end
+      when "get-miss"
+        @i.times do
+          @cache.get @key2
+        end
+      when "get-increasing"
+        one_k = "x"*1024
+        @i.times do |i|
+          @cache.set @key1, one_k*(i+1), 0, false
+          @cache.get @key1, false
+        end
+      when "get-miss-increasing"
+        @i.times do |i|
+          @cache.delete @key2
+          @cache.get @key2
+        end
+      when "add"
+        @i.times do
+          @cache.delete @key1
+          @cache.add @key1, @value
+        end
+      when "add-present"
+        @cache.set @key1, @value
+        @i.times do
+          @cache.add @key1, @value
+        end
+      when "mixed"
+        @i.times do
+          @cache.set @key1, @value
+          @cache.set @key2, @value
+          @cache.get @key1
+          @cache.get @key3
+          @cache.get [@key1, @key2, @key3]
+          @cache.prepend @key1, @marshalled
+          @cache.prepend @key2, @marshalled
+          @cache.delete @key1
+          @cache.delete @key2
+        end
+      when "stats"
+        @i.times do
+          @cache.stats
+        end
+      when "multiget"
+        @i.times do
+          @cache.get([@key1, @key2])
+        end
+      when "clone"
+        @i.times do
+          cache = @cache.clone
+        end
+      when "reset"
+        @i.times do
+          @cache.reset
+        end
+      when "servers"
+        @i.times do
+          @cache.servers
+        end
+      when "server_by_key"
+        @i.times do
+          @cache.server_by_key(@key1)
+        end
+      else
+        raise "No such method"
+    end
+    if @with_memory == "true"
+      puts "*** Garbage collect. ***"
+      10.times do
+        GC.start
+        sleep 0.1
+      end
+      sts, server_sts, clients = 0, 0, 0
+      ObjectSpace.each_object(Memcached) { clients += 1 }
+      ObjectSpace.each_object(Rlibmemcached::MemcachedSt) { sts += 1 }
+      ObjectSpace.each_object(Rlibmemcached::MemcachedServerSt) { server_sts += 1 }
+      puts "*** Structs: #{sts} ***"
+      puts "*** Server structs: #{server_sts} ***"
+      puts "*** Clients: #{clients} ***"
+      begin;
+        require 'memory'
+        Process.memory.each { |key, value| puts "#{key}: #{value/1024.0}M" }
+      rescue LoadError
+      end
+    end
+  end
+end

data/test/profile/rb_profiler.rb ADDED

@@ -0,0 +1,21 @@
+require "#{File.dirname(__FILE__)}/../setup"
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib/"
+ENV['CPUPROFILE_FREQUENCY'] = '500'
+require 'memcached'
+require 'rubygems'
+require 'perftools'
+require "#{HERE}/profile/exercise"
+profile = "/tmp/memcached_#{Memcached::VERSION}_rb"
+worker = Worker.new('mixed', 200000)
+PerfTools::CpuProfiler.start("#{profile}.out") do
+  worker.work
+end
+system("pprof.rb --nodefraction=0.0000001 --text #{profile}.out")
+system("pprof.rb --nodefraction=0.0000001 --edgefraction=0.0000001 --pdf #{profile}.out > #{profile}.pdf")
+system("open #{profile}.pdf")

data/test/profile/valgrind.rb CHANGED

@@ -1,149 +1,3 @@
 require "#{File.dirname(__FILE__)}/../setup"
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib/"
-require 'memcached'
-require 'rubygems'
-GC.copy_on_write_friendly = true if GC.respond_to?("copy_on_write_friendly=")
-class Worker
-  def initialize(method_name, iterations)
-    @method = method_name || 'mixed'
-    @i = (iterations || 10000).to_i
-    puts "*** Running #{@method.inspect} test for #{@i} loops. ***"
-    @key1 = "key1-"*8
-    @key2 = "key2-"*8
-    @value = []
-    @marshalled = Marshal.dump(@value)
-    @opts = [
-      ["#{UNIX_SOCKET_NAME}0", "#{UNIX_SOCKET_NAME}1"],
-      {
-        :buffer_requests => false,
-        :no_block => false,
-        :namespace => "namespace"
-      }
-    ]
-    @cache = Memcached.new(*@opts)
-    @cache.set @key1, @value
-  end
-  def work
-    case @method
-      when "set"
-        @i.times do
-          @cache.set @key1, @value
-        end
-      when "get"
-        @i.times do
-          @cache.get @key1
-        end
-      when "delete"
-        @i.times do
-          @cache.set @key1, @value
-          @cache.delete @key1
-        end
-      when "delete-miss"
-        @i.times do
-          @cache.delete @key1
-        end
-      when "get-miss"
-        @i.times do
-          begin
-            @cache.get @key2
-          rescue Memcached::NotFound
-          end
-        end
-      when "get-increasing"
-        one_k = "x"*1024
-        @i.times do |i|
-          @cache.set @key1, one_k*(i+1), 0, false
-          @cache.get @key1, false
-        end
-      when "get-miss-increasing"
-        @i.times do |i|
-          @cache.delete @key2 rescue nil
-          begin
-            @cache.get @key2
-          rescue Memcached::NotFound
-          end
-        end
-      when "add"
-        @i.times do
-          begin
-            @cache.delete @key1
-          rescue
-          end
-          @cache.add @key1, @value
-        end
-      when "add-present"
-        @cache.set @key1, @value
-        @i.times do
-          begin
-            @cache.add @key1, @value
-          rescue Memcached::NotStored
-          end
-        end
-      when "mixed"
-        @i.times do
-          @cache.set @key1, @value
-          @cache.get @key1
-        end
-      when "stats"
-        @i.times do
-          @cache.stats
-        end
-      when "multiget"
-        @i.times do
-          @cache.get([@key1, @key2])
-        end
-      when "clone"
-        @i.times do
-          cache = @cache.clone
-        end
-      when "reset"
-        @i.times do
-          @cache.reset
-        end
-      when "servers"
-        @i.times do
-          @cache.servers
-        end
-      when "server_by_key"
-        @i.times do
-          @cache.server_by_key(@key1)
-        end
-      else
-        raise "No such method"
-    end
-    puts "*** Garbage collect. ***"
-    10.times do
-      GC.start
-      sleep 0.1
-    end
-    sts, server_sts, clients = 0, 0, 0
-    ObjectSpace.each_object(Memcached) { clients += 1 }
-    ObjectSpace.each_object(Rlibmemcached::MemcachedSt) { sts += 1 }
-    ObjectSpace.each_object(Rlibmemcached::MemcachedServerSt) { server_sts += 1 }
-    puts "*** Structs: #{sts} ***"
-    puts "*** Server structs: #{server_sts} ***"
-    puts "*** Clients: #{clients} ***"
-  end
-end
-Worker.new(ENV['METHOD'], ENV['LOOPS']).work
-begin
-  require 'memory'
-  Process.memory.each do |key, value|
-    puts "#{key}: #{value/1024.0}M"
-  end
-rescue LoadError
-end
+exec("valgrind  --tool=memcheck --leak-check=full --show-reachable=no --num-callers=15 --track-fds=yes --workaround-gcc296-bugs=yes --max-stackframe=7304328 --dsymutil=yes --track-origins=yes ruby -r#{File.dirname(__FILE__)}/exercise.rb -e \"Worker.new('mixed', 10000, 'true').work\"")

data/test/unit/memcached_test.rb CHANGED

@@ -177,9 +177,8 @@ class MemcachedTest < Test::Unit::TestCase
   end
   def test_initialize_with_backtraces
-    cache = Memcached.new @servers,
-      :show_backtraces => true
-    cache.delete key rescue
+    cache = Memcached.new @servers, :show_backtraces => true
+    cache.delete key rescue nil
     begin
       cache.get key
     rescue Memcached::NotFound => e
@@ -404,9 +403,21 @@ class MemcachedTest < Test::Unit::TestCase
     assert_equal @marshalled_value, result
   end
+  def test_set_unmarshalled_and_get_unmarshalled
+    @cache.set key, @marshalled_value, 0, false
+    result = @cache.get key, false
+    assert_equal @marshalled_value, result
+  end
+  def test_set_unmarshalled_error
+    assert_raises(TypeError) do
+      @cache.set key, @value, 0, false
+    end
+  end
   def test_get_multi_unmarshalled
-    @cache.set "#{key}_1", 1, 0, false
-    @cache.set "#{key}_2", 2, 0, false
+    @cache.set "#{key}_1", "1", 0, false
+    @cache.set "#{key}_2", "2", 0, false
     assert_equal(
       {"#{key}_1" => "1", "#{key}_2" => "2"},
       @cache.get(["#{key}_1", "#{key}_2"], false)
@@ -415,7 +426,7 @@ class MemcachedTest < Test::Unit::TestCase
   def test_get_multi_mixed_marshalling
     @cache.set "#{key}_1", 1
-    @cache.set "#{key}_2", 2, 0, false
+    @cache.set "#{key}_2", "2", 0, false
     assert_nothing_raised do
       @cache.get(["#{key}_1", "#{key}_2"], false)
     end
@@ -429,12 +440,15 @@ class MemcachedTest < Test::Unit::TestCase
     cache.flush
     20.times { |i| cache.set "#{key}#{i}", @value }
-    cache, hits = Memcached.new(@servers.first), 0
-    20.times do |i|
-      begin
-        cache.get "#{key}#{i}"
-        hits += 1
-      rescue Memcached::NotFound
+    cache, hits = Memcached.new(@servers.first), 4
+    while hits == 4 do
+      hits = 0
+      20.times do |i|
+        begin
+          cache.get "#{key}#{i}"
+          hits += 1
+        rescue Memcached::NotFound
+        end
       end
     end
@@ -563,12 +577,12 @@ class MemcachedTest < Test::Unit::TestCase
   # Increment and decrement
   def test_increment
-    @cache.set key, 10, 0, false
+    @cache.set key, "10", 0, false
     assert_equal 11, @cache.increment(key)
   end
   def test_increment_offset
-    @cache.set key, 10, 0, false
+    @cache.set key, "10", 0, false
     assert_equal 15, @cache.increment(key, 5)
   end
@@ -580,12 +594,12 @@ class MemcachedTest < Test::Unit::TestCase
   end
   def test_decrement
-    @cache.set key, 10, 0, false
+    @cache.set key, "10", 0, false
     assert_equal 9, @cache.decrement(key)
   end
   def test_decrement_offset
-    @cache.set key, 10, 0, false
+    @cache.set key, "10", 0, false
     assert_equal 5, @cache.decrement(key, 5)
   end

metadata CHANGED

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: memcached
 version: !ruby/object:Gem::Version
-  hash: 13
+  hash: 17
   prerelease: false
   segments:
   - 1
   - 1
-  version: "1.1"
+  - 1
+  version: 1.1.1
 platform: ruby
 authors:
 - Evan Weaver
@@ -35,7 +36,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-02-23 00:00:00 -08:00
 default_executable:
 dependencies: []
@@ -84,8 +85,11 @@ files:
 - lib/memcached/experimental.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
+- lib/rlibmemcached.bundle.dSYM/Contents/Info.plist
 - test/profile/benchmark.rb
-- test/profile/profile.rb
+- test/profile/c_profiler.rb
+- test/profile/exercise.rb
+- test/profile/rb_profiler.rb
 - test/profile/valgrind.rb
 - test/setup.rb
 - test/teardown.rb
@@ -96,7 +100,7 @@ files:
 - test/unit/rails_test.rb
 - memcached.gemspec
 has_rdoc: true
-homepage: http://blog.evanweaver.com/files/doc/fauna/memcached/
+homepage: http://fauna.github.com/fauna/memcached/
 licenses: []
 post_install_message:

metadata.gz.sig CHANGED

Binary file

data/test/profile/profile.rb DELETED

@@ -1,14 +0,0 @@
-require "#{File.dirname(__FILE__)}/../setup"
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib/"
-require 'rubygems'
-require 'memcached'
-require 'ruby-prof'
-result = RubyProf.profile do
-  load "#{HERE}/profile/valgrind.rb"
-end
-printer = RubyProf::GraphPrinter.new(result)
-printer.print(STDOUT, 0)