memcache-client 1.8.1 → 1.8.2

data/History.rdoc

@@ -1,3 +1,7 @@
+= 1.8.2 (2010-04-03)
+
+ * Fix concurrency issues with eventmachine support.
+
 = 1.8.1 (2010-03-20)
 
  * Only require SystemTimer if the Ruby VM looks like MRI.

data/lib/memcache.rb

@@ -110,7 +110,7 @@ class MemCache
   # Please note this feature only works in memcached 1.2.5 and later.  Earlier
   # versions will reply with "ERROR".
   attr_reader :no_reply
-
+  
   ##
   # Accepts a list of +servers+ and a list of +opts+.  +servers+ may be
   # omitted.  See +servers=+ for acceptable server list arguments.
@@ -154,10 +154,11 @@ class MemCache
       raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
     end
 
+    @evented = defined?(EM) && EM.reactor_running?
     opts = DEFAULT_OPTIONS.merge opts
     @namespace    = opts[:namespace]
     @readonly     = opts[:readonly]
-    @multithread  = opts[:multithread]
+    @multithread  = opts[:multithread] && !@evented
     @autofix_keys = opts[:autofix_keys]
     @timeout      = opts[:timeout]
     @failover     = opts[:failover]
@@ -170,6 +171,7 @@ class MemCache
     logger.info { "memcache-client #{VERSION} #{Array(servers).inspect}" } if logger
 
     Thread.current[:memcache_client] = self.object_id if !@multithread
+    
 
     self.servers = servers
   end
@@ -946,6 +948,7 @@ class MemCache
 
   def check_multithread_status!
     return if @multithread
+    return if @evented
 
     if Thread.current[:memcache_client] != self.object_id
       raise MemCacheError, <<-EOM
@@ -1011,6 +1014,8 @@ class MemCache
       @status = 'NOT CONNECTED'
       @timeout = memcache.timeout
       @logger = memcache.logger
+      
+      self.extend(MemCache::EventedServer) if defined?(EM) and EM.reactor_running?
     end
 
     ##
@@ -1101,8 +1106,7 @@ class MemCache
     # Mark the server as dead and close its socket.
 
     def mark_dead(error)
-      @sock.close if @sock && !@sock.closed?
-      @sock   = nil
+      close
       @retry  = Time.now + RETRY_DELAY
 
       reason = "#{error.class.name}: #{error.message}"

data/lib/memcache/event_machine.rb

@@ -2,42 +2,62 @@
 
 raise "memcache/event_machine requires Ruby 1.9" if RUBY_VERSION < '1.9'
 
+require 'memcache'
+require 'eventmachine'
 require 'fiber'
 
-class MemCache::Server
+class MemCache
   
-  alias :blocking_socket :socket
-    
-  def socket
-    # Support plain old TCP socket connections if the user
-    # has not setup EM.  Much easier to deal with in irb, 
-    # script/console, etc.
-    return blocking_socket if !EM.reactor_running?
+  # Since we are working in a single Thread, multiple Fiber environment,
+  # disable the multithread Mutex as it will not work.
+#  DEFAULT_OPTIONS[:multithread] = false
 
-    return @sock if @sock and not @sock.closed?
+  module EventedServer
 
-    @sock = nil
+    def fiber_key
+      @fiber_key ||= "memcached-#{@host}-#{@port}"
+    end
+    
+    def socket
+      sock = Thread.current[fiber_key]
+      return sock if sock and not sock.closed?
 
-    # If the host was dead, don't retry for a while.
-    return if @retry and @retry > Time.now
+      Thread.current[fiber_key] = nil
+
+      # If the host was dead, don't retry for a while.
+      return if @retry and @retry > Time.now
     
-    fiber = Fiber.current
-    @sock = EM::SocketConnection.connect(@host, @port, @timeout)
-    yielding = true
-    @sock.callback do
-      @status = 'CONNECTED'
-      @retry  = nil
-      yielding = false
-      fiber.resume if Fiber.current != fiber
+      Thread.current[fiber_key] ||= begin
+        sock = EM::SocketConnection.connect(@host, @port, @timeout)
+        yielding = true
+        fiber = Fiber.current
+        sock.callback do
+          @status = 'CONNECTED'
+          @retry  = nil
+          yielding = false
+          fiber.resume if Fiber.current != fiber
+        end
+        sock.errback do
+          sock = nil
+          yielding = false
+          fiber.resume if Fiber.current != fiber
+        end
+        Fiber.yield if yielding
+        sock
+      end
     end
-    @sock.errback do
-      yielding = false
-      fiber.resume if Fiber.current != fiber
+
+    def close
+      sock = Thread.current[fiber_key]
+      if sock
+        sock.close if !sock.closed?
+        Thread.current[fiber_key] = nil
+      end
+      @retry  = nil
+      @status = "NOT CONNECTED"
     end
-    Fiber.yield if yielding
-    @sock
+
   end
-  
 end
 
 module EM
@@ -127,7 +147,11 @@ module EM
     end
 
     def unbind
-      @connected = false
+      if @connected
+        @connected = false
+      else
+        fail
+      end
     end
     
     private

data/lib/memcache/version.rb

@@ -2,5 +2,5 @@ class MemCache
   ##
   # The version of MemCache you are using.
 
-  VERSION = "1.8.1"
+  VERSION = "1.8.2"
 end

data/test/test_event_machine.rb

@@ -4,6 +4,52 @@ require 'memcache'
 
 class TestEventMachine < Test::Unit::TestCase
 
+  def test_concurrent_fibers
+    return puts("Skipping EventMachine test, not Ruby 1.9") if RUBY_VERSION < '1.9'
+    return puts("Skipping EventMachine test, no live server") if !live_server?
+
+    require 'eventmachine'
+    require 'memcache/event_machine'
+    ex = nil
+    m = MemCache.new(['127.0.0.1:11211', 'localhost:11211'])
+    within_em(3) do
+      begin
+        key1 = 'foo'
+        key2 = 'bar'*50
+        key3 = '£∞'*45
+        value1 = 'abc'
+        value2 = 'xyz'*1000
+        value3 = '∞§¶•ª'*1000
+
+        100.times do
+          assert_equal "STORED\r\n", m.set(key1, value1)
+          assert_equal "STORED\r\n", m.set(key2, value2)
+          assert_equal "STORED\r\n", m.set(key3, value3)
+          m.get(key1)
+          m.get(key2)
+          m.get(key3)
+          assert m.delete(key1)
+          assert_equal "STORED\r\n", m.set(key1, value2)
+          m.get(key1)
+          assert_equal "STORED\r\n", m.set(key2, value3)
+          m.get(key2)
+          assert_equal "STORED\r\n", m.set(key3, value1)
+          m.get(key3)
+          h = m.get_multi(key1, key2, key3)
+          assert h
+          assert_equal Hash, h.class
+          assert h.size > 0
+        end
+      rescue Exception => exp
+        puts exp.message
+        ex = exp
+      ensure
+        EM.stop
+      end
+    end
+    raise ex if ex
+  end
+
   def test_live_server
     return puts("Skipping EventMachine test, not Ruby 1.9") if RUBY_VERSION < '1.9'
     return puts("Skipping EventMachine test, no live server") if !live_server?
@@ -50,9 +96,11 @@ class TestEventMachine < Test::Unit::TestCase
   
   private
   
-  def within_em(&block)
+  def within_em(count=1, &block)
     EM.run do
-      Fiber.new(&block).resume
+      count.times do
+        Fiber.new(&block).resume
+      end
     end
   end
   

data/test/test_mem_cache.rb

@@ -1201,6 +1201,7 @@ class TestMemCache < Test::Unit::TestCase
       # Use a null logger to verify logging doesn't blow up at runtime
       cache = MemCache.new(['localhost:11211', '127.0.0.1:11211'], :logger => Logger.new('/dev/null'))
       cache.flush_all
+      assert_equal true, cache.multithread
       workers = []
 
       cache.set('f', 'zzz')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 1
-  version: 1.8.1
+  - 2
+  version: 1.8.2
 platform: ruby
 authors: 
 - Eric Hodel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 -05:00
+date: 2010-04-03 00:00:00 -05:00
 default_executable: memcached_top
 dependencies: []