memcached 0.16 → 0.16.1

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.16.1. Use seeded random. Fix realloc bug on Linux.
+
 v0.16. Build properly on OS X Snow Leopard.
 
 v0.15.3. UDP fix. 0-value fix. Enforce server_add response code. Better tests.

data/ext/extconf.rb

@@ -7,12 +7,12 @@ BUNDLE_PATH = BUNDLE.sub(".tar.gz", "")
 DARWIN = `uname -sp` == "Darwin i386\n"
 
 # is there a better way to do this?
-if ENV['ARCHFLAGS']
-  archflags = ENV['ARCHFLAGS']
+archflags = if ENV['ARCHFLAGS']
+  ENV['ARCHFLAGS']
 elsif Config::CONFIG['host_os'] == 'darwin10.0'
-  archflags = "-arch i386 -arch x86_64"
+  "-arch i386 -arch x86_64"
 elsif Config::CONFIG['host_os'] =~ /darwin/
-  archflags = "-arch i386 -arch ppc"
+  "-arch i386 -arch ppc"
 else
   archflags = ''
 end
@@ -58,7 +58,7 @@ if !ENV["EXTERNAL_LIB"]
         puts(cmd = "make install || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
       end
-      system("rm -rf #{BUNDLE_PATH}")
+      system("rm -rf #{BUNDLE_PATH}") unless ENV['DEV']
     end
   end
   

data/memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.16"
+  s.version = "0.16.1"
 
   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-08-30}
+  s.date = %q{2009-09-02}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]

data/test/profile/benchmark.rb

@@ -4,25 +4,21 @@ $LOAD_PATH << "#{HERE}/../../lib/"
 UNIX_SOCKET_NAME = File.join(ENV['TMPDIR']||'/tmp','memcached') 
 
 require 'memcached'
-
 require 'benchmark'
 require 'rubygems'
+require 'ruby-debug' if ENV['DEBUG']
+begin; require 'memory'; rescue LoadError; end
 
-begin
-  require 'memory'
-rescue LoadError
-end
+ARGV << "--with-memcached" << "--with-memcache-client" if ARGV.join !~ /--with/
 
-if ARGV.join !~ /--with/
-  ARGV << "--with-memcached" << "--with-memcache-client" << "--with-caffeine"
-end
-
-ARGV.grep(/--with-(\w+)/) do
+ARGV.each do |flag|
+  require_name = flag[/--with-(\w+)/, 1]
+  gem_name = flag[/--with-(.*)$/, 1]
   begin
-    puts "Loading #{$1}"
-    require $1
+    require require_name
+    gem gem_name
+    puts "Loaded #{$1} #{Gem.loaded_specs[gem_name].version.to_s rescue nil}"
   rescue LoadError
-    puts "Failed"
   end
 end
 
@@ -42,19 +38,11 @@ class Bench
     
     @opts_networked = [
       ['127.0.0.1:43042', '127.0.0.1:43043'],
-      {
-        :buffer_requests => false,
-        :no_block => false,
-        :namespace => "namespace"
-      }
+      {:buffer_requests => false, :no_block => false, :namespace => "namespace"}
     ]
     @opt_unix = [
       ["#{UNIX_SOCKET_NAME}0","#{UNIX_SOCKET_NAME}1"],
-      {
-        :buffer_requests => false,
-        :no_block => false,
-        :namespace => "namespace"
-      }
+      {:buffer_requests => false, :no_block => false, :namespace => "namespace"}
     ]
     @key1 = "Short"
     @key2 = "Sym1-2-3::45"*8
@@ -64,28 +52,16 @@ class Bench
     @key5 = "Medium2"*8 
     @key6 = "Long3"*40 
     
-    restart_servers
+    system("ruby #{HERE}/../setup.rb")
+    sleep(1)
   end
 
   def run(level = @recursion)
-    if level > 0
-      run_inner(level - 1)
-    else
-      benchmark
-    end  
-  end
-  
-  def run_inner(level)
-    run(level)
+    level > 0 ? run(level - 1) : benchmark
   end
   
   private
   
