dalli 0.11.2 → 1.0.0

data/History.md

@@ -1,10 +1,19 @@
 Dalli Changelog
 =====================
 
+1.0.0
+=======
+
+Welcome gucki as a Dalli committer!
+
+ - Fix network and namespace issues in get_multi (gucki)
+ - Better handling of unmarshalling errors (mperham)
+
 0.11.2
 =======
 
  - Major reworking of socket error and failover handling (gucki)
+ - Add basic JRuby support (mperham)
 
 0.11.1
 ======

data/README.md

@@ -114,15 +114,21 @@ Put this at the bottom of `config/environment.rb`:
 
 Configuration
 ------------------------
-Dalli accepts the following options. All times are in seconds and maybe fractional.
+Dalli::Client accepts the following options. All times are in seconds.
+
+**expires_in**: Global default for key TTL.  No default.
+
+**failover**: Boolean, if true Dalli will failover to another server if the main server for a key is down.
+
+**compression**: Boolean, if true Dalli will gzip-compress values larger than 1K.
 
 **socket_timeout**: Timeout for all socket operations (connect, read, write). Default is 0.5.
 
 **socket_max_failures**: When a socket operation fails after socket_timeout, the same operation is retried. This is to not immediately mark a server down when there's a very slight network problem. Default is 2.
 
-**socket_failure_delay**: Before retrying a socket operation, the process sleeps for this amount of time. Default is 0.01.
+**socket_failure_delay**: Before retrying a socket operation, the process sleeps for this amount of time. Default is 0.01.  Set to nil for no delay.
 
-**down_retry_delay**: When a server has been marked down due to many failures, the server will be checked again for being alive only after this amount of time. Don't set this value to low, otherwise each request which tries the failed server might hang for the maximum timeout (see below). Default is 30 seconds.
+**down_retry_delay**: When a server has been marked down due to many failures, the server will be checked again for being alive only after this amount of time. Don't set this value to low, otherwise each request which tries the failed server might hang for the maximum timeout (see below). Default is 1 second.
 
 
 Features and Changes

data/lib/dalli/client.rb

@@ -61,7 +61,15 @@ module Dalli
 
         values = {}
         ring.servers.each do |server|
-          values.merge!(server.request(:noop)) if server.alive?
+          next unless server.alive?
+          begin
+            server.request(:noop).each_pair do |key, value|
+              values[key_without_namespace(key)] = value
+            end
+          rescue NetworkError => e
+            Dalli.logger.debug { e.message }
+            Dalli.logger.debug { "results from this server will be missing" }
+          end
         end
         values
       end
@@ -210,16 +218,13 @@ module Dalli
     end
 
     # Chokepoint method for instrumentation
-    def perform(op, *args)
-      key = args.first
-      if !key.is_a?(String)
-        key = key.to_s
-        args[0] = key
-      end
-      args[0] = key = validate_key(key)
+    def perform(op, key, *args)
+      key = key.to_s
+      validate_key(key)
+      key = key_with_namespace(key)
       begin
         server = ring.server_for_key(key)
-        server.request(op, *args)
+        server.request(op, key, *args)
       rescue NetworkError => e
         Dalli.logger.debug { e.message }
         Dalli.logger.debug { "retrying request with new server" }
@@ -233,7 +238,14 @@ module Dalli
       raise ArgumentError, "illegal character in key #{key}" if key =~ /[\x00-\x20\x80-\xFF]/
       raise ArgumentError, "key cannot be blank" if key.nil? || key.strip.size == 0
       raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
+    end
+    
+    def key_with_namespace(key)
       @options[:namespace] ? "#{@options[:namespace]}:#{key}" : key
     end
+
+    def key_without_namespace(key)
+      @options[:namespace] ? key.gsub(%r(\A#{@options[:namespace]}:), '') : key
+    end
   end
 end

data/lib/dalli/server.rb

@@ -59,7 +59,7 @@ module Dalli
       end
 
       connect
-      @sock
+      !!@sock
     rescue Dalli::NetworkError
       false
     end
@@ -234,7 +234,7 @@ module Dalli
       generic_response
     end
 
-    COMPRESSION_MIN_SIZE = 100
+    COMPRESSION_MIN_SIZE = 1024
 
     # http://www.hjp.at/zettel/m/memcached_flags.rxml
     # Looks like most clients use bit 0 to indicate native language serialization
@@ -266,10 +266,10 @@ module Dalli
       value = Zlib::Inflate.inflate(value) if (flags & FLAG_COMPRESSED) != 0
       value = Marshal.load(value) if (flags & FLAG_MARSHALLED) != 0
       value
-    rescue TypeError
-      raise DalliError, "Unable to unmarshal value: '#{value}'"
+    rescue TypeError, ArgumentError
+      raise DalliError, "Unable to unmarshal value: #{$!.message}"
     rescue Zlib::Error
-      raise DalliError, "Unable to uncompress value: '#{value}'"      
+      raise DalliError, "Unable to uncompress value: #{$!.message}"
     end
 
     def cas_response

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '0.11.2'
+  VERSION = '1.0.0'
 end

data/test/test_dalli.rb

@@ -320,6 +320,15 @@ class TestDalli < Test::Unit::TestCase
       end
     end
 
+    should "handle namespaced keys in multi_get" do
+      memcached do |dc|
+        dc = Dalli::Client.new('localhost:19122', :namespace => 'a')
+        dc.set('a', 1)
+        dc.set('b', 2)
+        assert_equal({'a' => 1, 'b' => 2}, dc.get_multi('a', 'b'))
+      end
+    end
+
     context 'with compression' do
       should 'allow large values' do
         memcached do |dc|

data/test/test_failover.rb

@@ -25,6 +25,22 @@ class TestFailover < Test::Unit::TestCase
       end
     end
 
+    should 'handle them gracefully in get_multi' do
+      memcached(29125) do
+        memcached(29126) do
+          dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
+          dc.set 'a', 'a1'
+          result = dc.get_multi ['a']
+          assert_equal result, {'a' => 'a1'}
+          
+          memcached_kill(29125)
+
+          result = dc.get_multi ['a']
+          assert_equal result, {'a' => 'a1'}
+        end
+      end
+    end
+
     should 'handle graceful failover in get_multi' do
       memcached(29125) do
         memcached(29126) do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dalli
 version: !ruby/object:Gem::Version 
-  hash: 55
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 11
-  - 2
-  version: 0.11.2
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Mike Perham
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -08:00
+date: 2010-11-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 3
         - 0
@@ -70,7 +66,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
         segments: 
         - 1
         - 8
@@ -135,7 +130,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -144,7 +138,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"