dalli 1.0.2 → 1.0.3

data/History.md

@@ -1,6 +1,13 @@
 Dalli Changelog
 =====================
 
+1.0.3
+=======
+
+- Better handling of application marshalling errors
+- Work around jruby IO#sysread compatibility issue
+
+
 1.0.2
 =======
 

data/Performance.md

@@ -10,26 +10,68 @@ You can optionally use kgio to give Dalli a small, 10-20% performance boost: gem
 
 	Testing 1.8.5 with ruby 1.9.2p136 (2010-12-25 revision 30365) [x86_64-darwin10.6.0]
 	                                     user     system      total        real
-	set:plain:memcache-client        1.950000   0.320000   2.270000 (  2.271513)
-	set:ruby:memcache-client         2.040000   0.310000   2.350000 (  2.355625)
-	get:plain:memcache-client        2.160000   0.330000   2.490000 (  2.499911)
-	get:ruby:memcache-client         2.310000   0.340000   2.650000 (  2.659208)
-	multiget:ruby:memcache-client    1.050000   0.130000   1.180000 (  1.168383)
-	missing:ruby:memcache-client     2.050000   0.320000   2.370000 (  2.384290)
-	mixed:ruby:memcache-client       4.440000   0.660000   5.100000 (  5.148145)
+	set:plain:memcache               2.070000   0.340000   2.410000 (  2.611709)
+	set:ruby:memcache                1.990000   0.330000   2.320000 (  2.869653)
+	get:plain:memcache               2.290000   0.360000   2.650000 (  2.926425)
+	get:ruby:memcache                2.360000   0.350000   2.710000 (  2.951604)
+	multiget:ruby:memcache           1.050000   0.120000   1.170000 (  1.285787)
+	missing:ruby:memcache            1.990000   0.330000   2.320000 (  2.567641)
+	mixed:ruby:memcache              4.390000   0.670000   5.060000 (  5.721000)
+	incr:ruby:memcache               0.700000   0.120000   0.820000 (  0.842896)
+
+*libmemcached*:
+
+	Testing 1.1.2 with ruby 1.9.2p136 (2010-12-25 revision 30365) [x86_64-darwin10.6.0]
+	                                     user     system      total        real
+	set:plain:libm                   0.120000   0.220000   0.340000 (  0.847521)
+	setq:plain:libm                  0.030000   0.000000   0.030000 (  0.126944)
+	set:ruby:libm                    0.220000   0.250000   0.470000 (  1.102789)
+	get:plain:libm                   0.140000   0.230000   0.370000 (  0.813998)
+	get:ruby:libm                    0.210000   0.240000   0.450000 (  1.025994)
+	multiget:ruby:libm               0.100000   0.080000   0.180000 (  0.322217)
+	missing:ruby:libm                0.250000   0.240000   0.490000 (  1.049972)
+	mixed:ruby:libm                  0.400000   0.410000   0.810000 (  2.172349)
+	mixedq:ruby:libm                 0.410000   0.360000   0.770000 (  1.516718)
+	incr:ruby:libm                   0.080000   0.340000   0.420000 (  1.685931)
 
 *dalli*:
 
 	Using kgio socket IO
-	Testing 1.0.1 with ruby 1.9.2p136 (2010-12-25 revision 30365) [x86_64-darwin10.6.0]
+	Testing 1.0.2 with ruby 1.9.2p136 (2010-12-25 revision 30365) [x86_64-darwin10.6.0]
+	                                     user     system      total        real
+	set:plain:dalli                  0.850000   0.320000   1.170000 (  1.691393)
+	setq:plain:dalli                 0.500000   0.130000   0.630000 (  0.651227)
+	set:ruby:dalli                   0.900000   0.330000   1.230000 (  1.865228)
+	get:plain:dalli                  0.990000   0.390000   1.380000 (  1.929994)
+	get:ruby:dalli                   0.950000   0.370000   1.320000 (  1.844251)
+	multiget:ruby:dalli              0.790000   0.300000   1.090000 (  1.227073)
+	missing:ruby:dalli               0.810000   0.370000   1.180000 (  1.627039)
+	mixed:ruby:dalli                 1.850000   0.710000   2.560000 (  3.555032)
+	mixedq:ruby:dalli                1.840000   0.610000   2.450000 (  2.945982)
+	incr:ruby:dalli                  0.310000   0.120000   0.430000 (  0.616465)
+
+Testing 1.0.2 with rubinius 1.3.0dev (1.8.7 382e813f xxxx-xx-xx JI) [x86_64-apple-darwin10.6.0]
+	                                     user     system      total        real
+	set:plain:dalli                  2.800581   0.329360   3.129941 (  5.186546)
+	setq:plain:dalli                 1.064253   0.138044   1.202297 (  1.280355)
+	set:ruby:dalli                   2.220885   0.262619   2.483504 (  2.778118)
+	get:plain:dalli                  2.291344   0.280490   2.571834 (  2.948004)
+	get:ruby:dalli                   2.148900   0.274477   2.423377 (  2.425808)
+	multiget:ruby:dalli              1.724193   0.249145   1.973338 (  2.158673)
+	missing:ruby:dalli               1.881502   0.272610   2.154112 (  2.208384)
+	mixed:ruby:dalli                 4.292620   0.533768   4.826388 (  4.830238)
+	mixedq:ruby:dalli                4.076032   0.501442   4.577474 (  4.583800)
+	incr:ruby:dalli                  0.691467   0.091475   0.782942 (  0.931674)
+
+Testing 1.0.2 with rubinius 1.2.0 (1.8.7 release 2010-12-21 JI) [x86_64-apple-darwin10.6.0]
 	                                     user     system      total        real
-	set:plain:dalli                  0.840000   0.300000   1.140000 (  1.516160)
-	setq:plain:dalli                 0.510000   0.120000   0.630000 (  0.634174)
-	set:ruby:dalli                   0.880000   0.300000   1.180000 (  1.549591)
-	get:plain:dalli                  0.970000   0.330000   1.300000 (  1.621385)
-	get:ruby:dalli                   0.970000   0.340000   1.310000 (  1.622811)
-	multiget:ruby:dalli              0.800000   0.250000   1.050000 (  1.453479)
-	missing:ruby:dalli               0.820000   0.330000   1.150000 (  1.453847)
-	mixed:ruby:dalli                 1.850000   0.640000   2.490000 (  3.189240)
-	mixedq:ruby:dalli                1.820000   0.530000   2.350000 (  2.611830)
-	incr:ruby:dalli                  0.310000   0.110000   0.420000 (  0.545641)
+	set:plain:dalli                  6.586927   0.331545   6.918472 (  4.628652)
+	setq:plain:dalli                 0.930905   0.129008   1.059913 (  1.016105)
+	set:ruby:dalli                   2.702486   0.283004   2.985490 (  2.690442)
+	get:plain:dalli                  2.740202   0.291353   3.031555 (  2.722746)
+	get:ruby:dalli                   1.979379   0.282986   2.262365 (  2.264118)
+	multiget:ruby:dalli              1.887086   0.249799   2.136885 (  1.803230)
+	missing:ruby:dalli               1.882662   0.278019   2.160681 (  2.113429)
+	mixed:ruby:dalli                 3.969242   0.553361   4.522603 (  4.524504)
+	mixedq:ruby:dalli                3.520755   0.475669   3.996424 (  3.997405)
+	incr:ruby:dalli                  0.849998   0.094012   0.944010 (  0.884001)

data/README.md

@@ -44,7 +44,7 @@ Remember, Dalli **requires** memcached 1.4+.  You can check the version with `me
     dc.set('abc', 123)
     value = dc.get('abc')
 
-The test suite requires memcached 1.4.3+ with SASL enabled (./configure --enable-sasl).  Currently only supports the PLAIN mechanism.
+The test suite requires memcached 1.4.3+ with SASL enabled (brew install memcached --enable-sasl ; mv /usr/bin/memcache /usr/bin/memcached.old).  Currently only supports the PLAIN mechanism.
 
 Dalli has no runtime dependencies and never will.  You can optionally install the 'kgio' gem to
 give Dalli a 10-20% performance boost.

data/Rakefile

@@ -27,4 +27,8 @@ end
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rd|
   rd.rdoc_files.include("lib/**/*.rb")
-end
+end
+
+require 'rake/clean'
+CLEAN.include "**/*.rbc"
+CLEAN.include "**/.DS_Store"

data/lib/dalli.rb

@@ -18,6 +18,8 @@ module Dalli
   class NetworkError < DalliError; end
   # no server available/alive error
   class RingError < DalliError; end
+  # application error in marshalling
+  class MarshalError < DalliError; end
 
   def self.logger
     @logger ||= (rails_logger || default_logger)

data/lib/dalli/client.rb

@@ -25,6 +25,7 @@ module Dalli
       @servers = env_servers || servers || 'localhost:11211'
       @options = { :expires_in => 0 }.merge(options)
       self.extend(Dalli::Client::MemcacheClientCompatibility) if Dalli::Client.compatibility_mode
+      @ring = nil
     end
 
     ##

data/lib/dalli/server.rb

@@ -34,6 +34,8 @@ module Dalli
       @down_at = nil
       @last_down_at = nil
       @options = DEFAULTS.merge(options)
+      @sock = nil
+      @msg = nil
     end
     
     # Chokepoint method for instrumentation
@@ -43,13 +45,13 @@ module Dalli
         send(op, *args)
       rescue Dalli::NetworkError
         raise
-      rescue Dalli::DalliError
-        raise
-      rescue TypeError => ex
-        Dalli.logger.error "Application bug: #{ex.class.name}: #{ex.message}"
+      rescue Dalli::MarshalError => ex
+        Dalli.logger.error "Marshalling error for key '#{args.first}': #{ex.message}"
         Dalli.logger.error "You are trying to cache a Ruby object which cannot be serialized to memcached."
         Dalli.logger.error ex.backtrace.join("\n\t")
         false
+      rescue Dalli::DalliError
+        raise
       rescue Exception => ex
         Dalli.logger.error "Unexpected exception in Dalli: #{ex.class.name}: #{ex.message}"
         Dalli.logger.error "This is a bug in Dalli, please enter an issue in Github if it does not already exist."
@@ -253,7 +255,15 @@ module Dalli
       marshalled = false
       value = unless options && options[:raw]
         marshalled = true
-        Marshal.dump(value)
+        begin
+          Marshal.dump(value)
+        rescue => ex
+          # Marshalling can throw several different types of generic Ruby exceptions.
+          # Convert to a specific exception so we can special case it higher up the stack.
+          exc = Dalli::MarshalError.new(ex.message)
+          exc.set_backtrace ex.backtrace
+          raise exc
+        end
       else
         value.to_s
       end

data/lib/dalli/socket.rb

@@ -1,6 +1,6 @@
 begin
   require 'kgio'
-  puts "Using kgio socket IO" if $TESTING
+  puts "Using kgio socket IO" if defined?($TESTING)
 
   class Dalli::Server::KSocket < Kgio::Socket
     attr_accessor :options
@@ -41,26 +41,30 @@ begin
 
 rescue LoadError
 
-  puts "Using standard socket IO (#{RUBY_DESCRIPTION})" if $TESTING
+  puts "Using standard socket IO (#{RUBY_DESCRIPTION})" if defined?($TESTING)
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
     class Dalli::Server::KSocket < TCPSocket
+      attr_accessor :options
+
       def self.open(host, port, options = {})
-        new(host, port)
+        sock = new(host, port)
+        sock.options = { :host => host, :port => port }.merge(options)
+        sock
       end
 
       def readfull(count)
         value = ''
         begin
           loop do
-            value << sysread(count - value.bytesize)
+            value << read_nonblock(count - value.bytesize)
             break if value.bytesize == count
           end
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK
           if IO.select([self], nil, nil, options[:timeout])
             retry
           else
-            raise Timeout::Error, "IO timeout"
+            raise Timeout::Error, "IO timeout: #{options.inspect}"
           end
         end
         value
@@ -77,7 +81,7 @@ rescue LoadError
         # All this ugly code to ensure proper Socket connect timeout
         addr = Socket.getaddrinfo(host, nil)
         sock = new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
-        sock.options = options
+        sock.options = { :host => host, :port => port }.merge(options)
         begin
           sock.connect_nonblock(Socket.pack_sockaddr_in(port, addr[0][3]))
         rescue Errno::EINPROGRESS
@@ -101,7 +105,7 @@ rescue LoadError
           if IO.select([self], nil, nil, options[:timeout])
             retry
           else
-            raise Timeout::Error, "IO timeout"
+            raise Timeout::Error, "IO timeout: #{options.inspect}"
           end
         end
         value

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/test/test_active_support.rb

@@ -129,6 +129,14 @@ class TestActiveSupport < Test::Unit::TestCase
           assert_equal 2, @dalli.increment('counter')
           assert_equal 1, @dalli.decrement('counter')
           assert_equal "1", @dalli.read('counter', :raw => true)
+
+          assert_equal 0, @mc.increment('counterX')
+          assert_equal 0, @mc.increment('counterX')
+          assert_equal nil, @mc.read('counterX')
+
+          assert_equal 1, @dalli.increment('counterX')
+          assert_equal 2, @dalli.increment('counterX')
+          assert_equal 2, @dalli.read('counterX', :raw => true).to_i
         end
       end
     end

data/test/test_session_store.rb

@@ -52,7 +52,7 @@ class TestSessionStore < ActionController::IntegrationTest
 
   begin
     require 'dalli'
-    memcache = Dalli::Client.new('localhost:11211')
+    memcache = Dalli::Client.new('127.0.0.1:11211')
     memcache.set('ping', '')
 
     def test_setting_and_getting_session_value
@@ -207,12 +207,12 @@ class TestSessionStore < ActionController::IntegrationTest
       end
     end
   rescue LoadError, RuntimeError
-    $stderr.puts "Skipping TestSessionStore tests. Start memcached and try again."
+    $stderr.puts "Skipping TestSessionStore tests. Start memcached and try again: #{$!.message}"
   end
 
   private
     def with_test_route_set(options = {})
-      options = {:key => '_session_id'}.merge(options)
+      options = {:key => '_session_id', :memcache_server => '127.0.0.1:11211'}.merge(options)
       with_routing do |set|
         set.draw do |map|
           match ':action', :to => ::TestSessionStore::TestController

metadata

@@ -1,78 +1,62 @@
 --- !ruby/object:Gem::Specification 
 name: dalli
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors: 
-- Mike Perham
+  - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -08:00
+date: 2011-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 1
-        version: 3.0.1
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: memcache-client
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 8
-        - 5
-        version: 1.8.5
-  type: :development
-  version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: shoulda
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rails
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.0.1
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: memcache-client
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.8.5
+    type: :development
+    version_requirements: *id004
 description: High performance memcached client for Ruby
 email: mperham@gmail.com
 executables: []
@@ -82,83 +66,79 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/action_controller/session/dalli_store.rb
-- lib/action_dispatch/middleware/session/dalli_store.rb
-- lib/active_support/cache/dalli_store.rb
-- lib/active_support/cache/dalli_store23.rb
-- lib/dalli/client.rb
-- lib/dalli/compatibility.rb
-- lib/dalli/memcache-client.rb
-- lib/dalli/options.rb
-- lib/dalli/ring.rb
-- lib/dalli/server.rb
-- lib/dalli/socket.rb
-- lib/dalli/version.rb
-- lib/dalli.rb
-- LICENSE
-- README.md
-- History.md
-- Rakefile
-- Gemfile
-- dalli.gemspec
-- Performance.md
-- Upgrade.md
-- test/abstract_unit.rb
-- test/benchmark_test.rb
-- test/helper.rb
-- test/memcached_mock.rb
-- test/test_active_support.rb
-- test/test_compatibility.rb
-- test/test_dalli.rb
-- test/test_encoding.rb
-- test/test_failover.rb
-- test/test_network.rb
-- test/test_ring.rb
-- test/test_sasl.rb
-- test/test_session_store.rb
+  - lib/dalli.rb
+  - lib/action_controller/session/dalli_store.rb
+  - lib/action_dispatch/middleware/session/dalli_store.rb
+  - lib/active_support/cache/dalli_store.rb
+  - lib/active_support/cache/dalli_store23.rb
+  - lib/dalli/client.rb
+  - lib/dalli/compatibility.rb
+  - lib/dalli/memcache-client.rb
+  - lib/dalli/options.rb
+  - lib/dalli/ring.rb
+  - lib/dalli/server.rb
+  - lib/dalli/socket.rb
+  - lib/dalli/version.rb
+  - LICENSE
+  - README.md
+  - History.md
+  - Rakefile
+  - Gemfile
+  - dalli.gemspec
+  - Performance.md
+  - Upgrade.md
+  - test/abstract_unit.rb
+  - test/benchmark_test.rb
+  - test/helper.rb
+  - test/memcached_mock.rb
+  - test/test_active_support.rb
+  - test/test_compatibility.rb
+  - test/test_dalli.rb
+  - test/test_encoding.rb
+  - test/test_failover.rb
+  - test/test_network.rb
+  - test/test_ring.rb
+  - test/test_sasl.rb
+  - test/test_session_store.rb
 has_rdoc: true
 homepage: http://github.com/mperham/dalli
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: High performance memcached client for Ruby
 test_files: 
-- test/abstract_unit.rb
-- test/benchmark_test.rb
-- test/helper.rb
-- test/memcached_mock.rb
-- test/test_active_support.rb
-- test/test_compatibility.rb
-- test/test_dalli.rb
-- test/test_encoding.rb
-- test/test_failover.rb
-- test/test_network.rb
-- test/test_ring.rb
-- test/test_sasl.rb
-- test/test_session_store.rb
+  - test/abstract_unit.rb
+  - test/benchmark_test.rb
+  - test/helper.rb
+  - test/memcached_mock.rb
+  - test/test_active_support.rb
+  - test/test_compatibility.rb
+  - test/test_dalli.rb
+  - test/test_encoding.rb
+  - test/test_failover.rb
+  - test/test_network.rb
+  - test/test_ring.rb
+  - test/test_sasl.rb
+  - test/test_session_store.rb