memcache-client 1.4.0 → 1.5.0

data/History.txt

@@ -1,3 +1,10 @@
+= 1.5.0
+
+* Add MemCache#flush_all command.  Patch #13019 and bug #10503.  Patches
+  submitted by Sebastian Delmont and Rick Olson.
+* Type-cast data returned by MemCache#stats.  Patch #10505 submitted by
+  Sebastian Delmont.
+
 = 1.4.0
 
 * Fix bug #10371, #set does not check response for server errors.

data/lib/memcache.rb

@@ -42,7 +42,7 @@ class MemCache
   ##
   # The version of MemCache you are using.
 
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 
   ##
   # Default options for the cache object.
@@ -365,6 +365,31 @@ class MemCache
     @mutex.unlock if @multithread
   end
 
+  ##
+  # Flush the cache from all memcache servers.
+
+  def flush_all
+    raise MemCacheError, 'No active servers' unless active?
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    begin
+      @mutex.lock if @multithread
+      @servers.each do |server|
+        begin
+          sock = server.socket
+          raise MemCacheError, "No connection to server" if sock.nil?
+          sock.write "flush_all\r\n"
+          result = sock.gets
+          raise MemCacheError, $2.strip if result =~ /^(SERVER_)?ERROR(.*)/
+        rescue SocketError, SystemCallError, IOError => err
+          server.close
+          raise MemCacheError, err.message
+        end
+      end
+    ensure
+      @mutex.unlock if @multithread
+    end
+  end
+
   ##
   # Reset the connection to all memcache servers.  This should be called if
   # there is a problem with a cache lookup that might have left the connection
@@ -384,26 +409,26 @@ class MemCache
   #
   #   >> pp CACHE.stats
   #   {"localhost:11211"=>
-  #     {"bytes"=>"4718",
-  #      "pid"=>"20188",
-  #      "connection_structures"=>"4",
-  #      "time"=>"1162278121",
-  #      "pointer_size"=>"32",
-  #      "limit_maxbytes"=>"67108864",
-  #      "cmd_get"=>"14532",
+  #     {"bytes"=>4718,
+  #      "pid"=>20188,
+  #      "connection_structures"=>4,
+  #      "time"=>1162278121,
+  #      "pointer_size"=>32,
+  #      "limit_maxbytes"=>67108864,
+  #      "cmd_get"=>14532,
   #      "version"=>"1.2.0",
-  #      "bytes_written"=>"432583",
-  #      "cmd_set"=>"32",
-  #      "get_misses"=>"0",
-  #      "total_connections"=>"19",
-  #      "curr_connections"=>"3",
-  #      "curr_items"=>"4",
-  #      "uptime"=>"1557",
-  #      "get_hits"=>"14532",
-  #      "total_items"=>"32",
-  #      "rusage_system"=>"0.313952",
-  #      "rusage_user"=>"0.119981",
-  #      "bytes_read"=>"190619"}}
+  #      "bytes_written"=>432583,
+  #      "cmd_set"=>32,
+  #      "get_misses"=>0,
+  #      "total_connections"=>19,
+  #      "curr_connections"=>3,
+  #      "curr_items"=>4,
+  #      "uptime"=>1557,
+  #      "get_hits"=>14532,
+  #      "total_items"=>32,
+  #      "rusage_system"=>0.313952,
+  #      "rusage_user"=>0.119981,
+  #      "bytes_read"=>190619}}
   #   => nil
 
   def stats
@@ -418,12 +443,27 @@ class MemCache
       begin
         sock.write "stats\r\n"
         stats = {}
-        while line = sock.gets
+        while line = sock.gets do
           break if line == "END\r\n"
-          line =~ /^STAT ([\w]+) ([\d.]+)/
-          stats[$1] = $2
+          if line =~ /^STAT ([\w]+) ([\w\.\:]+)/ then
+            name, value = $1, $2
+            stats[name] = case name
+                          when 'version'
+                            value
+                          when 'rusage_user', 'rusage_system' then
+                            seconds, microseconds = value.split(/:/, 2)
+                            microseconds ||= 0
+                            Float(seconds) + (Float(microseconds) / 1_000_000)
+                          else
+                            if value =~ /^\d+$/ then
+                              value.to_i
+                            else
+                              value
+                            end
+                          end
+          end
         end
-        server_stats["#{server.host}:#{server.port}"] = stats.clone
+        server_stats["#{server.host}:#{server.port}"] = stats
       rescue SocketError, SystemCallError, IOError => err
         server.close
         raise MemCacheError, err.message

data/test/test_mem_cache.rb

@@ -507,19 +507,6 @@ class TestMemCache < Test::Unit::TestCase
     assert_equal expected, server.socket.written.string
   end
 
-  def test_set
-    server = FakeServer.new
-    server.socket.data.write "STORED\r\n"
-    server.socket.data.rewind
-    @cache.servers = []
-    @cache.servers << server
-
-    @cache.set 'key', 'value'
-
-    expected = "set my_namespace:key 0 0 9\r\n\004\b\"\nvalue\r\n"
-    assert_equal expected, server.socket.written.string
-  end
-
   def test_set_expiry
     server = FakeServer.new
     server.socket.data.write "STORED\r\n"
