binary42-remix-stash 0.9.4 → 0.9.5

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/benchmarks/get_set.rb

@@ -1,7 +1,7 @@
 require 'benchmark'
 require File.dirname(__FILE__) + '/../harness'
 
-LARGE_NUMBER = 20_000
+LARGE_NUMBER = 50_000
 
 Benchmark.bmbm do |b|
   b.report('get/set remix-stash') do
@@ -10,11 +10,17 @@ Benchmark.bmbm do |b|
       stash[:abcxyz123]
     }
   end
+  b.report('get/set remix-stash named') do
+    LARGE_NUMBER.times {|n|
+      stash(:stuff)[:abcxyz123] = n
+      stash(:stuff)[:abcxyz123]
+    }
+  end
   if defined?(CCache)
     b.report('get/set memcached') do
       LARGE_NUMBER.times {|n|
-        CCache.set('abcxyz123', n)
-        CCache.get('abcxyz123')
+        CCache.set('abcxyz123', n, 0 , true)
+        CCache.get('abcxyz123', true)
       }
     end
   end

data/benchmarks/payload.rb

@@ -21,8 +21,8 @@ Benchmark.bmbm do |b|
   if defined?(CCache)
     b.report('100k memcached') do
       LARGE_NUMBER.times {
-        CCache.set(KEY, huge_value, 0, true)
-        CCache.get(KEY, true)
+        CCache.set(KEY, huge_value, 0, false)
+        CCache.get(KEY, false)
       }
     end
   end
@@ -43,8 +43,8 @@ Benchmark.bmbm do |b|
   if defined?(CCache)
     b.report('20k memcached') do
       LARGE_NUMBER.times {
-        CCache.set(KEY, large_value, 0, true)
-        CCache.get(KEY, true)
+        CCache.set(KEY, large_value, 0, false)
+        CCache.get(KEY, false)
       }
     end
   end
@@ -65,8 +65,8 @@ Benchmark.bmbm do |b|
   if defined?(CCache)
     b.report('2k memcached') do
       LARGE_NUMBER.times {
-        CCache.set(KEY, med_value, 0, true)
-        CCache.get(KEY, true)
+        CCache.set(KEY, med_value, 0, false)
+        CCache.get(KEY, false)
       }
     end
   end
@@ -87,8 +87,8 @@ Benchmark.bmbm do |b|
   if defined?(CCache)
     b.report('100b memcached') do
       LARGE_NUMBER.times {
-        CCache.set(KEY, small_value, 0, true)
-        CCache.get(KEY, true)
+        CCache.set(KEY, small_value, 0, false)
+        CCache.get(KEY, false)
       }
     end
   end
@@ -109,8 +109,8 @@ Benchmark.bmbm do |b|
   if defined?(CCache)
     b.report('1b memcached') do
       LARGE_NUMBER.times {
-        CCache.set(KEY, tiny_value, 0, true)
-        CCache.get(KEY, true)
+        CCache.set(KEY, tiny_value, 0, false)
+        CCache.get(KEY, false)
       }
     end
   end

data/lib/remix/stash/cluster.rb

@@ -20,10 +20,10 @@ class Remix::Stash::Cluster
       begin
         io = host_to_io(*h)
         break yield(io)
-      rescue Errno::EPIPE, Errno::ECONNRESET
+      rescue Errno::EPIPE, Errno::ECONNRESET, Remix::Stash::ProtocolError
         io.close
         retry
-      rescue Remix::Stash::ProtocolError, Errno::EAGAIN
+      rescue Errno::EAGAIN, Errno::ECONNREFUSED
         next
       end
     end
@@ -43,38 +43,24 @@ class Remix::Stash::Cluster
     count.times do |try|
       begin
         io = host_to_io(*@hosts[(hash + try) % count])
-        break yield(io)
-      rescue Errno::EPIPE, Errno::ECONNRESET
+        return yield(io)
+      rescue Errno::EPIPE, Errno::ECONNRESET, Remix::Stash::ProtocolError
         io.close
         retry
-      rescue Remix::Stash::ProtocolError, Errno::EAGAIN
+      rescue Errno::EAGAIN, Errno::ECONNREFUSED
         next
       end
-      raise Remix::Stash::ClusterError,
-        "Unable to find suitable host to communicate with for #{key.inspect} (MD5-32=#{hash})"
     end
+    raise Remix::Stash::ClusterError,
+      "Unable to find suitable host to communicate with for #{key.inspect} (MD5-32=#{hash})"
   end
 
 private
 
-  if RUBY_PLATFORM =~ /java/
-
-    def connect(host, port)
-      socket = TCPSocket.new(host, port)
-      set_timeout(socket)
-      socket
-    end
-
-  else
-
-    def connect(host, port)
-      address = Socket.getaddrinfo(host, nil).first
-      socket = Socket.new(Socket.const_get(address[0]), SOCK_STREAM, 0)
-      set_timeout(socket)
-      socket.connect(Socket.pack_sockaddr_in(port, address[3]))
-      socket
-    end
-
+  def connect(host, port)
+    socket = TCPSocket.new(host, port)
+    set_timeout(socket, 2)
+    socket
   end
 
   def host_to_io(key, host, port)
@@ -84,8 +70,8 @@ private
     host_to_io(key, host, port)
   end
 
-  def set_timeout(socket)
-    timeout = [2,0].pack('l_2') # 2 seconds
+  def set_timeout(socket, seconds)
+    timeout = [seconds, 0].pack('l_2') # 2 seconds
     socket.setsockopt(SOL_SOCKET, SO_SNDTIMEO, timeout)
     socket.setsockopt(SOL_SOCKET, SO_RCVTIMEO, timeout)
   end

data/lib/remix/stash/protocol.rb

@@ -86,11 +86,12 @@ module Remix::Stash::Protocol
   end
 
   GET_PACKET = HEADER_FORMAT + 'a*'
+  GET_BODY = 4..-1
   def get(io, key)
     header = [REQUEST, GET, key.size, 0, 0, 0, key.size, 0, 0, key].pack(GET_PACKET)
     io.write(header)
     resp = read_resp(io)
-    resp[:status] == NO_ERROR ? parse_get(resp[:body])[:value] : nil
+    resp[:status] == NO_ERROR ? resp[:body][GET_BODY] : nil
   end
 
   INCR_PACKET = HEADER_FORMAT + 'NNQNa*'
@@ -114,25 +115,21 @@ module Remix::Stash::Protocol
 
 private
 
-  def parse_get(body)
-    extra, value = body.unpack('Na*')
-    {:extra => extra, :value => value}
-  end
-
+  COUNTER_SPLIT = 'NN'
   def parse_counter(body)
-    a, b = body.unpack('NN')
+    a, b = body.unpack(COUNTER_SPLIT)
     b | (a << 32)
   end
 
+  RESP_HEADER = '@6nN'
   def read_resp(io)
-    magic, opcode, key_length,
-    extra, type, status,
-    body_length, opaque, cas = *io.read(24).unpack(HEADER_FORMAT)
-    resp = { :magic => magic, :opcode => opcode, :key_length => key_length,
-      :extra => extra, :type => type, :status => status,
-      :body_length => body_length, :opaque => opaque, :cas => cas }
-    resp[:body] = io.read(body_length) if body_length > 0
-    resp
+    header = io.read(24)
+    header or raise Remix::Stash::ProtocolError,
+      "No data in response header"
+    status, body_length = *header.unpack(RESP_HEADER)
+    body_length.zero? ?
+      {:status => status} :
+      {:status => status, :body => io.read(body_length)}
   end
 
   def split64(n)

data/lib/remix/stash.rb

@@ -32,7 +32,7 @@ class Remix::Stash
   def initialize(name)
     @name = name
     @scope = nil
-    @opts = name == :root ? {:coherency => :action, :ttl => 0} : {}
+    @opts = name == :root ? {:coherency => :action, :ttl => 0, :cluster => :default} : {}
   end
 
   def add(*keys)
@@ -79,11 +79,15 @@ class Remix::Stash
     cluster(opts).select(key) {|io| Protocol.decr(io, key, step)}
   end
 
-  def default(opts = {})
-    base = @opts.merge!(opts)
-    if opts.has_key? :coherency
-      [:dynamic, :action, :transaction].include?(opts[:coherency]) or raise ArgumentError,
-        "Invalid coherency setting used (#{opts[:coherency].inspect})"
+  def default(opts = nil)
+    if opts
+      base = @opts.merge!(opts)
+      if opts.has_key? :coherency
+        [:dynamic, :action, :transaction].include?(opts[:coherency]) or raise ArgumentError,
+          "Invalid coherency setting used (#{opts[:coherency].inspect})"
+      end
+    else
+      base = @opts
     end
     root = @@instances[:root] || Stash.new(:root)
     self == root ?
@@ -178,19 +182,22 @@ class Remix::Stash
 private
 
   KEY_SEPARATOR = '/'
-  def canonical_key(keys, opts = default_opts)
-    "#{implicit_scope}#{keys.join(KEY_SEPARATOR)}#{vector(opts)}"
+  def canonical_key(keys, opts)
+    v = vector(opts)
+    if @scope
+      "#{implicit_scope}#{keys.join(KEY_SEPARATOR)}#{vector(opts)}"
+    elsif v
+      keys.join(KEY_SEPARATOR) << v
+    else
+      keys.join(KEY_SEPARATOR)
+    end
   end
 
   def cluster(opts = {})
-    @@clusters[opts[:cluster] || :default]
+    @@clusters[opts[:cluster]]
   end
 
-  def coherency
-    default[:coherency]
-  end
-
-  def default_opts(params = {})
+  def default_opts(params)
     params.last.is_a?(Hash) ? default.merge(params.pop) : default
   end
 
@@ -198,14 +205,8 @@ private
     Marshal.dump(value)
   end
 
-  EMPTY_SCOPE = ''
   def implicit_scope
-    if @scope
-      scope = @scope.call(self)
-      scope ? "#{scope}/" : EMPTY_SCOPE
-    else
-      EMPTY_SCOPE
-    end
+    @scope.call(self) if @scope
   end
 
   def load_value(data)
@@ -218,7 +219,7 @@ private
 
   def vector(opts)
     return if @name == :root
-    return @vector if @vector && coherency != :dynamic
+    return @vector if @vector && opts[:coherency] != :dynamic
     vk = vector_key
     cluster(opts).select(vk) do |io|
       @vector = Protocol.get(io, vk)

data/remix-stash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remix-stash}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Mitchell"]
-  s.date = %q{2009-09-17}
+  s.date = %q{2009-09-21}
   s.email = %q{binary42@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binary42-remix-stash
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Brian Mitchell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: []