memcached 0.7 → 0.7.1

data/CHANGELOG

@@ -1,5 +1,7 @@
 
-v0.7. Rails compatibility wrapper; real multiget; rescue UnknownReadFailure in Interlock::Rails#get.
+v0.7.1. Allow for explicit resetting of the struct on each request, at least until Brian fixes the synchronization problem.
+
+v0.7. Rails compatibility wrapper; real multiget; rescue UnknownReadFailures in order to reset the struct..
 
 v0.6. Better documentation; benchmark suite; improve buffered IO API; remove namespace accessor in favor of generic options hash; patch up extconf.rb to handle unusual library situations; increase test coverage.
 

data/lib/memcached/memcached.rb

@@ -113,6 +113,13 @@ Please note that when non-blocking IO is enabled, setter and deleter methods do
     end
   end  
   
+  # Reset the state of the libmemcached struct. Fixes out-of-sync errors with the Memcached pool.
+  def reset
+    new_struct = Rlibmemcached.memcached_clone(nil, @struct)
+    Rlibmemcached.memcached_free(@struct)
+    @struct = new_struct
+  end  
+  
   #:stopdoc:
   alias :dup :clone #:nodoc:
   #:startdoc:
@@ -316,12 +323,6 @@ Please note that when non-blocking IO is enabled, setter and deleter methods do
     # 0.14 returns 0 for an ActionQueued result but 0.15 does not.
     return if ret == 0 or ret == 31
     raise EXCEPTIONS[ret], ""
-  rescue UnknownReadFailure
-    # libmemcached got out of sync; rebuild the struct
-    new_struct = Rlibmemcached.memcached_clone(nil, @struct)
-    Rlibmemcached.memcached_free(@struct)
-    @struct = new_struct
-    raise SynchronizationError, "Rebuilding @struct"
   end  
     
 end

data/lib/memcached/rails.rb

@@ -4,6 +4,10 @@ class Memcached
   alias :get_multi :get #:nodoc:
 
   # A legacy compatibility wrapper for the Memcached class. It has basic compatibility with the <b>memcache-client</b> API.
+  #
+  # There is currently a libmemcached stability issue with long-lived instances, so you will want to call Memcached#reset before each
+  # request (for example, in an ActionController filter).
+  #
   class Rails < ::Memcached
     
     DEFAULTS = {}

data/memcached.gemspec

@@ -1,10 +1,10 @@
 
-# Gem::Specification for Memcached-0.7
+# Gem::Specification for Memcached-0.7.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.7"
+  s.version = "0.7.1"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 

data/test/unit/memcached_test.rb

@@ -458,6 +458,15 @@ class MemcachedTest < Test::Unit::TestCase
     threads.each {|thread| thread.join}
   end
   
+  def test_reset
+    original_struct = @cache.instance_variable_get("@struct")
+    assert_nothing_raised do
+      @cache.reset
+    end 
+    assert_not_equal original_struct, 
+      @cache.instance_variable_get("@struct") 
+  end
+  
   private
   
   def key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: 0.7.1
 platform: ruby
 authors: 
 - Evan Weaver