memcached 0.14 → 0.15

data/lib/memcached/behaviors.rb

@@ -26,9 +26,9 @@ class Memcached
   DIRECT_VALUE_BEHAVIORS = [:retry_timeout, :connect_timeout, :rcv_timeout, :socket_recv_size, :poll_timeout, :socket_send_size, :server_failure_limit]
 
   CONVERSION_FACTORS = {
-    :connect_timeout => 1_000_000,
     :rcv_timeout => 1_000_000,
-    :poll_timeout => 1_000
+    :poll_timeout => 1_000,
+    :connect_timeout => 1_000
   }
 
 #:startdoc:

data/lib/memcached/exceptions.rb

@@ -34,6 +34,7 @@ Subclasses correspond one-to-one with server response strings or libmemcached er
 * Memcached::ServerDelete
 * Memcached::ServerEnd
 * Memcached::ServerError
+* Memcached::ServerIsMarkedDead
 * Memcached::ServerValue
 * Memcached::SomeErrorsWereReported
 * Memcached::StatValue
@@ -54,13 +55,15 @@ Subclasses correspond one-to-one with server response strings or libmemcached er
     end           
   end
   
+  ERRNO_HASH = Hash[*Errno.constants.map{ |c| [Errno.const_get(c)::Errno, Errno.const_get(c).new.message] }.flatten]
+  
   EXCEPTIONS = []
   EMPTY_STRUCT = Rlibmemcached::MemcachedSt.new
   Rlibmemcached.memcached_create(EMPTY_STRUCT)
   
   # Generate exception classes
   Rlibmemcached::MEMCACHED_MAXIMUM_RETURN.times do |index|
-    description = Rlibmemcached.memcached_strerror(EMPTY_STRUCT, index)
+    description = Rlibmemcached.memcached_strerror(EMPTY_STRUCT, index).gsub("!", "")
     exception_class = eval("class #{camelize(description)} < Error; self; end")
     EXCEPTIONS << exception_class
   end
@@ -77,8 +80,5 @@ Subclasses correspond one-to-one with server response strings or libmemcached er
     end
   end
   
-  # Verify library version
-  # XXX Waiting on libmemcached 0.18
-  
 #:startdoc:
 end

data/lib/memcached/memcached.rb

@@ -7,7 +7,7 @@ class Memcached
   FLAGS = 0x0
 
   DEFAULTS = {
-    :hash => :default,
+    :hash => :fnv1_32,
     :no_block => false,
     :distribution => :consistent_ketama,
     :ketama_weighted => true,
@@ -26,9 +26,10 @@ class Memcached
     :default_ttl => 604800,
     :default_weight => 8,
     :sort_hosts => false,
-    :auto_eject_hosts => false,
+    :auto_eject_hosts => true,
     :server_failure_limit => 2,
-    :verify_key => true
+    :verify_key => true,
+    :use_udp => false
   }
 
 #:stopdoc:
@@ -51,11 +52,11 @@ Weights only affect Ketama hashing.  If you use Ketama hashing and don't specify
 Valid option parameters are:
 
 <tt>:prefix_key</tt>:: A string to prepend to every key, for namespacing. Max length is 127.
-<tt>:hash</tt>:: The name of a hash function to use. Possible values are: <tt>:crc</tt>, <tt>:default</tt>, <tt>:fnv1_32</tt>, <tt>:fnv1_64</tt>, <tt>:fnv1a_32</tt>, <tt>:fnv1a_64</tt>, <tt>:hsieh</tt>, <tt>:md5</tt>, and <tt>:murmur</tt>. <tt>:default</tt> is the fastest. Use <tt>:md5</tt> for compatibility with other ketama clients.
+<tt>:hash</tt>:: The name of a hash function to use. Possible values are: <tt>:crc</tt>, <tt>:default</tt>, <tt>:fnv1_32</tt>, <tt>:fnv1_64</tt>, <tt>:fnv1a_32</tt>, <tt>:fnv1a_64</tt>, <tt>:hsieh</tt>, <tt>:md5</tt>, and <tt>:murmur</tt>. <tt>:fnv1_32</tt> is fast and well known, and is the default. Use <tt>:md5</tt> for compatibility with other ketama clients.
 <tt>:distribution</tt>:: Either <tt>:modula</tt>, <tt>:consistent_ketama</tt>, <tt>:consistent_wheel</tt>, or <tt>:ketama</tt>. Defaults to <tt>:ketama</tt>.
 <tt>:server_failure_limit</tt>:: How many consecutive failures to allow before marking a host as dead. Has no effect unless <tt>:retry_timeout</tt> is also set.
 <tt>:retry_timeout</tt>:: How long to wait until retrying a dead server. Has no effect unless <tt>:server_failure_limit</tt> is non-zero. Defaults to <tt>30</tt>.
-<tt>:auto_eject_hosts</tt>:: Whether to temporarily eject dead hosts from the pool. Defaults to <tt>false</tt>. Note that in the event of an ejection, <tt>:auto_eject_hosts</tt> will remap the entire pool unless <tt>:distribution</tt> is set to <tt>:consistent</tt>.
+<tt>:auto_eject_hosts</tt>:: Whether to temporarily eject dead hosts from the pool. Defaults to <tt>true</tt>. Note that in the event of an ejection, <tt>:auto_eject_hosts</tt> will remap the entire pool unless <tt>:distribution</tt> is set to <tt>:consistent</tt>.
 <tt>:cache_lookups</tt>:: Whether to cache hostname lookups for the life of the instance. Defaults to <tt>true</tt>.
 <tt>:support_cas</tt>:: Flag CAS support in the client. Accepts <tt>true</tt> or <tt>false</tt>. Defaults to <tt>false</tt> because it imposes a slight performance penalty. Note that your server must also support CAS or you will trigger <b>Memcached::ProtocolError</b> exceptions.
 <tt>:tcp_nodelay</tt>:: Turns on the no-delay feature for connecting sockets. Accepts <tt>true</tt> or <tt>false</tt>. Performance may or may not change, depending on your system.
@@ -64,10 +65,10 @@ Valid option parameters are:
 <tt>:show_backtraces</tt>:: Whether <b>Memcached::NotFound</b> exceptions should include backtraces. Generating backtraces is slow, so this is off by default. Turn it on to ease debugging.
 <tt>:connect_timeout</tt>:: How long to wait for a connection to a server. Defaults to 2 seconds. Set to <tt>0</tt> if you want to wait forever.
 <tt>:timeout</tt>:: How long to wait for a response from the server. Defaults to 0.25 seconds. Set to <tt>0</tt> if you want to wait forever.
-<tt>:poll_timeout</tt>:: How long to wait for a response from the server in the non-blocking select loop. Defaults to 0.25 seconds. Set to <tt>0</tt> if you want to wait forever.
 <tt>:default_ttl</tt>:: The <tt>ttl</tt> to use on set if no <tt>ttl</tt> is specified, in seconds. Defaults to one week. Set to <tt>0</tt> if you want things to never expire.
 <tt>:default_weight</tt>:: The weight to use if <tt>:ketama_weighted</tt> is <tt>true</tt>, but no weight is specified for a server.
 <tt>:hash_with_prefix_key</tt>:: Whether to include the prefix when calculating which server a key falls on. Defaults to <tt>true</tt>.
+<tt>:use_udp</tt>:: Use the UDP protocol to reduce connection overhead. Defaults to false.
 <tt>:sort_hosts</tt>:: Whether to force the server list to stay sorted. This defeats consistent hashing and is rarely useful.
 <tt>:verify_key</tt>:: Validate keys before accepting them. Never disable this.
 
@@ -80,9 +81,9 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
     Lib.memcached_create(@struct)
 
     # Merge option defaults and discard meaningless keys
-    @options = Hash[*DEFAULTS.map do |key, default|
-      [key, opts[key] || default]
-    end.flatten]
+    @options = DEFAULTS.merge(opts)
+    @options.delete_if { |k,v| not DEFAULTS.keys.include? k }
+    @default_ttl = options[:default_ttl]
 
     # Force :buffer_requests to use :no_block
     # XXX Deleting the :no_block key should also work, but libmemcached doesn't seem to set it
@@ -186,19 +187,19 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
   #
   # Also accepts a <tt>marshal</tt> value, which defaults to <tt>true</tt>. Set <tt>marshal</tt> to <tt>false</tt> if you want the <tt>value</tt> to be set directly.
   #
-  def set(key, value, ttl=nil, marshal=true, flags=FLAGS)
+  def set(key, value, ttl=@default_ttl, marshal=true, flags=FLAGS)
     value = marshal ? Marshal.dump(value) : value.to_s
     check_return_code(
-      Lib.memcached_set(@struct, key, value, ttl || options[:default_ttl], flags),
+      Lib.memcached_set(@struct, key, value, ttl, flags),
       key
     )
   end
 
   # Add a key/value pair. Raises <b>Memcached::NotStored</b> if the key already exists on the server. The parameters are the same as <tt>set</tt>.
-  def add(key, value, ttl=nil, marshal=true, flags=FLAGS)
+  def add(key, value, ttl=@default_ttl, marshal=true, flags=FLAGS)
     value = marshal ? Marshal.dump(value) : value.to_s
     check_return_code(
-      Lib.memcached_add(@struct, key, value, ttl || options[:default_ttl], flags),
+      Lib.memcached_add(@struct, key, value, ttl, flags),
       key
     )
   end
@@ -227,10 +228,10 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
   #:startdoc:
 
   # Replace a key/value pair. Raises <b>Memcached::NotFound</b> if the key does not exist on the server. The parameters are the same as <tt>set</tt>.
-  def replace(key, value, ttl=nil, marshal=true, flags=FLAGS)
+  def replace(key, value, ttl=@default_ttl, marshal=true, flags=FLAGS)
     value = marshal ? Marshal.dump(value) : value.to_s
     check_return_code(
-      Lib.memcached_replace(@struct, key, value, ttl || options[:default_ttl], flags),
+      Lib.memcached_replace(@struct, key, value, ttl, flags),
       key
     )
   end
@@ -261,19 +262,22 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
   #
   # CAS stands for "compare and swap", and avoids the need for manual key mutexing. CAS support must be enabled in Memcached.new or a <b>Memcached::ClientError</b> will be raised. Note that CAS may be buggy in memcached itself.
   #
-  def cas(key, ttl=nil, marshal=true, flags=FLAGS)
+  def cas(key, ttl=@default_ttl, marshal=true, flags=FLAGS)
     raise ClientError, "CAS not enabled for this Memcached instance" unless options[:support_cas]
 
-    value = get(key, marshal)
+    value, flags, ret = Lib.memcached_get_rvalue(@struct, key)
+    check_return_code(ret, key)
+    cas = @struct.result.cas
+
+    value = Marshal.load(value) if marshal
     value = yield value
-    value = marshal ? Marshal.dump(value) : value.to_s
+    value = Marshal.dump(value) if marshal
 
-    check_return_code(
-      Lib.memcached_cas(@struct, key, value, ttl || options[:default_ttl], flags, @struct.result.cas),
-      key
-    )
+    check_return_code(Lib.memcached_cas(@struct, key, value, ttl, flags, cas), key)
   end
 
+  alias :compare_and_swap :cas
+
 ### Deleters
 
   # Deletes a key/value pair from the server. Accepts a String <tt>key</tt>. Raises <b>Memcached::NotFound</b> if the key does not exist.
@@ -332,7 +336,7 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
 
   # Return the server used by a particular key.
   def server_by_key(key)
-    ret = Lib.memcached_server_by_key(@struct, key)    
+    ret = Lib.memcached_server_by_key(@struct, key)
     inspect_server(ret.first) if ret.is_a?(Array)
   end
 
@@ -375,16 +379,21 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
 
   # Checks the return code from Rlibmemcached against the exception list. Raises the corresponding exception if the return code is not Memcached::Success or Memcached::ActionQueued. Accepts an integer return code and an optional key, for exception messages.
   def check_return_code(ret, key = nil) #:doc:
-    return if ret == 0 # Lib::MEMCACHED_SUCCESS
-    return if ret == Lib::MEMCACHED_BUFFERED
-
-    if ret == Lib::MEMCACHED_NOTFOUND and !options[:show_backtraces]
+    if ret == 0 # Lib::MEMCACHED_SUCCESS
+    elsif ret == Lib::MEMCACHED_BUFFERED
+    elsif ret == Lib::MEMCACHED_NOTFOUND and !options[:show_backtraces]
       raise @not_found_instance
     else
       message = "Key #{inspect_keys(key, (detect_failure if ret == Lib::MEMCACHED_SERVER_MARKED_DEAD)).inspect}"
-      if ret == Lib::MEMCACHED_ERRNO and key.is_a?(String)
-        server = Lib.memcached_server_by_key(@struct, key)
-        message = "Errno #{server.first.cached_errno}. #{message}"
+      if key.is_a?(String)
+        if ret == Lib::MEMCACHED_ERRNO
+          server = Lib.memcached_server_by_key(@struct, key)
+          errno = server.first.cached_errno
+          message = "Errno #{errno}: #{ERRNO_HASH[errno].inspect}. #{message}"
+        elsif ret == Lib::MEMCACHED_SERVER_ERROR
+          server = Lib.memcached_server_by_key(@struct, key)
+          message = "\"#{server.first.cached_server_error}\". #{message}."
+        end
       end
       raise EXCEPTIONS[ret], message
     end
@@ -398,6 +407,7 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
   end
 
   # Find which server failed most recently.
+  # FIXME Is this still necessary with cached_errno?
   def detect_failure
     time = Time.now
     server = server_structs.detect do |server|
@@ -408,12 +418,16 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
 
   # Set the servers on the struct.
   def set_servers(servers)
+    add_method = options[:use_udp] ? "memcached_server_add_udp_with_weight" : "memcached_server_add_with_weight"
     Array(servers).each_with_index do |server, index|
-      unless server.is_a? String and server =~ /^[\w\d\.-]+(:\d{1,5}){0,2}$/
-        raise ArgumentError, "Servers must be in the format host:port[:weight] (e.g., 'localhost:11211' or  'localhost:11211:10')"
+      if server.is_a?(String) and File.socket?(server)
+        Lib.memcached_server_add_unix_socket_with_weight(@struct, server, options[:default_weight].to_i)
+      elsif server.is_a?(String) and server =~ /^[\w\d\.-]+(:\d{1,5}){0,2}$/
+        host, port, weight = server.split(":")
+        Lib.memcached_server_add_with_weight(@struct, host, port.to_i, (weight || options[:default_weight]).to_i)
+      else
+        raise ArgumentError, "Servers must be either in the format 'host:port[:weight]' (e.g., 'localhost:11211' or  'localhost:11211:10') for a network server, or a valid path to a Unix domain socket (e.g., /var/run/memcached)."
       end
-      host, port, weight = server.split(":")
-      Lib.memcached_server_add_with_weight(@struct, host, port.to_i, (weight || options[:default_weight]).to_i)
     end
     # For inspect
     @servers = send(:servers)
@@ -424,6 +438,8 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
     BEHAVIORS.keys.each do |behavior|
       set_behavior(behavior, options[behavior]) if options.key?(behavior)
     end
+    # BUG Hash must be last due to the weird Libmemcached multi-behaviors
+    set_behavior(:hash, options[:hash])
   end
 
   # Set the callbacks on the struct from the current options.
@@ -437,9 +453,17 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
     end
   end
 
-  # Stringify an opaque server struct.
-  def inspect_server(server)
-    "#{server.hostname}:#{server.port}#{":#{server.weight}" if options[:ketama_weighted]}"
+  def is_unix_socket?(server)
+    server.type == Lib::MEMCACHED_CONNECTION_UNIX_SOCKET
   end
 
+  # Stringify an opaque server struct
+  def inspect_server(server)
+    strings = [server.hostname]
+    if !is_unix_socket?(server)
+      strings << ":#{server.port}"      
+      strings << ":#{server.weight}" if options[:ketama_weighted]
+    end
+    strings.join
+  end
 end

data/lib/memcached/rails.rb

@@ -25,19 +25,27 @@ class Memcached
       super(key, !raw)
     rescue NotFound
     end
+
+    # Wraps Memcached#cas so that it doesn't raise. Doesn't set anything if no value is present.
+    def cas(key, ttl=@default_ttl, raw=false, &block)
+      super(key, ttl, !raw, &block)
+    rescue NotFound    
+    end
+    
+    alias :compare_and_swap :cas    
     
-    # Wraps Memcached#get with multiple arguments.
-    def get_multi(*keys)
-      super(keys)
+    # Wraps Memcached#get.
+    def get_multi(keys, raw=false)
+      super(keys, !raw)
     end
     
     # Wraps Memcached#set.
-    def set(key, value, ttl=nil, raw=false)
+    def set(key, value, ttl=@default_ttl, raw=false)
       super(key, value, ttl, !raw)
     end
 
     # Wraps Memcached#add so that it doesn't raise. 
-    def add(key, value, ttl=nil, raw=false)
+    def add(key, value, ttl=@default_ttl, raw=false)
       super(key, value, ttl, !raw)
       true
     rescue NotStored

data/memcached.gemspec

@@ -2,37 +2,33 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.14"
+  s.version = "0.15"
 
   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{2009-02-02}
+  s.date = %q{2009-08-03}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "README", "TODO"]
-  s.files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "ext/extconf.rb", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "Manifest", "Rakefile", "README", "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_test.rb", "test/unit/rails_test.rb", "TODO", "memcached.gemspec"]
-  s.has_rdoc = true
+  s.files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "ext/extconf.rb", "ext/libmemcached-0.31.tar.gz", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "Manifest", "memcached.gemspec", "Rakefile", "README", "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_test.rb", "test/unit/rails_test.rb", "TODO"]
   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"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{An interface to the libmemcached C client.}
   s.test_files = ["test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/test/profile/benchmark.rb

@@ -1,6 +1,7 @@
 
 HERE = File.dirname(__FILE__)
 $LOAD_PATH << "#{HERE}/../../lib/"
+UNIX_SOCKET_NAME = File.join(ENV['TMPDIR']||'/tmp','memcached') 
 
 require 'memcached'
 
@@ -39,7 +40,7 @@ class Bench
     @value = []
     @marshalled = Marshal.dump(@value)
     
-    @opts = [
+    @opts_networked = [
       ['127.0.0.1:43042', '127.0.0.1:43043'],
       {
         :buffer_requests => false,
@@ -47,6 +48,14 @@ class Bench
         :namespace => "namespace"
       }
     ]
+    @opt_unix = [
+      ["#{UNIX_SOCKET_NAME}0","#{UNIX_SOCKET_NAME}1"],
+      {
+        :buffer_requests => false,
+        :no_block => false,
+        :namespace => "namespace"
+      }
+    ]
     @key1 = "Short"
     @key2 = "Sym1-2-3::45"*8
     @key3 = "Long"*40
@@ -78,16 +87,16 @@ class Bench
   end
 
   def benchmark    
-    Benchmark.bm(31) do |x|
+    Benchmark.bm(35) do |x|
     
-      n = 2500
+      n = (ENV["LOOPS"] || 10000).to_i
     
       if defined? Memcached
         @m = Memcached.new(
-        @opts[0],
-        @opts[1].merge(:no_block => true, :buffer_requests => true)
+        @opts_networked[0],
+        @opts_networked[1].merge(:no_block => true, :buffer_requests => true)
         )
-        x.report("set:plain:noblock:memcached") do
+        x.report("set:plain:noblock:memcached:net") do
           n.times do
             @m.set @key1, @marshalled, 0, false
             @m.set @key2, @marshalled, 0, false
@@ -97,8 +106,22 @@ class Bench
             @m.set @key3, @marshalled, 0, false
           end
         end
-        @m = Memcached.new(*@opts)
-        x.report("set:plain:memcached") do
+        @m = Memcached.new(
+        @opt_unix[0],
+        @opt_unix[1].merge(:no_block => true, :buffer_requests => true)
+        )
+        x.report("set:plain:noblock:memcached:uds") do
+          n.times do
+            @m.set @key1, @marshalled, 0, false
+            @m.set @key2, @marshalled, 0, false
+            @m.set @key3, @marshalled, 0, false
+            @m.set @key1, @marshalled, 0, false
+            @m.set @key2, @marshalled, 0, false
+            @m.set @key3, @marshalled, 0, false
+          end
+        end
+        @m = Memcached.new(*@opts_networked)
+        x.report("set:plain:memcached:net") do
           n.times do
             @m.set @key1, @marshalled, 0, false
             @m.set @key2, @marshalled, 0, false
@@ -108,10 +131,21 @@ class Bench
             @m.set @key3, @marshalled, 0, false
           end
         end # if false
+        @m = Memcached.new(*@opt_unix)
+        x.report("set:plain:memcached:uds") do
+          n.times do
+            @m.set @key1, @marshalled, 0, false
+            @m.set @key2, @marshalled, 0, false
+            @m.set @key3, @marshalled, 0, false
+            @m.set @key1, @marshalled, 0, false
+            @m.set @key2, @marshalled, 0, false
+            @m.set @key3, @marshalled, 0, false
+          end
+        end
       end
       #  Not supported by Caffeine
       if defined? MemCache
-        @m = MemCache.new(*@opts)
+        @m = MemCache.new(*@opts_networked)
         x.report("set:plain:memcache-client") do
           n.times do
             @m.set @key1, @marshalled, 0, true
@@ -129,10 +163,10 @@ class Bench
     
       if defined? Memcached
         @m = Memcached.new(
-        @opts[0],
-        @opts[1].merge(:no_block => true, :buffer_requests => true)
+        @opts_networked[0],
+        @opts_networked[1].merge(:no_block => true, :buffer_requests => true)
         )
-        x.report("set:ruby:noblock:memcached") do
+        x.report("set:ruby:noblock:memcached:net") do
           n.times do
             @m.set @key1, @value
             @m.set @key2, @value
@@ -142,8 +176,22 @@ class Bench
             @m.set @key3, @value
           end
         end
-        @m = Memcached.new(*@opts)
-        x.report("set:ruby:memcached") do
+        @m = Memcached.new(
+        @opt_unix[0],
+        @opt_unix[1].merge(:no_block => true, :buffer_requests => true)
+        )
+        x.report("set:ruby:noblock:memcached:uds") do
+          n.times do
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+          end
+        end
+        @m = Memcached.new(*@opts_networked)
+        x.report("set:ruby:memcached:net") do
           n.times do
             @m.set @key1, @value
             @m.set @key2, @value
@@ -153,9 +201,20 @@ class Bench
             @m.set @key3, @value
           end
         end # if false
+        @m = Memcached.new(*@opt_unix)
+        x.report("set:ruby:memcached:uds") do
+          n.times do
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+          end
+        end
       end
       if defined? Caffeine
-        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        @m = Caffeine::MemCache.new(@opts_networked[1]); @m.servers = @opts_networked[0]
         x.report("set:ruby:caffeine") do
           n.times do
             @m.set @key1, @value
@@ -168,7 +227,7 @@ class Bench
         end
       end
       if defined? MemCache
-        @m = MemCache.new(*@opts)
+        @m = MemCache.new(*@opts_networked)
         x.report("set:ruby:memcache-client") do
           n.times do
             @m.set @key1, @value
@@ -182,8 +241,19 @@ class Bench
       end
     
       if defined? Memcached
-        @m = Memcached.new(*@opts)
-        x.report("get:plain:memcached") do
+        @m = Memcached.new(*@opts_networked)
+        x.report("get:plain:memcached:net") do
+          n.times do
+            @m.get @key1, false
+            @m.get @key2, false
+            @m.get @key3, false
+            @m.get @key1, false
+            @m.get @key2, false
+            @m.get @key3, false
+          end
+        end
+        @m = Memcached.new(*@opt_unix)
+        x.report("get:plain:memcached:uds") do
           n.times do
             @m.get @key1, false
             @m.get @key2, false
@@ -196,7 +266,7 @@ class Bench
       end
       #  Not supported by Caffeine
       if defined? MemCache
-        @m = MemCache.new(*@opts)
+        @m = MemCache.new(*@opts_networked)
         x.report("get:plain:memcache-client") do
           n.times do
             @m.get @key1, true
@@ -210,8 +280,19 @@ class Bench
       end
     
       if defined? Memcached
-        @m = Memcached.new(*@opts)
-        x.report("get:ruby:memcached") do
+        @m = Memcached.new(*@opts_networked)
+        x.report("get:ruby:memcached:net") do
+          n.times do
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+          end
+        end
+        @m = Memcached.new(*@opt_unix)
+        x.report("get:ruby:memcached:uds") do
           n.times do
             @m.get @key1
             @m.get @key2
@@ -223,7 +304,7 @@ class Bench
         end
       end
       if defined? Caffeine
-        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        @m = Caffeine::MemCache.new(@opts_networked[1]); @m.servers = @opts_networked[0]
         x.report("get:ruby:caffeine") do
           n.times do
             @m.get @key1
@@ -236,7 +317,7 @@ class Bench
         end
       end
       if defined? MemCache
-        @m = MemCache.new(*@opts)
+        @m = MemCache.new(*@opts_networked)
         x.report("get:ruby:memcache-client") do
           n.times do
             @m.get @key1
@@ -250,19 +331,29 @@ class Bench
       end
 
       if defined? Memcached
-        @m = Memcached.new(*@opts)
+        @m = Memcached.new(*@opts_networked)
+
+        # Avoid rebuilding the array every request
+        keys = [@key1, @key2, @key3, @key4, @key5, @key6]
+
+        x.report("multiget:ruby:memcached:net") do
+          n.times do
+            @m.get keys
+          end
+        end
+        @m = Memcached.new(*@opt_unix)
 
         # Avoid rebuilding the array every request
         keys = [@key1, @key2, @key3, @key4, @key5, @key6]
 
-        x.report("multiget:ruby:memcached") do
+        x.report("multiget:ruby:memcached:uds") do
           n.times do
             @m.get keys
           end
         end
       end
       if defined? Caffeine
-        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        @m = Caffeine::MemCache.new(@opts_networked[1]); @m.servers = @opts_networked[0]
         x.report("multiget:ruby:caffeine") do
           n.times do
             # We don't use the keys array because splat is slow
@@ -271,7 +362,7 @@ class Bench
         end
       end
       if defined? MemCache
-        @m = MemCache.new(*@opts)
+        @m = MemCache.new(*@opts_networked)
         x.report("multiget:ruby:memcache-client") do
           n.times do
             # We don't use the keys array because splat is slow
@@ -283,8 +374,19 @@ class Bench
       # restart_servers
     
       if defined? Memcached
-        @m = Memcached.new(*@opts)
-        x.report("missing:ruby:memcached") do
+        @m = Memcached.new(*@opts_networked)
+        x.report("missing:ruby:memcached:net") do
+          n.times do
+            begin @m.delete @key1; rescue Memcached::NotFound; end
+            begin @m.get @key1; rescue Memcached::NotFound; end
+            begin @m.delete @key2; rescue Memcached::NotFound; end
+            begin @m.get @key2; rescue Memcached::NotFound; end
+            begin @m.delete @key3; rescue Memcached::NotFound; end
+            begin @m.get @key3; rescue Memcached::NotFound; end
+          end
+        end
+        @m = Memcached.new(*@opt_unix)
+        x.report("missing:ruby:memcached:uds") do
           n.times do
             begin @m.delete @key1; rescue Memcached::NotFound; end
             begin @m.get @key1; rescue Memcached::NotFound; end
@@ -296,7 +398,7 @@ class Bench
         end
       end
       if defined? Memcached
-        @m = Memcached.new(*@opts)
+        @m = Memcached.new(*@opts_networked)
         x.report("missing:ruby:memcached:inline") do
           n.times do
             @m.delete @key1 rescue nil
@@ -307,9 +409,20 @@ class Bench
             @m.get @key3 rescue nil
           end
         end
+        @m = Memcached.new(*@opt_unix)
+        x.report("missing:ruby:memcached_UDS:inline") do
+          n.times do
+            @m.delete @key1 rescue nil
+            @m.get @key1 rescue nil
+            @m.delete @key2 rescue nil
+            @m.get @key2 rescue nil
+            @m.delete @key3 rescue nil
+            @m.get @key3 rescue nil
+          end
+        end
       end
       if defined? Caffeine
-        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        @m = Caffeine::MemCache.new(@opts_networked[1]); @m.servers = @opts_networked[0]
         x.report("missing:ruby:caffeine") do
           n.times do
             begin @m.delete @key1; rescue; end
@@ -322,7 +435,7 @@ class Bench
         end
       end
       if defined? MemCache
-        @m = MemCache.new(*@opts)
+        @m = MemCache.new(*@opts_networked)
         x.report("missing:ruby:memcache-client") do
           n.times do
             begin @m.delete @key1; rescue; end
@@ -339,10 +452,10 @@ class Bench
     
       if defined? Memcached
         @m = Memcached.new(
-        @opts[0],
-        @opts[1].merge(:no_block => true, :buffer_requests => true)
+        @opts_networked[0],
+        @opts_networked[1].merge(:no_block => true, :buffer_requests => true)
         )
-        x.report("mixed:ruby:noblock:memcached") do
+        x.report("mixed:ruby:noblock:memcached:net") do
           n.times do
             @m.set @key1, @value
             @m.set @key2, @value
@@ -358,8 +471,45 @@ class Bench
             @m.get @key3
           end
         end
-        @m = Memcached.new(*@opts)
-        x.report("mixed:ruby:memcached") do
+        @m = Memcached.new(
+        @opt_unix[0],
+        @opt_unix[1].merge(:no_block => true, :buffer_requests => true)
+        )
+        x.report("mixed:ruby:noblock:memcached:uds") do
+          n.times do
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+            @m.set @key1, @value
+            @m.get @key1
+            @m.set @key2, @value
+            @m.get @key2
+            @m.set @key3, @value
+            @m.get @key3
+          end
+        end
+        @m = Memcached.new(*@opts_networked)
+        x.report("mixed:ruby:memcached:net") do
+          n.times do
+            @m.set @key1, @value
+            @m.set @key2, @value
+            @m.set @key3, @value
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+            @m.set @key1, @value
+            @m.get @key1
+            @m.set @key2, @value
+            @m.get @key2
+            @m.set @key3, @value
+            @m.get @key3
+          end
+        end # if false
+        @m = Memcached.new(*@opt_unix)
+        x.report("mixed:ruby:memcached:uds") do
           n.times do
             @m.set @key1, @value
             @m.set @key2, @value
@@ -377,7 +527,7 @@ class Bench
         end # if false
       end
       if defined? Caffeine
-        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        @m = Caffeine::MemCache.new(@opts_networked[1]); @m.servers = @opts_networked[0]
         x.report("mixed:ruby:caffeine") do
           n.times do
             @m.set @key1, @value
@@ -396,7 +546,7 @@ class Bench
         end
       end
       if defined? MemCache
-        @m = MemCache.new(*@opts)
+        @m = MemCache.new(*@opts_networked)
         x.report("mixed:ruby:memcache-client") do
           n.times do
             @m.set @key1, @value
@@ -419,17 +569,16 @@ class Bench
     
       if defined? Memcached
         unless ARGV.include? "--no-hash"
-          n = 10000
-          Memcached::HASH_VALUES.each do |mode,|
-            @m = Memcached.new(@opts[0], @opts[1].merge(:hash => mode))
-            x.report("hash:#{mode}:memcached") do
+          Memcached::HASH_VALUES.each do |mode, int|
+            @m = Memcached.new(@opt_unix[0], @opt_unix[1].merge(:hash => mode))
+            x.report("hash:#{mode}") do
               n.times do
-                @m.set @key1, @marshalled, 0, false
-                @m.get @key1, false
-                @m.set @key2, @marshalled, 0, false
-                @m.get @key2, false
-                @m.set @key3, @marshalled, 0, false
-                @m.get @key3, false
+                Rlibmemcached.memcached_generate_hash_rvalue(@key1, int)
+                Rlibmemcached.memcached_generate_hash_rvalue(@key2, int)
+                Rlibmemcached.memcached_generate_hash_rvalue(@key3, int)
+                Rlibmemcached.memcached_generate_hash_rvalue(@key4, int)
+                Rlibmemcached.memcached_generate_hash_rvalue(@key5, int)
+                Rlibmemcached.memcached_generate_hash_rvalue(@key6, int)
               end
             end
           end