memcached 0.8 → 0.8.1

data/BENCHMARKS

@@ -10,35 +10,35 @@ You can easily run your own benchmarks, as long as you have memcached itself on
 These benchmarks were run on 32-bit Intel OS X 10.4:
 
                                        user     system      total        real
-  set:plain:noblock:memcached      0.110000   0.020000   0.130000 (  0.306181)
-  set:plain:memcached              0.260000   0.330000   0.590000 (  1.332132)
-  set:plain:memcache-client       46.830000   0.640000  47.470000 ( 49.439137)
-  set:ruby:noblock:memcached       0.190000   0.020000   0.210000 (  0.344947)
-  set:ruby:memcached               0.360000   0.340000   0.700000 (  1.502977)
-  set:ruby:caffeine                5.480000   0.890000   6.370000 (  7.224237)
-  set:ruby:memcache-client        47.460000   0.630000  48.090000 ( 50.113758)
-  get:plain:memcached              0.340000   0.340000   0.680000 (  1.346579)
-  get:plain:memcache-client       47.480000   0.600000  48.080000 ( 49.662450)
-  get:ruby:memcached               0.400000   0.350000   0.750000 (  1.464317)
-  get:ruby:caffeine                5.410000   0.900000   6.310000 (  7.142927)
-  get:ruby:memcache-client        47.600000   0.720000  48.320000 ( 51.090209)
-  missing:ruby:memcached           0.750000   0.380000   1.130000 (  1.786494)
-  missing:ruby:caffeine            5.130000   0.870000   6.000000 (  6.854605)
-  missing:ruby:memcache-client    46.870000   0.610000  47.480000 ( 49.318730)
-  mixed:ruby:noblock:memcached     0.740000   0.840000   1.580000 (  2.747368)
-  mixed:ruby:memcached             0.740000   0.680000   1.420000 (  2.825775)
-  mixed:ruby:caffeine              9.670000   1.770000  11.440000 ( 13.203683)
-  mixed:ruby:memcache-client      94.910000   1.380000  96.290000 (101.312885)
-  hash:fnv1a_64:memcached          1.170000   1.360000   2.530000 (  5.374056)
-  hash:crc:memcached               1.160000   1.330000   2.490000 (  5.422227)
-  hash:fnv1_32:memcached           1.150000   1.350000   2.500000 (  5.356032)
-  hash:fnv1_64:memcached           1.200000   1.370000   2.570000 (  5.487689)
-  hash:default:memcached           1.160000   1.360000   2.520000 (  5.506072)
-  hash:md5:memcached               1.240000   1.320000   2.560000 (  5.930740)
-  hash:hsieh:memcached             1.150000   1.370000   2.520000 (  5.505223)
-  hash:ketama:memcached            1.230000   1.340000   2.570000 (  5.759874)
-  hash:fnv1a_32:memcached          1.150000   1.360000   2.510000 (  5.562683)
-
+  set:plain:noblock:memcached      0.120000   0.020000   0.140000 (  0.368084)
+  set:plain:memcached              0.270000   0.340000   0.610000 (  1.499177)
+  set:plain:memcache-client       47.310000   0.670000  47.980000 ( 50.628096)
+  set:ruby:noblock:memcached       0.190000   0.010000   0.200000 (  0.354409)
+  set:ruby:memcached               0.380000   0.340000   0.720000 (  1.454480)
+  set:ruby:caffeine                5.570000   0.890000   6.460000 (  7.456010)
+  set:ruby:memcache-client        48.340000   0.770000  49.110000 ( 52.899929)
+  get:plain:memcached              0.350000   0.330000   0.680000 (  1.410108)
+  get:plain:memcache-client       48.000000   0.670000  48.670000 ( 51.532252)
+  get:ruby:memcached               0.410000   0.340000   0.750000 (  1.432786)
+  get:ruby:caffeine                5.480000   0.910000   6.390000 (  7.269396)
+  get:ruby:memcache-client        48.320000   0.770000  49.090000 ( 52.790661)
+  missing:ruby:memcached           0.420000   0.370000   0.790000 (  1.458207)
+  missing:ruby:memcached:inline    0.430000   0.370000   0.800000 (  1.633660)
+  missing:ruby:caffeine            5.270000   0.900000   6.170000 (  7.442863)
+  missing:ruby:memcache-client    48.270000   0.750000  49.020000 ( 53.028126)
+  mixed:ruby:noblock:memcached     0.760000   0.900000   1.660000 (  2.935532)
+  mixed:ruby:memcached             0.770000   0.670000   1.440000 (  2.891710)
+  mixed:ruby:caffeine              9.850000   1.780000  11.630000 ( 13.339650)
+  mixed:ruby:memcache-client      97.490000   1.460000  98.950000 (105.600490)
+  hash:fnv1_32:memcached           1.270000   1.350000   2.620000 (  5.557949)
+  hash:fnv1_64:memcached           1.200000   1.350000   2.550000 (  5.446442)
+  hash:hsieh:memcached             1.210000   1.360000   2.570000 (  5.365423)
+  hash:md5:memcached               1.250000   1.340000   2.590000 (  5.457329)
+  hash:default:memcached           1.220000   1.340000   2.560000 (  5.455361)
+  hash:ketama:memcached            1.170000   1.350000   2.520000 (  5.361789)
+  hash:fnv1a_64:memcached          1.240000   1.350000   2.590000 (  5.389261)
+  hash:fnv1a_32:memcached          1.180000   1.350000   2.530000 (  5.332386)
+  hash:crc:memcached               1.220000   1.350000   2.570000 (  5.460113)
 
 == x86-64 Linux
   

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.8.1. Disable NotFound backtraces for speed (Blaine Cook).
+
 v0.8. CAS support. Update to libmemcached 0.16.
 
 v0.7.2. Auto-repair unprintable characters and too-long keys; improve performance of namespacing operation.

data/lib/memcached/exceptions.rb

@@ -43,14 +43,7 @@ Subclasses correspond one-to-one with server response strings or libmemcached er
 
 =end
   class Error < RuntimeError
-  end
-  
-  class SynchronizationError < RuntimeError
-  end
-  
-  # Raised if a method depends on functionality not yet completed in libmemcached. 
-  class NotImplemented < NoMethodError
-  end
+  end 
 
 #:stopdoc:
 
@@ -58,7 +51,7 @@ Subclasses correspond one-to-one with server response strings or libmemcached er
     private
     def camelize(string)
       string.downcase.gsub('/', ' or ').split(' ').map {|s| s.capitalize}.join
-    end   
+    end           
   end
   
   EXCEPTIONS = []
@@ -72,6 +65,25 @@ Subclasses correspond one-to-one with server response strings or libmemcached er
     EXCEPTIONS << exception_class
   end
   
+  class NotFound
+    def self.remove_backtraces
+      class_eval do
+        def set_backtrace(*args); []; end
+        alias :backtrace :set_backtrace
+      end
+    end
+    
+    def self.restore_backtraces
+      class_eval do
+        begin
+          remove_method :set_backtrace
+          remove_method :backtrace
+        rescue NameError
+        end
+      end
+    end
+  end
+  
   # Verify library version
   # XXX Waiting on libmemcached 0.14
   

data/lib/memcached/memcached.rb

@@ -13,7 +13,8 @@ class Memcached
     :buffer_requests => false,
     :support_cas => false,
     :tcp_nodelay => false,
-    :namespace => nil    
+    :show_not_found_backtraces => false,
+    :namespace => nil
   } 
     
   # :sort_hosts => false # XXX No effect due to libmemcached 0.16 bug
@@ -43,6 +44,7 @@ Valid option parameters are:
 <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.
 <tt>:no_block</tt>:: Whether to use non-blocking, asynchronous IO for writes. Accepts <tt>true</tt> or <tt>false</tt>.
 <tt>:buffer_requests</tt>:: Whether to use an internal write buffer. Accepts <tt>true</tt> or <tt>false</tt>. Calling <tt>get</tt> or closing the connection will force the buffer to flush. Note that <tt>:buffer_requests</tt> might not work well without <tt>:no_block</tt> also enabled.
+<tt>:show_not_found_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.
 
 Please note that when non-blocking IO is enabled, setter and deleter methods do not raise on errors. For example, if you try to set an invalid key with <tt>:no_block => true</tt>, it will appear to succeed. The actual setting of the key occurs after libmemcached has returned control to your program, so there is no way to backtrack and raise the exception.
 
@@ -65,7 +67,9 @@ Please note that when non-blocking IO is enabled, setter and deleter methods do
     # Behaviors
     @options = DEFAULTS.merge(opts)
     options.each do |option, value|
-      set_behavior(option, value) unless option == :namespace
+      unless [:namespace, :show_not_found_backtraces].include? option
+        set_behavior(option, value) 
+      end
     end
     
     # Make sure :buffer_requests uses :no_block
@@ -78,6 +82,16 @@ Please note that when non-blocking IO is enabled, setter and deleter methods do
     raise ArgumentError, "Invalid namespace" if options[:namespace].to_s =~ / /
     @namespace = options[:namespace].to_s
     @namespace_size = @namespace.size
+    
+    # Not found exceptions
+    # Note that these have global effects since the NotFound class itself is modified. You should only 
+    # be enabling the backtrace for debugging purposes, so it's not really a big deal.
+    if options[:show_not_found_backtraces]
+      NotFound.restore_backtraces
+    else
+      NotFound.remove_backtraces
+    end
+    
   end
 
   # Return the array of server strings used to configure this instance.

data/memcached.gemspec

@@ -1,16 +1,16 @@
 
-# Gem::Specification for Memcached-0.8
+# Gem::Specification for Memcached-0.8.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.8"
+  s.version = "0.8.1"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.date = %q{2008-02-18}
+  s.date = %q{2008-02-21}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]

data/test/profile/benchmark.rb

@@ -2,6 +2,8 @@
 HERE = File.dirname(__FILE__)
 $LOAD_PATH << "#{HERE}/../../lib/"
 
+require 'memcached'
+
 require 'benchmark'
 require 'rubygems'
 
@@ -23,347 +25,390 @@ ARGV.grep(/--with-(\w+)/) do
   end
 end
 
-# We'll use a simple @value to try to avoid spending time in Marshal,
-# which is a constant penalty that both clients have to pay
-@value = []
-@marshalled = Marshal.dump(@value)
-
-@opts = [
-  ['127.0.0.1:43042', '127.0.0.1:43043'],
-  {
-    :buffer_requests => false,
-    :no_block => false,
-    :namespace => "benchmark_namespace"
-  }
-]
-@key1 = "Short"
-@key2 = "Sym1-2-3::45"*8
-@key3 = "Long"*40
-@key4 = "Medium"*8
+recursion = ARGV.grep(/--recursion/).first[/(\d+)/, 1].to_i rescue 0
 
-def restart_servers
-  system("ruby #{HERE}/../setup.rb")
-  sleep(1)
-end
+class Bench
 
-restart_servers
+  def initialize(recursion)
 
-Benchmark.bm(31) do |x|
-
-  n = 2500
+    @recursion = recursion
+    puts "Recursion level is #{@recursion}"
+    
+    # We'll use a simple @value to try to avoid spending time in Marshal,
+    # which is a constant penalty that both clients have to pay
+    @value = []
+    @marshalled = Marshal.dump(@value)
+    
+    @opts = [
+      ['127.0.0.1:43042', '127.0.0.1:43043'],
+      {
+        :buffer_requests => false,
+        :no_block => false,
+        :namespace => "benchmark_namespace"
+      }
+    ]
+    @key1 = "Short"
+    @key2 = "Sym1-2-3::45"*8
+    @key3 = "Long"*40
+    @key4 = "Medium"*8        
+    
+    restart_servers
+  end
 
-  if defined? Memcached
-    @m = Memcached.new(
-    @opts[0],
-    @opts[1].merge(:no_block => true, :buffer_requests => true)
-    )
-    x.report("set:plain:noblock:memcached") 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)
-    x.report("set:plain:memcached") 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 # if false
+  def run(level = @recursion)
+    if level > 0
+      run_inner(level - 1)
+    else
+      benchmark
+    end  
   end
-  #  Not supported by Caffeine
-  if defined? MemCache
-    @m = MemCache.new(*@opts)
-    x.report("set:plain:memcache-client") do
-      n.times do
-        @m.set @key1, @marshalled, 0, true
-        @m.set @key2, @marshalled, 0, true
-        @m.set @key3, @marshalled, 0, true
-        @m.set @key1, @marshalled, 0, true
-        @m.set @key2, @marshalled, 0, true
-        @m.set @key3, @marshalled, 0, true
-      end
-    end
+  
+  def run_inner(level)
+    run(level)
+  end
+  
+  private
+  
+  def restart_servers
+    system("ruby #{HERE}/../setup.rb")
+    sleep(1)
   end
 
-  # restart_servers
-
-
-  if defined? Memcached
-    @m = Memcached.new(
-    @opts[0],
-    @opts[1].merge(:no_block => true, :buffer_requests => true)
-    )
-    x.report("set:ruby:noblock:memcached") 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
+  def benchmark    
+    Benchmark.bm(31) do |x|
+    
+      n = 2500
+    
+      if defined? Memcached
+        @m = Memcached.new(
+        @opts[0],
+        @opts[1].merge(:no_block => true, :buffer_requests => true)
+        )
+        x.report("set:plain:noblock:memcached") 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)
+        x.report("set:plain:memcached") 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 # if false
       end
-    end
-    @m = Memcached.new(*@opts)
-    x.report("set:ruby:memcached") 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
+      #  Not supported by Caffeine
+      if defined? MemCache
+        @m = MemCache.new(*@opts)
+        x.report("set:plain:memcache-client") do
+          n.times do
+            @m.set @key1, @marshalled, 0, true
+            @m.set @key2, @marshalled, 0, true
+            @m.set @key3, @marshalled, 0, true
+            @m.set @key1, @marshalled, 0, true
+            @m.set @key2, @marshalled, 0, true
+            @m.set @key3, @marshalled, 0, true
+          end
+        end
       end
-    end # if false
-  end
-  if defined? Caffeine
-    @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
-    x.report("set:ruby:caffeine") 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
+    
+      # restart_servers
+    
+    
+      if defined? Memcached
+        @m = Memcached.new(
+        @opts[0],
+        @opts[1].merge(:no_block => true, :buffer_requests => true)
+        )
+        x.report("set:ruby:noblock:memcached") 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)
+        x.report("set:ruby:memcached") 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 # if false
       end
-    end
-  end
-  if defined? MemCache
-    @m = MemCache.new(*@opts)
-    x.report("set:ruby:memcache-client") 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
+      if defined? Caffeine
+        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        x.report("set:ruby:caffeine") 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
-    end
-  end
-
-  if defined? Memcached
-    @m = Memcached.new(*@opts)
-    x.report("get:plain:memcached") 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
+      if defined? MemCache
+        @m = MemCache.new(*@opts)
+        x.report("set:ruby:memcache-client") 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
-    end
-  end
-  #  Not supported by Caffeine
-  if defined? MemCache
-    @m = MemCache.new(*@opts)
-    x.report("get:plain:memcache-client") do
-      n.times do
-        @m.get @key1, true
-        @m.get @key2, true
-        @m.get @key3, true
-        @m.get @key1, true
-        @m.get @key2, true
-        @m.get @key3, true
+    
+      if defined? Memcached
+        @m = Memcached.new(*@opts)
+        x.report("get:plain:memcached") 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
       end
-    end
-  end
-
-  if defined? Memcached
-    @m = Memcached.new(*@opts)
-    x.report("get:ruby:memcached") do
-      n.times do
-        @m.get @key1
-        @m.get @key2
-        @m.get @key3
-        @m.get @key1
-        @m.get @key2
-        @m.get @key3
+      #  Not supported by Caffeine
+      if defined? MemCache
+        @m = MemCache.new(*@opts)
+        x.report("get:plain:memcache-client") do
+          n.times do
+            @m.get @key1, true
+            @m.get @key2, true
+            @m.get @key3, true
+            @m.get @key1, true
+            @m.get @key2, true
+            @m.get @key3, true
+          end
+        end
       end
-    end
-  end
-  if defined? Caffeine
-    @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
-    x.report("get:ruby:caffeine") do
-      n.times do
-        @m.get @key1
-        @m.get @key2
-        @m.get @key3
-        @m.get @key1
-        @m.get @key2
-        @m.get @key3
+    
+      if defined? Memcached
+        @m = Memcached.new(*@opts)
+        x.report("get:ruby:memcached") do
+          n.times do
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+          end
+        end
       end
-    end
-  end
-  if defined? MemCache
-    @m = MemCache.new(*@opts)
-    x.report("get:ruby:memcache-client") do
-      n.times do
-        @m.get @key1
-        @m.get @key2
-        @m.get @key3
-        @m.get @key1
-        @m.get @key2
-        @m.get @key3
+      if defined? Caffeine
+        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        x.report("get:ruby:caffeine") do
+          n.times do
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+          end
+        end
       end
-    end
-  end
-
-  # restart_servers
-
-  if defined? Memcached
-    @m = Memcached.new(*@opts)
-    x.report("missing:ruby:memcached") 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
+      if defined? MemCache
+        @m = MemCache.new(*@opts)
+        x.report("get:ruby:memcache-client") do
+          n.times do
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+            @m.get @key1
+            @m.get @key2
+            @m.get @key3
+          end
+        end
       end
-    end
-  end
-  if defined? Caffeine
-    @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
-    x.report("missing:ruby:caffeine") do
-      n.times do
-        begin @m.delete @key1; rescue; end
-        begin @m.get @key1; rescue; end
-        begin @m.delete @key2; rescue; end
-        begin @m.get @key2; rescue; end
-        begin @m.delete @key3; rescue; end
-        begin @m.get @key3; rescue; end
+    
+      # restart_servers
+    
+      if defined? Memcached
+        @m = Memcached.new(*@opts)
+        x.report("missing:ruby:memcached") 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
       end
-    end
-  end
-  if defined? MemCache
-    @m = MemCache.new(*@opts)
-    x.report("missing:ruby:memcache-client") do
-      n.times do
-        begin @m.delete @key1; rescue; end
-        begin @m.get @key1; rescue; end
-        begin @m.delete @key2; rescue; end
-        begin @m.get @key2; rescue; end
-        begin @m.delete @key3; rescue; end
-        begin @m.get @key3; rescue; end
+      if defined? Memcached
+        @m = Memcached.new(*@opts)
+        x.report("missing:ruby:memcached: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
-    end
-  end
-
-  # restart_servers
-
-  if defined? Memcached
-    @m = Memcached.new(
-    @opts[0],
-    @opts[1].merge(:no_block => true, :buffer_requests => true)
-    )
-    x.report("mixed:ruby:noblock:memcached") 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
+      if defined? Caffeine
+        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        x.report("missing:ruby:caffeine") do
+          n.times do
+            begin @m.delete @key1; rescue; end
+            begin @m.get @key1; rescue; end
+            begin @m.delete @key2; rescue; end
+            begin @m.get @key2; rescue; end
+            begin @m.delete @key3; rescue; end
+            begin @m.get @key3; rescue; end
+          end
+        end
       end
-    end
-    @m = Memcached.new(*@opts)
-    x.report("mixed:ruby:memcached") 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
+      if defined? MemCache
+        @m = MemCache.new(*@opts)
+        x.report("missing:ruby:memcache-client") do
+          n.times do
+            begin @m.delete @key1; rescue; end
+            begin @m.get @key1; rescue; end
+            begin @m.delete @key2; rescue; end
+            begin @m.get @key2; rescue; end
+            begin @m.delete @key3; rescue; end
+            begin @m.get @key3; rescue; end
+          end
+        end
       end
-    end # if false
-  end
-  if defined? Caffeine
-    @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
-    x.report("mixed:ruby:caffeine") 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
+          
+      # restart_servers
+    
+      if defined? Memcached
+        @m = Memcached.new(
+        @opts[0],
+        @opts[1].merge(:no_block => true, :buffer_requests => true)
+        )
+        x.report("mixed:ruby:noblock:memcached") 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)
+        x.report("mixed:ruby:memcached") 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
       end
-    end
-  end
-  if defined? MemCache
-    @m = MemCache.new(*@opts)
-    x.report("mixed:ruby:memcache-client") 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
+      if defined? Caffeine
+        @m = Caffeine::MemCache.new(@opts[1]); @m.servers = @opts[0]
+        x.report("mixed:ruby:caffeine") 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
       end
-    end
-  end
-
-  # restart_servers
-
-  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
+      if defined? MemCache
+        @m = MemCache.new(*@opts)
+        x.report("mixed:ruby:memcache-client") 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
+            @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
+      end
+    
+      # restart_servers
+    
+      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
+              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
+              end
+            end
           end
         end
+    
       end
     end
-
+    
   end
 end
 
+Bench.new(recursion).run
+
 if Process.respond_to? :memory
   Process.memory.each do |key, value|
     puts "#{key}: #{value/1024.0}M"

data/test/unit/memcached_test.rb

@@ -75,6 +75,28 @@ class MemcachedTest < Test::Unit::TestCase
     end
   end
   
+  def test_initialize_without_not_found_backtraces
+    cache = Memcached.new @servers,
+      :show_not_found_backtraces => false
+    cache.delete key rescue
+    begin
+      cache.get key
+    rescue Memcached::NotFound => e
+      assert e.backtrace.empty?
+    end
+  end
+
+  def test_initialize_with_not_found_backtraces
+    cache = Memcached.new @servers,
+      :show_not_found_backtraces => true
+    cache.delete key rescue
+    begin
+      cache.get key
+    rescue Memcached::NotFound => e
+      assert !e.backtrace.empty?
+    end  
+  end  
+  
   def test_initialize_sort_hosts
     # Original
     cache = Memcached.new(@servers.sort)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  version: "0.8"
+  version: 0.8.1
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-02-18 00:00:00 -05:00
+date: 2008-02-21 00:00:00 -05:00
 default_executable: 
 dependencies: []