binary42-remix-stash 0.9.2 → 0.9.3

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/benchmarks/get_set.rb

@@ -1,20 +1,29 @@
 require 'benchmark'
 require File.dirname(__FILE__) + '/../harness'
-require File.dirname(__FILE__) + '/../harness_cache'
 
-LARGE_NUMBER = 200_000
+LARGE_NUMBER = 20_000
 
 Benchmark.bmbm do |b|
-  b.report('get/set stash') do
+  b.report('get/set remix-stash') do
     LARGE_NUMBER.times {|n|
       stash[:abcxyz123] = n
       stash[:abcxyz123]
     }
   end
-  b.report('get/set cache') do
-    LARGE_NUMBER.times {|n|
-      Cache.set('abcxyz123', n)
-      Cache.get('abcxyz123')
-    }
+  if defined?(CCache)
+    b.report('get/set memcached') do
+      LARGE_NUMBER.times {|n|
+        CCache.set('abcxyz123', n)
+        CCache.get('abcxyz123')
+      }
+    end
+  end
+  if defined?(RCache)
+    b.report('get/set memcache-client') do
+      LARGE_NUMBER.times {|n|
+        RCache.set('abcxyz123', n)
+        RCache.get('abcxyz123')
+      }
+    end
   end
 end

data/benchmarks/payload.rb

@@ -1,40 +1,82 @@
 require 'benchmark'
 require File.dirname(__FILE__) + '/../harness'
-require File.dirname(__FILE__) + '/../harness_cache'
 
 LARGE_NUMBER = 20_000
 
-large_value = 'a' * 100_000
-med_value = 'b' * 2_000
-small_value = 'c' * 100
-tiny_value = 'd'
+huge_value = 'a' * 100_000
+large_value = 'b' * 20_000
+med_value = 'c' * 2_000
+small_value = 'd' * 100
+tiny_value = 'e'
 
 KEY = 'abc123xyz'
 
 Benchmark.bmbm do |b|
-  b.report('100k stash') do
+  b.report('100k remix-stash') do
     LARGE_NUMBER.times {
-      stash.write(KEY, large_value)
+      stash.write(KEY, huge_value)
       stash.read(KEY)
     }
   end
-  b.report('100k cache') do
+  if defined?(CCache)
+    b.report('100k memcached') do
+      LARGE_NUMBER.times {
+        CCache.set(KEY, huge_value, 0, true)
+        CCache.get(KEY, true)
+      }
+    end
+  end
+  if defined?(RCache)
+    b.report('100k memcache-client') do
+      LARGE_NUMBER.times {
+        RCache.set(KEY, huge_value, 0, true)
+        RCache.get(KEY, true)
+      }
+    end
+  end
+  b.report('20k remix-stash') do
     LARGE_NUMBER.times {
-      Cache.set(KEY, large_value, 0, true)
-      Cache.get(KEY, true)
+      stash.write(KEY, large_value)
+      stash.read(KEY)
     }
   end
+  if defined?(CCache)
+    b.report('20k memcached') do
+      LARGE_NUMBER.times {
+        CCache.set(KEY, large_value, 0, true)
+        CCache.get(KEY, true)
+      }
+    end
+  end
+  if defined?(RCache)
+    b.report('20k memcache-client') do
+      LARGE_NUMBER.times {
+        RCache.set(KEY, large_value, 0, true)
+        RCache.get(KEY, true)
+      }
+    end
+  end
   b.report('2k stash') do
     LARGE_NUMBER.times {
       stash.write(KEY, med_value)
       stash.read(KEY)
     }
   end
-  b.report('2k cache') do
-    LARGE_NUMBER.times {
-      Cache.set(KEY, med_value, 0, true)
-      Cache.get(KEY, true)
-    }
+  if defined?(CCache)
+    b.report('2k memcached') do
+      LARGE_NUMBER.times {
+        CCache.set(KEY, med_value, 0, true)
+        CCache.get(KEY, true)
+      }
+    end
+  end
+  if defined?(RCache)
+    b.report('2k memcache-client') do
+      LARGE_NUMBER.times {
+        RCache.set(KEY, med_value, 0, true)
+        RCache.get(KEY, true)
+      }
+    end
   end
   b.report('100b stash') do
     LARGE_NUMBER.times {
@@ -42,11 +84,21 @@ Benchmark.bmbm do |b|
       stash.read(KEY)
     }
   end
-  b.report('100b cache') do
-    LARGE_NUMBER.times {
-      Cache.set(KEY, small_value, 0, true)
-      Cache.get(KEY, true)
-    }
+  if defined?(CCache)
+    b.report('100b memcached') do
+      LARGE_NUMBER.times {
+        CCache.set(KEY, small_value, 0, true)
+        CCache.get(KEY, true)
+      }
+    end
+  end
+  if defined?(RCache)
+    b.report('100b memcache-client') do
+      LARGE_NUMBER.times {
+        RCache.set(KEY, small_value, 0, true)
+        RCache.get(KEY, true)
+      }
+    end
   end
   b.report('1b stash') do
     LARGE_NUMBER.times {
@@ -54,10 +106,20 @@ Benchmark.bmbm do |b|
       stash.read(KEY)
     }
   end
