kestrel-client 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/kestrel-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kestrel-client}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Rael Dornfest"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2011-01-19}
   s.description = %q{Ruby client for the Kestrel queue server}
   s.email = %q{rael@twitter.com}
   s.extra_rdoc_files = [

data/lib/kestrel/client.rb

@@ -22,6 +22,22 @@ module Kestrel
       :get_timeout_ms => 10
     }.freeze
 
+    # Exceptions which are connection failures we retry after
+    RECOVERABLE_ERRORS = [
+      Memcached::ServerIsMarkedDead,
+      Memcached::ATimeoutOccurred,
+      Memcached::ConnectionBindFailure,
+      Memcached::ConnectionFailure,
+      Memcached::ConnectionSocketCreateFailure,
+      Memcached::Failure,
+      Memcached::MemoryAllocationFailure,
+      Memcached::ReadFailure,
+      Memcached::ServerError,
+      Memcached::SystemError,
+      Memcached::UnknownReadFailure,
+      Memcached::WriteFailure
+    ]
+
     include StatsHelper
     include RetryHelper
 
@@ -115,7 +131,7 @@ module Kestrel
       val =
         begin
           send(select_get_method(key), key + commands, raw)
-        rescue Memcached::ATimeoutOccurred, Memcached::ServerIsMarkedDead
+        rescue *RECOVERABLE_ERRORS
           # we can't tell the difference between a server being down
           # and an empty queue, so just return nil. our sticky server
           # logic should eliminate piling on down servers

data/lib/kestrel/client/retry_helper.rb

@@ -1,26 +1,10 @@
 module Kestrel::Client::RetryHelper
 
-  # Exceptions which are connection failures we retry after
-  RECOVERABLE_ERRORS = [
-    Memcached::ServerIsMarkedDead,
-    Memcached::ATimeoutOccurred,
-    Memcached::ConnectionBindFailure,
-    Memcached::ConnectionFailure,
-    Memcached::ConnectionSocketCreateFailure,
-    Memcached::Failure,
-    Memcached::MemoryAllocationFailure,
-    Memcached::ReadFailure,
-    Memcached::ServerError,
-    Memcached::SystemError,
-    Memcached::UnknownReadFailure,
-    Memcached::WriteFailure
-  ]
-
   private
 
   def with_retries #:nodoc:
     yield
-  rescue *RECOVERABLE_ERRORS
+  rescue *Kestrel::Client::RECOVERABLE_ERRORS
     tries ||= @exception_retry_limit + 1
     tries -= 1
     tries > 0 ? retry : raise

data/lib/kestrel/client/stats_helper.rb

@@ -69,9 +69,9 @@ module Kestrel::Client::StatsHelper
 
   def deserialize_stat_value(value)
     case value
-    when /^\d+\.\d+$/:
+    when /^\d+\.\d+$/
         value.to_f
-    when /^\d+$/:
+    when /^\d+$/
         value.to_i
     else
       value

data/lib/kestrel/client/unmarshal.rb

@@ -11,11 +11,21 @@ module Kestrel
           response
         end
       end
-
-      def is_marshaled?(object)
-        object.to_s[0] == Marshal::MAJOR_VERSION && object.to_s[1] == Marshal::MINOR_VERSION
-      rescue Exception
-        false
+      
+      if RUBY_VERSION.respond_to?(:getbyte)
+        def is_marshaled?(object)
+          o = object.to_s
+          o.getbyte(0) == Marshal::MAJOR_VERSION && o.getbyte(1) == Marshal::MINOR_VERSION
+        rescue Exception
+          false
+        end
+      else
+        def is_marshaled?(object)
+          o = object.to_s
+          o[0] == Marshal::MAJOR_VERSION && o[1] == Marshal::MINOR_VERSION
+        rescue Exception
+          false
+        end
       end
     end
   end

data/spec/kestrel/client_spec.rb

@@ -30,6 +30,16 @@ describe Kestrel::Client do
 
         3.times { @kestrel.get("a_queue") }
       end
+
+      it "returns nil if there is a recoverable exception" do
+        mock(@kestrel).select_get_method(@queue) { raise Memcached::SystemError }
+        @kestrel.get(@queue).should == nil
+      end
+
+      it "raises the exception if the exception is not recoverable" do
+        mock(@kestrel).select_get_method(@queue) { raise ArgumentError }
+        lambda { @kestrel.get(@queue) }.should raise_error(ArgumentError)
+      end
     end
 
     describe "retry behavior" do

data/spec/kestrel_benchmark.rb

@@ -20,7 +20,7 @@ describe Kestrel::Client do
       x.report("set:") { for i in 1..times; @kestrel.set(@queue, @value); end }
       x.report("get:") { for i in 1..times; @kestrel.get(@queue); end }
       x.report("set (raw):") { for i in 1..times; @kestrel.set(@queue, @raw_value, 0, true); end }
-      x.report("get (raw):") { for i in 1..times; @kestrel.get(@queue, true); end }
+      x.report("get (raw):") { for i in 1..times; @kestrel.get(@queue, :raw => true); end }
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kestrel-client
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matt Freels
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -07:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency