redis 3.0.0 → 3.0.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.0.1
+
+* Fix reconnect logic not kicking in on a write error.
+
+    See 427dbd52928af452f35aa0a57b621bee56cdcb18 and #238.
+
 # 3.0.0
 
 ### Upgrading from 2.x to 3.0

data/lib/redis.rb

@@ -1728,7 +1728,7 @@ class Redis
   # Set one or more hash values.
   #
   # @example
-  #   redis.hmset("hash", { "f1" => "v1", "f2" => "v2" })
+  #   redis.mapped_hmset("hash", { "f1" => "v1", "f2" => "v2" })
   #     # => "OK"
   #
   # @param [String] key

data/lib/redis/client.rb

@@ -171,7 +171,7 @@ class Redis
               command[0] = command_map[command.first]
             end
 
-            connection.write(command)
+            write(command)
           end
 
           yield if block_given?

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test/distributed_remote_server_control_commands_test.rb

@@ -7,9 +7,22 @@ class TestDistributedRemoteServerControlCommands < Test::Unit::TestCase
   include Helper::Distributed
 
   def test_info
-    %w(last_save_time redis_version total_connections_received connected_clients total_commands_processed connected_slaves uptime_in_seconds used_memory uptime_in_days changes_since_last_save).each do |x|
-      r.info.each do |info|
-        assert info.keys.include?(x)
+    keys = [
+     "redis_version",
+     "uptime_in_seconds",
+     "uptime_in_days",
+     "connected_clients",
+     "used_memory",
+     "total_connections_received",
+     "total_commands_processed",
+    ]
+
+    info = r.info
+
+    info.each do |info|
+      keys.each do |k|
+        msg = "expected #info to include #{k}"
+        assert info.keys.include?(k), msg
       end
     end
   end

data/test/helper.rb

@@ -143,6 +143,12 @@ module Helper
         yield _new_client(options.merge(:port => port))
       end
     end
+
+    def redis_mock_with_handler(handler, options = {}, &blk)
+      RedisMock.start_with_handler(handler) do |port|
+        yield _new_client(options.merge(:port => port))
+      end
+    end
   end
 
   module Client

data/test/internals_test.rb

@@ -191,6 +191,75 @@ class TestInternals < Test::Unit::TestCase
     end
   end
 
+  def close_on_connection(seq)
+    $n = 0
+
+    read_command = lambda do |session|
+      Array.new(session.gets[1..-3].to_i) do
+        bytes = session.gets[1..-3].to_i
+        arg = session.read(bytes)
+        session.read(2) # Discard \r\n
+        arg
+      end
+    end
+
+    handler = lambda do |session|
+      n = $n
+      $n += 1
+
+      select = read_command.call(session)
+      if select[0].downcase == "select"
+        session.write("+OK\r\n")
+      else
+        raise "Expected SELECT"
+      end
+
+      if !seq.include?(n)
+        while read_command.call(session)
+          session.write("+#{n}\r\n")
+        end
+      end
+    end
+
+    redis_mock_with_handler(handler) do |redis|
+      yield(redis)
+    end
+  end
+
+  def test_retry_on_write_error_by_default
+    close_on_connection([0]) do |redis|
+      assert_equal "1", redis.client.call(["x" * 128 * 1024])
+    end
+  end
+
+  def test_retry_on_write_error_when_wrapped_in_with_reconnect_true
+    close_on_connection([0]) do |redis|
+      redis.with_reconnect(true) do
+        assert_equal "1", redis.client.call(["x" * 128 * 1024])
+      end
+    end
+  end
+
+  def test_dont_retry_on_write_error_when_wrapped_in_with_reconnect_false
+    close_on_connection([0]) do |redis|
+      assert_raise Redis::ConnectionError do
+        redis.with_reconnect(false) do
+          redis.client.call(["x" * 128 * 1024])
+        end
+      end
+    end
+  end
+
+  def test_dont_retry_on_write_error_when_wrapped_in_without_reconnect
+    close_on_connection([0]) do |redis|
+      assert_raise Redis::ConnectionError do
+        redis.without_reconnect do
+          redis.client.call(["x" * 128 * 1024])
+        end
+      end
+    end
+  end
+
   def test_connecting_to_unix_domain_socket
     assert_nothing_raised do
       Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock")).ping

data/test/remote_server_control_commands_test.rb

@@ -7,8 +7,21 @@ class TestRemoteServerControlCommands < Test::Unit::TestCase
   include Helper::Client
 
   def test_info
-    %w(last_save_time redis_version total_connections_received connected_clients total_commands_processed connected_slaves uptime_in_seconds used_memory uptime_in_days changes_since_last_save).each do |x|
-      assert r.info.keys.include?(x)
+    keys = [
+     "redis_version",
+     "uptime_in_seconds",
+     "uptime_in_days",
+     "connected_clients",
+     "used_memory",
+     "total_connections_received",
+     "total_commands_processed",
+    ]
+
+    info = r.info
+
+    keys.each do |k|
+      msg = "expected #info to include #{k}"
+      assert info.keys.include?(k), msg
     end
   end
 

data/test/support/redis_mock.rb

@@ -28,32 +28,9 @@ module RedisMock
         session = @server.accept
 
         begin
-          while line = session.gets
-            parts = Array.new(line[1..-3].to_i) do
-              bytes = session.gets[1..-3].to_i
-              argument = session.read(bytes)
-              session.read(2) # Discard \r\n
-              argument
-            end
-
-            response = yield(*parts)
-
-            # Convert a nil response to :close
-            response ||= :close
-
-            if response == :exit
-              session.shutdown(Socket::SHUT_RDWR)
-              return # exit server body
-            elsif response == :close
-              session.shutdown(Socket::SHUT_RDWR)
-              break # exit connection body
-            else
-              session.write(response)
-              session.write("\r\n") unless response.end_with?("\r\n")
-            end
-          end
-        rescue Errno::ECONNRESET
-          # Ignore client closing the connection
+          return if yield(session) == :exit
+        ensure
+          session.close
         end
       end
     rescue => ex
@@ -68,20 +45,19 @@ module RedisMock
 
   # Starts a mock Redis server in a thread.
   #
-  # The server will reply with a `+OK` to all commands, but you can
-  # customize it by providing a hash. For example:
+  # The server will use the lambda handler passed as argument to handle
+  # connections. For example:
   #
-  #     RedisMock.start(:ping => lambda { "+PONG" }) do
-  #       assert_equal "PONG", Redis.new(:port => MOCK_PORT).ping
-  #     end
+  #   handler = lambda { |session| session.close }
+  #   RedisMock.start_with_handler(handler) do
+  #     # Every connection will be closed immediately
+  #   end
   #
-  def self.start(commands = {})
+  def self.start_with_handler(blk)
     server = Server.new(MOCK_PORT)
 
     begin
-      server.start do |command, *args|
-        (commands[command.to_sym] || lambda { |*_| "+OK" }).call(*args)
-      end
+      server.start(&blk)
 
       yield(MOCK_PORT)
 
@@ -89,4 +65,46 @@ module RedisMock
       server.shutdown
     end
   end
+
+  # Starts a mock Redis server in a thread.
+  #
+  # The server will reply with a `+OK` to all commands, but you can
+  # customize it by providing a hash. For example:
+  #
+  #   RedisMock.start(:ping => lambda { "+PONG" }) do
+  #     assert_equal "PONG", Redis.new(:port => MOCK_PORT).ping
+  #   end
+  #
+  def self.start(commands = {}, &blk)
+    handler = lambda do |session|
+      while line = session.gets
+        argv = Array.new(line[1..-3].to_i) do
+          bytes = session.gets[1..-3].to_i
+          arg = session.read(bytes)
+          session.read(2) # Discard \r\n
+          arg
+        end
+
+        command = argv.shift
+        blk = commands[command.to_sym]
+        blk ||= lambda { |*_| "+OK" }
+
+        response = blk.call(*argv)
+
+        # Convert a nil response to :close
+        response ||= :close
+
+        if response == :exit
+          break :exit
+        elsif response == :close
+          break :close
+        else
+          session.write(response)
+          session.write("\r\n") unless response.end_with?("\r\n")
+        end
+      end
+    end
+
+    start_with_handler(handler, &blk)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake