memcached 1.0.2 → 1.0.5

data/BENCHMARKS

@@ -7,7 +7,7 @@ You can easily run your own benchmarks, as long as you have memcached itself on
 
 == x86-64 OS X
 
-These benchmarks were run on an OS X 10.5 Core 2 Duo machine:
+These benchmarks were run on a 64-bit multicore Linux machine, with memcached 1.4.4:
 
   Darwin amber.local 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 16:55:01 PDT 
   2009; root:xnu-1228.15.4~1/RELEASE_I386 i386
@@ -125,3 +125,4 @@ These benchmarks were run on an OS X 10.5 Core 2 Duo machine:
   hash:murmur                           0.210000   0.000000   0.210000 (  0.203083)
   hash:jenkins                          0.240000   0.000000   0.240000 (  0.245728)
   hash:none                             0.120000   0.000000   0.120000 (  0.121219)
+

data/CHANGELOG

@@ -1,3 +1,8 @@
+v1.0.5. Fix Manifest.
+
+v1.0.4. Fix server_failure_count mangling in memcached_quit.
+
+v1.0.3. Clearer benchmarking.
 
 v1.0.2. Don't allow compilation with -O3.
 

data/Manifest

@@ -11,6 +11,7 @@ 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
@@ -23,6 +24,7 @@ lib/memcached/experimental.rb
 lib/memcached/integer.rb
 lib/memcached/memcached.rb
 lib/memcached/rails.rb
+memcached.gemspec
 test/profile/benchmark.rb
 test/profile/profile.rb
 test/profile/valgrind.rb

data/ext/extconf.rb

@@ -71,6 +71,10 @@ def check_libmemcached
       puts(cmd = "#{patch} -p1 -Z < libmemcached-5.patch")
       raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
 
+      puts "Patching libmemcached for failure count breakage."
+      puts(cmd = "#{patch} -p1 -Z < libmemcached-6.patch")
+      raise "'#{cmd}' failed" unless system(cmd) or ENV['DEV']
+
       puts "Touching aclocal.m4  in libmemcached."
       puts(cmd = "touch -r #{BUNDLE_PATH}/m4/visibility.m4 #{BUNDLE_PATH}/configure.ac #{BUNDLE_PATH}/m4/pandora_have_sasl.m4")
       raise "'#{cmd}' failed" unless system(cmd)

data/ext/libmemcached-6.patch

@@ -0,0 +1,20 @@
+diff --git a/libmemcached-0.32/libmemcached/memcached_quit.c b/libmemcached-0.32/libmemcached/memcached_quit.c
+index 9a200a1..80a03bc 100644
+--- a/libmemcached-0.32/libmemcached/memcached_quit.c
++++ b/libmemcached-0.32/libmemcached/memcached_quit.c
+@@ -49,7 +49,14 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
+     memcached_server_response_reset(ptr);
+   }
+ 
+-  ptr->server_failure_counter++;
++  if (io_death)
++  {
++    ptr->server_failure_counter++;
++  }
++  else
++  {
++    ptr->server_failure_counter = 0;
++  }
+ }
+ 
+ void memcached_quit(memcached_st *ptr)

data/ext/rlibmemcached.i

@@ -23,6 +23,7 @@
 
 %apply unsigned short { uint8_t };
 %apply unsigned int { uint16_t };
+%apply unsigned int { uint32_t server_failure_counter };
 %apply unsigned int { uint32_t user_spec_len };
 %apply unsigned long { uint32_t flags, uint32_t offset, uint32_t weight };
 %apply unsigned long long { uint64_t data, uint64_t cas };

data/ext/rlibmemcached_wrap.c

@@ -10924,8 +10924,8 @@ _wrap_MemcachedServerSt_server_failure_counter_set(int argc, VALUE *argv, VALUE
   uint32_t arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 ;
-  int res2 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -10935,17 +10935,11 @@ _wrap_MemcachedServerSt_server_failure_counter_set(int argc, VALUE *argv, VALUE
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct memcached_server_st *","server_failure_counter", 1, self )); 
   }
   arg1 = (struct memcached_server_st *)(argp1);
-  {
-    res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_uint32_t,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "uint32_t","server_failure_counter", 2, argv[0] )); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "uint32_t","server_failure_counter", 2, argv[0]));
-    } else {
-      arg2 = *((uint32_t *)(argp2));
-    }
-  }
+  ecode2 = SWIG_AsVal_unsigned_SS_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "uint32_t","server_failure_counter", 2, argv[0] ));
+  } 
+  arg2 = (uint32_t)(val2);
   if (arg1) (arg1)->server_failure_counter = arg2;
   return Qnil;
 fail:
@@ -10970,9 +10964,7 @@ _wrap_MemcachedServerSt_server_failure_counter_get(int argc, VALUE *argv, VALUE
   }
   arg1 = (struct memcached_server_st *)(argp1);
   result =  ((arg1)->server_failure_counter);
-  {
-    vresult = UINT2NUM(result);
-  }
+  vresult = SWIG_From_unsigned_SS_int((unsigned int)(result));
   return vresult;
 fail:
   return Qnil;

data/memcached.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.0.2"
+  s.version = "1.0.5"
 
   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{2010-10-28}
+  s.date = %q{2011-01-27}
   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.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.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/integer.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.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "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/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "memcached.gemspec", "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"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]

data/test/profile/benchmark.rb

@@ -10,12 +10,15 @@ require 'ruby-debug' if ENV['DEBUG']
 begin; require 'memory'; rescue LoadError; end
 
 puts `uname -a`
+puts `ruby -v`
+puts `env | egrep '^RUBY'`
 puts "Ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
 
 [ ["memcached", "memcached"], 
   ["remix-stash", "remix/stash"], 
   # ["astro-remcached", "remcached"], # Clobbers the "Memcached" constant
   ["memcache-client", "memcache"],
+  ["kgio", "kgio"],
   ["dalli","dalli"]].each do |gem_name, requirement|
   require requirement
   gem gem_name
@@ -121,9 +124,9 @@ class Bench
       begin
         yield client
         @benchmark.report("#{test_name}: #{client_name}") { @loops.times { yield client } }
-      rescue => e
-        # puts "#{test_name}:#{client_name} => #{e.inspect}"
-        # reset_clients
+      rescue Exception => e
+        puts "#{test_name}:#{client_name} => #{e.inspect}"
+        reset_clients
       end
     end
     puts

data/test/unit/memcached_test.rb

@@ -1046,6 +1046,30 @@ class MemcachedTest < Test::Unit::TestCase
     socket.close
   end
 
+  def test_wrong_failure_counter
+    cache = Memcached.new(
+      [@servers.last],
+      :prefix_key => @prefix_key,
+      :auto_eject_hosts => true,
+      :server_failure_limit => 1,
+      :retry_timeout => 1,
+      :hash_with_prefix_key => false,
+      :hash => :md5,
+      :exception_retry_limit => 0
+                          )
+
+    # This is an abuse of knowledge, but it's necessary to verify that
+    # the library is handling the counter properly.
+    struct = cache.instance_variable_get(:@struct)
+    server = Memcached::Lib.memcached_server_by_key(struct, "marmotte").first
+
+    # set to ensure connectivity
+    cache.set("marmotte", "milk")
+    server.server_failure_counter = 0
+    cache.quit
+    assert_equal 0, server.server_failure_counter
+  end
+
   def test_missing_server
     cache = Memcached.new(
       [@servers.last, 'localhost:43041'],

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Evan Weaver
@@ -35,7 +36,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2010-10-28 00:00:00 -07:00
+date: 2011-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -71,6 +72,7 @@ files:
 - 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
@@ -83,6 +85,7 @@ files:
 - lib/memcached/integer.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
+- memcached.gemspec
 - test/profile/benchmark.rb
 - test/profile/profile.rb
 - test/profile/valgrind.rb
@@ -93,7 +96,6 @@ files:
 - test/unit/memcached_experimental_test.rb
 - test/unit/memcached_test.rb
 - test/unit/rails_test.rb
-- memcached.gemspec
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/memcached/
 licenses: []
@@ -114,6 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -122,6 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2