-  b.report('1b cache') do
-    LARGE_NUMBER.times {
-      Cache.set(KEY, tiny_value, 0, true)
-      Cache.get(KEY, true)
-    }
+  if defined?(CCache)
+    b.report('1b memcached') do
+      LARGE_NUMBER.times {
+        CCache.set(KEY, tiny_value, 0, true)
+        CCache.get(KEY, true)
+      }
+    end
+  end
+  if defined?(RCache)
+    b.report('1b memcache-client') do
+      LARGE_NUMBER.times {
+        RCache.set(KEY, tiny_value, 0, true)
+        RCache.get(KEY, true)
+      }
+    end
   end
 end

data/examples/eval.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../harness'
 
 stuff = stash(:stuff)
 
-stuff.eval(:answer) {42}
-p stuff.get(:answer)
+stuff.eval(:ans) {42}
+p stuff.get(:ans)
 
-stuff.eval(:asnwer) {fail 'Cache miss'}
+stuff.eval(:ans) {fail 'Cache miss'}

data/harness.rb

@@ -1,4 +1,19 @@
-$LOAD_PATH << File.dirname(__FILE__) + '/lib'
+require 'rubygems'
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
 require 'remix/stash'
 
+begin
+  require 'memcached'
+  CCache = Memcached.new('localhost:11211')
+rescue
+  puts "memcached not found (skipping)"
+end
+
+begin
+  require 'memcache'
+  RCache = MemCache.new('localhost:11211')
+rescue
+  puts "memcached-client not found (skipping)"
+end
+
 stash.clear

data/lib/remix/stash/cluster.rb

@@ -1,7 +1,7 @@
 require 'socket'
 require 'digest/md5'
 
-class Stash::Cluster
+class Remix::Stash::Cluster
   include Socket::Constants
 
   @@connections = {}
@@ -17,7 +17,15 @@ class Stash::Cluster
 
   def each
     @hosts.each do |h|
-      yield(host_to_io(*h))
+      begin
+        io = host_to_io(*h)
+        break yield(io)
+      rescue Errno::EPIPE, Errno::ECONNRESET
+        io.close
+        retry
+      rescue Stash::ProtocolError, Errno::EAGAIN
+        next
+      end
     end
   end
 
@@ -34,8 +42,12 @@ class Stash::Cluster
     end
     count.times do |try|
       begin
-        break yield(host_to_io(*@hosts[(hash + try) % count]))
-      rescue Stash::ProtocolError
+        io = host_to_io(*@hosts[(hash + try) % count])
+        break yield(io)
+      rescue Errno::EPIPE, Errno::ECONNRESET
+        io.close
+        retry
+      rescue Stash::ProtocolError, Errno::EAGAIN
         next
       end
       raise Stash::ClusterError,
@@ -68,7 +80,10 @@ private
   end
 
   def host_to_io(key, host, port)
-    @@connections[key] ||= connect(host, port)
+    socket = @@connections[key] ||= connect(host, port)
+    return socket unless socket.closed?
+    @@connections.delete(key)
+    host_to_io(key, host, port)
   end
 
 end

data/lib/remix/stash/extension.rb

@@ -1,8 +1,7 @@
-module Stash::Extension
-  extend self
+module Remix::Stash::Extension
 
   def stash(name = :root)
-    Stash.new(name)
+    Remix::Stash.new(name)
   end
 
 end

data/lib/remix/stash/protocol.rb

@@ -1,4 +1,4 @@
-module Stash::Protocol
+module Remix::Stash::Protocol
   extend self
 
   HEADER_FORMAT = "CCnCCnNNQ"
@@ -93,10 +93,6 @@ module Stash::Protocol
     resp[:status] == NO_ERROR ? parse_get(resp[:body])[:value] : nil
   end
 
-  def get_value(io, key)
-    load_ruby_value(get(io, key))
-  end
-
   INCR_PACKET = HEADER_FORMAT + 'NNQNa*'
   def incr(io, key, step)
     low, high = split64(step)
@@ -116,18 +112,8 @@ module Stash::Protocol
     resp[:status] == NO_ERROR
   end
 
-  def set_value(io, key, value, ttl = 0)
-    set(io, key, Marshal.dump(value), ttl)
-  end
-
 private
 
-  def load_ruby_value(data)
-    return unless data
-    # TODO: Catch errors and try to fix them
-    Marshal.load(data)
-  end
-
   def parse_get(body)
     extra, value = body.unpack('Na*')
     {:extra => extra, :value => value}

data/lib/remix/stash.rb

@@ -1,4 +1,6 @@
-class Stash
+module Remix; end
+
+class Remix::Stash
   require 'remix/stash/extension'
   require 'remix/stash/cluster'
   require 'remix/stash/protocol'
@@ -96,12 +98,14 @@ class Stash
     opts = default_opts(keys)
     key = canonical_key(keys)
     cluster.select(key) {|io|
-      value = Protocol.get_value(io, key)
-      unless value
+      value = Protocol.get(io, key)
+      if value
+        Marshal.load(value)
+      else
         value = yield(*keys)
-        Protocol.set_value(io, key, value, opts[:ttl])
+        Protocol.set(io, key, dump_value(value), opts[:ttl])
+        value
       end
-      value
     }
   end
 
@@ -119,7 +123,7 @@ class Stash
 
   def get(*keys)
     key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.get_value(io, key)}
+    cluster.select(key) {|io| load_value(Protocol.get(io, key))}
   end
   alias [] get
 
@@ -147,7 +151,7 @@ class Stash
     opts = default_opts(keys)
     value = keys.pop
     key = canonical_key(keys)
-    cluster.select(key) {|io| Protocol.set_value(io, key, value, opts[:ttl])}
+    cluster.select(key) {|io| Protocol.set(io, key, dump_value(value), opts[:ttl])}
   end
   alias []= set
 
@@ -179,10 +183,14 @@ private
     default[:coherency]
   end
 
-  def default_opts(params)
+  def default_opts(params = {})
     params.last.is_a?(Hash) ? default.merge(params.pop) : default
   end
 
+  def dump_value(value)
+    Marshal.dump(value)
+  end
+
   EMPTY_SCOPE = ''
   def implicit_scope
     if @scope
@@ -193,9 +201,17 @@ private
     end
   end
 
+  def load_value(data)
+    Marshal.load(data) if data
+  rescue TypeError, ArgumentError
+    logger = default_opts[:logger]
+    logger && logger.error("[stash] Unable to load marshal stream: #{data.inspect}")
+    nil
+  end
+
   def vector
-    return 'static' if @name == :root
-    return @vector.to_s if @vector && coherency != :dynamic
+    return if @name == :root
+    return @vector if @vector && coherency != :dynamic
     vk = vector_key
     cluster.select(vk) do |io|
       @vector = Protocol.get(io, vk)
@@ -216,4 +232,5 @@ private
 
 end
 
-class Object; include Stash::Extension end
+class Object; include Remix::Stash::Extension end
+module Remix; extend Remix::Stash::Extension end

data/remix-stash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remix-stash}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Mitchell"]
-  s.date = %q{2009-09-09}
+  s.date = %q{2009-09-16}
   s.email = %q{binary42@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -26,11 +26,9 @@ Gem::Specification.new do |s|
      "examples/eval.rb",
      "examples/gate.rb",
      "examples/getset.rb",
-     "examples/getset_cache.rb",
      "examples/scope.rb",
      "examples/stash.rb",
      "harness.rb",
-     "harness_cache.rb",
      "lib/remix/stash.rb",
      "lib/remix/stash/cluster.rb",
      "lib/remix/stash/extension.rb",
@@ -53,7 +51,6 @@ Gem::Specification.new do |s|
      "examples/eval.rb",
      "examples/gate.rb",
      "examples/getset.rb",
-     "examples/getset_cache.rb",
      "examples/scope.rb",
      "examples/stash.rb"
   ]

data/spec/extension_spec.rb

@@ -22,4 +22,16 @@ class ExtensionSpec < Spec
 
   end
 
+  context 'modules' do
+
+    should 'be mixed into Object' do
+      assert Object.respond_to?(:stash)
+    end
+
+    should 'be mixed into Remix' do
+      assert Remix.respond_to?(:stash)
+    end
+
+  end
+
 end

data/spec/spec.rb

@@ -6,3 +6,5 @@ $LOAD_PATH << File.dirname(__FILE__) + '/../lib'
 require 'remix/stash'
 
 Spec = Test::Unit::TestCase
+
+include Remix

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binary42-remix-stash
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Brian Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-09 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -33,11 +33,9 @@ files:
 - examples/eval.rb
 - examples/gate.rb
 - examples/getset.rb
-- examples/getset_cache.rb
 - examples/scope.rb
 - examples/stash.rb
 - harness.rb
-- harness_cache.rb
 - lib/remix/stash.rb
 - lib/remix/stash/cluster.rb
 - lib/remix/stash/extension.rb
@@ -48,6 +46,7 @@ files:
 - spec/stash_spec.rb
 has_rdoc: true
 homepage: http://github.com/binary42/remix-stash
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -68,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Remix your memcache
@@ -79,6 +78,5 @@ test_files:
 - examples/eval.rb
 - examples/gate.rb
 - examples/getset.rb
-- examples/getset_cache.rb
 - examples/scope.rb
 - examples/stash.rb

data/examples/getset_cache.rb

@@ -1,5 +0,0 @@
-require File.dirname(__FILE__) + '/../harness_cache'
-
-# Simple get and set
-Cache.set('answer', 42)
-p Cache.get('answer')

data/harness_cache.rb

@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'memcache'
-
-Cache = MemCache.new(%[localhost:11211])
-Cache.flush_all