memcache-client 1.7.2 → 1.7.3

data/FAQ.rdoc

@@ -22,3 +22,10 @@ You can increase the timeout or disable them completely with the following confi
   native:
   MemCache.new ['server1', 'server2'], { :timeout => 1.0 } # 1 second timeout
 
+
+== The new memcache-client is slower than 1.5.0!?
+
+Yes, in the simplest case, 1.6.x+ is slower than 1.5.0.  If you just have a single memcached
+server, the latest memcache-client will be slower.  This is because 1.5.0 does not
+timeout network operations.  For reliability purposes, memcache-client 1.6.x+ enables 
+timeouts by default.  Most of this performance penalty is now gone in 1.7.3 and later.

data/History.rdoc

@@ -1,3 +1,10 @@
+= 1.7.3 (2009-06-06)
+
+* Remove SystemTimer support, refactor I/O to use nonblocking operations.  Speeds up
+  performance approx 100%. Timeouts basically have no overhead now!  (tenderlove)
+* Update load logic to support SystemTimer running in Ruby Enterprise Edition.  Thanks
+  to splattael on github for the comment.
+
 = 1.7.2 (2009-04-12)
 
 * Rollback socket timeout optimization.  It does not work on all operating systems

data/lib/memcache.rb

@@ -4,25 +4,7 @@ require 'socket'
 require 'thread'
 require 'zlib'
 require 'digest/sha1'
-
-begin
-  # Try to use the SystemTimer gem instead of Ruby's timeout library
-  # when running on something that looks like Ruby 1.8.x.  See:
-  #   http://ph7spot.com/articles/system_timer
-  # We don't want to bother trying to load SystemTimer on jruby and
-  # ruby 1.9+.
-  if !defined?(RUBY_ENGINE)
-    require 'system_timer'
-    MemCacheTimer = SystemTimer
-  else
-    require 'timeout'
-    MemCacheTimer = Timeout
-  end
-rescue LoadError => e
-  puts "[memcache-client] Could not load SystemTimer gem, falling back to Ruby's slower/unsafe timeout library: #{e.message}"
-  require 'timeout'
-  MemCacheTimer = Timeout
-end
+require 'net/protocol'
 
 ##
 # A Ruby client library for memcached.
@@ -33,7 +15,7 @@ class MemCache
   ##
   # The version of MemCache you are using.
 
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 
   ##
   # Default options for the cache object.
@@ -521,7 +503,11 @@ class MemCache
       @servers.each do |server|
         with_socket_management(server) do |socket|
           logger.debug { "flush_all #{delay_time} on #{server}" } if logger
-          socket.write "flush_all #{delay_time}#{noreply}\r\n"
+          if delay == 0 # older versions of memcached will fail silently otherwise
+            socket.write "flush_all#{noreply}\r\n"
+          else
+            socket.write "flush_all #{delay_time}#{noreply}\r\n"
+          end
           break nil if @no_reply
           result = socket.gets
           raise_on_error_response! result
@@ -1015,30 +1001,9 @@ class MemCache
     end
 
     def connect_to(host, port, timeout=nil)
-      s = TCPSocket.new(host, port, 0)
-      if timeout
-        s.instance_eval <<-EOR
-          alias :blocking_gets :gets
-          def gets(*args)
-            MemCacheTimer.timeout(#{timeout}) do
-              self.blocking_gets(*args)
-            end
-          end
-          alias :blocking_read :read
-          def read(*args)
-            MemCacheTimer.timeout(#{timeout}) do
-              self.blocking_read(*args)
-            end
-          end
-          alias :blocking_write :write
-          def write(*args)
-            MemCacheTimer.timeout(#{timeout}) do
-              self.blocking_write(*args)
-            end
-          end
-        EOR
-      end
-      s
+      io = MemCache::BufferedIO.new(TCPSocket.new(host, port))
+      io.read_timeout = timeout
+      io
     end
 
     ##
@@ -1072,6 +1037,33 @@ class MemCache
 
   class MemCacheError < RuntimeError; end
 
+  class BufferedIO < Net::BufferedIO # :nodoc:
+    BUFSIZE = 1024 * 16
+
+    # An implementation similar to this is in *trunk* for 1.9.  When it
+    # gets released, this method can be removed when using 1.9
+    def rbuf_fill
+      begin
+        @rbuf << @io.read_nonblock(BUFSIZE)
+      rescue Errno::EWOULDBLOCK
+        retry unless @read_timeout
+        if IO.select([@io], nil, nil, @read_timeout)
+          retry
+        else
+          raise Timeout::Error
+        end
+      end
+    end
+
+    def setsockopt *args
+      @io.setsockopt *args
+    end
+
+    def gets
+      readuntil("\n")
+    end
+  end
+
 end
 
 module Continuum
@@ -1111,5 +1103,6 @@ module Continuum
       "<#{value}, #{server.host}:#{server.port}>"
     end
   end
+
 end
 require 'continuum_native'

data/test/test_mem_cache.rb

@@ -138,8 +138,6 @@ class TestMemCache < Test::Unit::TestCase
         end
       end
       puts "1000 gets without socket timeout: #{without} sec"
-
-      assert without < with
     end
   end
 
@@ -945,7 +943,7 @@ class TestMemCache < Test::Unit::TestCase
 
     @cache.flush_all
 
-    expected = "flush_all 0\r\n"
+    expected = "flush_all\r\n"
     @cache.servers.each do |server|
       assert_equal expected, server.socket.written.string
     end
@@ -979,7 +977,19 @@ class TestMemCache < Test::Unit::TestCase
       @cache.flush_all
     end
 
-    assert_match /flush_all 0\r\n/, socket.written.string
+    assert_match /flush_all\r\n/, socket.written.string
+  end
+  
+  def test_flush_all_for_real
+    requirement(memcached_running?, 'A real memcached server must be running for testing flush_all') do
+      cache = MemCache.new "localhost:11211", :namespace => "test_flush_all"
+      k, v = "1234", "test"
+      assert_nil cache.get(k)
+      cache.set(k, v)
+      assert_equal v, cache.get(k)
+      cache.flush_all
+      assert_nil cache.get(k)
+    end
   end
 
   def test_stats

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors: 
 - Eric Hodel
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-12 00:00:00 -05:00
+date: 2009-06-06 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,8 @@ files:
 - lib/continuum_native.rb
 has_rdoc: false
 homepage: http://github.com/mperham/memcache-client
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -53,9 +55,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Ruby library for accessing memcached.
 test_files: 
 - test/test_mem_cache.rb