@@ -632,9 +619,43 @@ class TestMemCache < Test::Unit::TestCase
     assert_equal 'Update of readonly cache', e.message
   end
 
-  def test_stats
+  def test_delete
+    server = FakeServer.new
+    @cache.servers = []
+    @cache.servers << server
+    
+    @cache.delete 'key'
+    
+    expected = "delete my_namespace:key 0\r\n"
+    assert_equal expected, server.socket.written.string
+  end
+
+  def test_delete_with_expiry
+    server = FakeServer.new
+    @cache.servers = []
+    @cache.servers << server
+    
+    @cache.delete 'key', 300
+    
+    expected = "delete my_namespace:key 300\r\n"
+    assert_equal expected, server.socket.written.string
+  end
+
+  def test_flush_all
+    @cache.servers = []
+    3.times { @cache.servers << FakeServer.new }
+
+    @cache.flush_all
+
+    expected = "flush_all\r\n"
+    @cache.servers.each do |server|
+      assert_equal expected, server.socket.written.string
+    end
+  end
+
+  def test_flush_all_failure
     socket = FakeSocket.new
-    socket.data.write "STAT pid 20188\r\nSTAT total_items 32\r\rEND\r\n"
+    socket.data.write "ERROR\r\n"
     socket.data.rewind
     server = FakeServer.new socket
     def server.host() "localhost"; end
@@ -643,7 +664,30 @@ class TestMemCache < Test::Unit::TestCase
     @cache.servers = []
     @cache.servers << server
 
-    expected = {"localhost:11211"=>{"pid"=>"20188", "total_items"=>"32"}}
+    assert_raise MemCache::MemCacheError do
+      @cache.flush_all
+    end
+
+    assert_equal "flush_all\r\n", socket.written.string
+  end
+
+  def test_stats
+    socket = FakeSocket.new
+    socket.data.write "STAT pid 20188\r\nSTAT total_items 32\r\nSTAT version 1.2.3\r\nSTAT rusage_user 1:300\r\nSTAT dummy ok\r\nEND\r\n"
+    socket.data.rewind
+    server = FakeServer.new socket
+    def server.host() 'localhost'; end
+    def server.port() 11211; end
+
+    @cache.servers = []
+    @cache.servers << server
+
+    expected = {
+      'localhost:11211' => {
+        'pid' => 20188, 'total_items' => 32, 'version' => '1.2.3',
+        'rusage_user' => 1.0003, 'dummy' => 'ok'
+      }
+    }
     assert_equal expected, @cache.stats
 
     assert_equal "stats\r\n", socket.written.string

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.3
 specification_version: 1
 name: memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
-date: 2007-07-30 00:00:00 -07:00
+  version: 1.5.0
+date: 2007-08-13 00:00:00 -07:00
 summary: A Ruby memcached client
 require_paths: 
 - lib
@@ -31,6 +31,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
+  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
+  ZXQwHhcNMDcwODE0MDAwMjIzWhcNMDgwODEzMDAwMjIzWjBBMRAwDgYDVQQDDAdk
+  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
+  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVZUNKmnp8LrkM
+  bQd5ZrcTV1R7woai4clBLUjH3DL47r+f6d5dz+gJUegZ3RKWdSvOfaRmXFkr2+nv
+  vc6uzcxk9w1uN5Z3w+BCeKtsUR8EtUhH8b26HDNGDeuoTX1gEgm4DacBh1/Ib+SQ
+  PxLVkFnWiCekGvL7jzecw6UwADn49Ag4NxIvpN0ttsYCQFMDuqzdISjurbb3dZ2z
+  OsaDqdW29c3Jed816kVhOzRZ2EC4BExPtEN6xZCwab6f9tzJT+Atea7PRFLm/T7t
+  QFBPGC2XjPUXJxTyz+8PEDDb2PXeZwPSDIysq1tzB55A3rE1a5pLvnBfek5KjC25
+  0wuuKuxlAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBStuxfp/gfzqL+3k7tFe8gVU9zpvDANBgkqhkiG9w0BAQUFAAOCAQEAvnmUelUN
+  s9f/VasT9mZV4tIP3sKi0uqyq9i7vtDgCNFw0BAKNxa6ybO1CrBBnjDMa4hvhrW8
+  qCLkx7BFHGV/eWR3pdwcLAS8cLuEib75nuG1lbG2yIvGSYTyQ/oxbmuUAZxpavK2
+  101OludXvBC9hpA4Qz3UhJYBdtT8TuztiFGLzhCJusjUD7I6Y+TrrTPkBGceVVyY
+  hx8aJk+44+jvzgsTi4MyrRo4lAGsQxFa1f1IBuEgqNPdML31yGO0QKof+IqPiVNo
+  HsCQoSWkgfQE0DHTgx+hWkF2d10+54I4aM9tIROeGACQemcj0IRf3v7Au8I+6PWl
+  3E1oHz01aNcUFA==
+  -----END CERTIFICATE-----
+
 post_install_message: 
 authors: 
 - Eric Hodel
@@ -77,5 +99,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: