RubyGems - memcached - Versions diffs - 0.6 → 0.7 - Mend

memcached 0.6 → 0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

data.tar.gz.sig +0 -0
data/BENCHMARKS +101 -0
data/CHANGELOG +2 -0
data/COMPATIBILITY +9 -0
data/Manifest +9 -5
data/README +13 -25
data/TODO +1 -8
data/ext/extconf.rb +8 -4
data/ext/rlibmemcached.i +156 -0
data/ext/{libmemcached_wrap.c → rlibmemcached_wrap.c} +890 -585
data/lib/memcached.rb +8 -7
data/lib/memcached/behaviors.rb +4 -4
data/lib/memcached/exceptions.rb +7 -4
data/lib/memcached/memcached.rb +82 -49
data/lib/memcached/rails.rb +55 -0
data/memcached.gemspec +14 -6
data/test/profile/benchmark.rb +371 -0
data/test/profile/profile.rb +14 -0
data/test/profile/valgrind.rb +133 -0
data/test/unit/binding_test.rb +1 -1
data/test/unit/memcached_test.rb +67 -15
data/test/unit/rails_test.rb +72 -0
metadata +12 -7
metadata.gz.sig +0 -0
data/ext/libmemcached.i +0 -107
data/test/benchmark/benchmark.rb +0 -259
data/test/benchmark/benchmark_set_get.rb +0 -56
data/test/benchmark/profile.rb +0 -49

data/test/profile/benchmark.rb ADDED

@@ -0,0 +1,371 @@
+HERE = File.dirname(__FILE__)
+$LOAD_PATH << "#{HERE}/../../lib/"
+require 'benchmark'
+require 'rubygems'
+begin
+  require 'memory'
+rescue LoadError
+end
+if ARGV.join !~ /--with/
+  ARGV << "--with-memcached" << "--with-memcache-client" << "--with-caffeine"
+end
+ARGV.grep(/--with-(\w+)/) do
+  begin
+    puts "Loading #{$1}"
+    require $1
+  rescue LoadError
+    puts "Failed"
+  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
+def restart_servers
+  system("ruby #{HERE}/../setup.rb")
+  sleep(1)
+end
+restart_servers
+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
+  #  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
+  # 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
+  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
+  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
+  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
+  #  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
+  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
+  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
+  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
+  # 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
+  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
+  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
+  # 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
+  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
+  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
+      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
+if Process.respond_to? :memory
+  Process.memory.each do |key, value|
+    puts "#{key}: #{value/1024.0}M"
+  end
+end

data/test/profile/profile.rb ADDED

@@ -0,0 +1,14 @@
+HERE = File.dirname(__FILE__)
+$LOAD_PATH << "#{HERE}/../../lib/"
+require 'rubygems'
+require 'memcached'
+require 'ruby-prof'
+result = RubyProf.profile do
+  load "#{HERE}/valgrind.rb"
+end
+printer = RubyProf::GraphPrinter.new(result)
+printer.print(STDOUT, 0)

data/test/profile/valgrind.rb ADDED

@@ -0,0 +1,133 @@
+HERE = File.dirname(__FILE__)
+$LOAD_PATH << "#{HERE}/../../lib/"
+require 'memcached'
+require 'rubygems'
+class Worker
+  def initialize(method_name, iterations)
+    @method = method_name || 'mixed'
+    @i = (iterations || 1000).to_i
+    @key1 = "key1-"*8
+    @key2 = "key2-"*8
+    @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"
+      }
+    ]
+    system("ruby #{HERE}/../setup.rb")
+    sleep(1)
+    @cache = Memcached.new(*@opts)
+    @cache.set @key1, @value
+  end
+  def work
+    case @method
+      when "set"
+        @i.times do
+          @cache.set @key1, @value
+        end
+      when "get"
+        @i.times do
+          @cache.get @key1
+        end
+      when "delete"
+        @i.times do
+          @cache.set @key1, @value
+          @cache.delete @key1
+        end
+      when "delete-miss"
+        @i.times do
+          @cache.delete @key1
+        end
+      when "get-miss"
+        @i.times do
+          begin
+            @cache.get @key2
+          rescue Memcached::NotFound
+          end
+        end
+      when "get-increasing"
+        one_k = "x"*1024
+        @i.times do |i|
+          @cache.set @key1, one_k*(i+1), 0, false
+          @cache.get @key1, false
+        end
+      when "get-miss-increasing"
+        @i.times do |i|
+          @cache.delete @key2 rescue nil
+          begin
+            @cache.get @key2
+          rescue Memcached::NotFound
+          end
+        end
+      when "add"
+        @i.times do
+          begin
+            @cache.delete @key1
+          rescue
+          end
+          @cache.add @key1, @value
+        end
+      when "add-present"
+        @cache.set @key1, @value
+        @i.times do
+          begin
+            @cache.add @key1, @value
+          rescue Memcached::NotStored
+          end
+        end
+      when "mixed"
+        @i.times do
+          @cache.set @key1, @value
+          @cache.get @key1
+        end
+      when "stats"
+        @i.times do
+          @cache.stats
+        end
+      when "multiget"
+        @i.times do
+          @cache.get([@key1, @key2])
+        end
+      when "clone"
+        @i.times do
+          cache = @cache.clone
+          cache.destroy(false)
+        end
+      when "clone-nodestroy"
+        @i.times do
+          @cache.clone
+        end
+      when "servers"
+        @i.times do
+          @cache.servers
+        end
+      else
+        raise "No such method"
+    end
+    @cache.destroy
+  end
+end
+Worker.new(ENV['METHOD'], ENV['LOOPS']).work
+begin
+  require 'memory'
+  Process.memory.each do |key, value|
+    puts "#{key}: #{value/1024.0}M"
+  end
+rescue LoadError
+end