-  def restart_servers
-    system("ruby #{HERE}/../setup.rb")
-    sleep(1)
-  end
-
   def benchmark    
     Benchmark.bm(35) do |x|
     
@@ -143,7 +119,6 @@ class Bench
           end
         end
       end
-      #  Not supported by Caffeine
       if defined? MemCache
         @m = MemCache.new(*@opts_networked)
         x.report("set:plain:memcache-client") do
@@ -158,9 +133,6 @@ class Bench
         end
       end
     
-      # restart_servers
-    
-    
       if defined? Memcached
         @m = Memcached.new(
         @opts_networked[0],
@@ -213,19 +185,6 @@ class Bench
           end
         end
       end
-      if defined? Caffeine
-        @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
-            @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? MemCache
         @m = MemCache.new(*@opts_networked)
         x.report("set:ruby:memcache-client") do
@@ -264,7 +223,6 @@ class Bench
           end
         end
       end
-      #  Not supported by Caffeine
       if defined? MemCache
         @m = MemCache.new(*@opts_networked)
         x.report("get:plain:memcache-client") do
@@ -303,19 +261,6 @@ class Bench
           end
         end
       end
-      if defined? Caffeine
-        @m = Caffeine::MemCache.new(@opts_networked[1]); @m.servers = @opts_networked[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
       if defined? MemCache
         @m = MemCache.new(*@opts_networked)
         x.report("get:ruby:memcache-client") do
@@ -352,15 +297,6 @@ class Bench
           end
         end
       end
-      if defined? Caffeine
-        @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
-            @m.get @key1, @key2, @key3, @key4, @key5, @key6
-          end
-        end
-      end
       if defined? MemCache
         @m = MemCache.new(*@opts_networked)
         x.report("multiget:ruby:memcache-client") do
@@ -371,8 +307,6 @@ class Bench
         end
       end
     
-      # restart_servers
-    
       if defined? Memcached
         @m = Memcached.new(*@opts_networked)
         x.report("missing:ruby:memcached:net") do
@@ -421,19 +355,6 @@ class Bench
           end
         end
       end
-      if defined? Caffeine
-        @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
-            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
       if defined? MemCache
         @m = MemCache.new(*@opts_networked)
         x.report("missing:ruby:memcache-client") do
@@ -448,8 +369,6 @@ class Bench
         end
       end
           
-      # restart_servers
-    
       if defined? Memcached
         @m = Memcached.new(
         @opts_networked[0],
@@ -526,25 +445,6 @@ class Bench
           end
         end # if false
       end
-      if defined? Caffeine
-        @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
-            @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
       if defined? MemCache
         @m = MemCache.new(*@opts_networked)
         x.report("mixed:ruby:memcache-client") do
@@ -565,8 +465,6 @@ class Bench
         end
       end
     
-      # restart_servers
-    
       if defined? Memcached
         unless ARGV.include? "--no-hash"
           Memcached::HASH_VALUES.each do |mode, int|

data/test/unit/memcached_test.rb

@@ -381,20 +381,22 @@ class MemcachedTest < Test::Unit::TestCase
       @cache.get(["#{key}_1", "#{key}_2"])
     end
   end
-
-  def test_get_with_random_distribution
+  
+  def test_random_distribution_is_statistically_random
     cache = Memcached.new(@servers, :distribution => :random)
-    cache.set key, @value
+    cache.flush
+    20.times { |i| cache.set "#{key}#{i}", @value }
     
-    hits = (0..10).to_a.map do
+    cache, hits = Memcached.new(@servers.first), 0
+    20.times do |i| 
       begin
-        cache.get(key)
+        cache.get "#{key}#{i}"
+        hits += 1
       rescue Memcached::NotFound
       end
-    end.compact.size
+    end
 
-    assert 0 < hits
-    assert 10 > hits
+    assert_not_equal 4, hits
   end
 
   # Set

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  version: "0.16"
+  version: 0.16.1
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-08-30 00:00:00 -07:00
+date: 2009-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: []