redis 2.2.0 → 2.2.1

data/lib/redis/client.rb

@@ -21,8 +21,8 @@ class Redis
 
     def connect
       establish_connection
-      call(:auth, @password) if @password
-      call(:select, @db) if @db != 0
+      call [:auth, @password] if @password
+      call [:select, @db] if @db != 0
       self
     end
 
@@ -34,17 +34,40 @@ class Redis
       @path || "#{@host}:#{@port}"
     end
 
+    # Starting with 2.2.1, assume that this method is called with a single
+    # array argument. Check its size for backwards compat.
     def call(*args)
-      reply = process(args) { read }
+      if args.first.is_a?(Array) && args.size == 1
+        command = args.first
+      else
+        command = args
+      end
+
+      reply = process([command]) { read }
       raise reply if reply.is_a?(RuntimeError)
       reply
     end
 
+    # Assume that this method is called with a single array argument. No
+    # backwards compat here, since it was introduced in 2.2.2.
+    def call_without_reply(command)
+      process([command])
+      nil
+    end
+
+    # Starting with 2.2.1, assume that this method is called with a single
+    # array argument. Check its size for backwards compat.
     def call_loop(*args)
+      if args.first.is_a?(Array) && args.size == 1
+        command = args.first
+      else
+        command = args
+      end
+
       error = nil
 
       result = without_socket_timeout do
-        process(args) do
+        process([command]) do
           loop do
             reply = read
             if reply.is_a?(RuntimeError)
@@ -74,7 +97,7 @@ class Redis
       # read, retrying would re-execute the entire pipeline, thus re-issueing
       # already succesfully executed commands. To circumvent this, don't retry
       # after the first reply has been read succesfully.
-      first = process(*commands) { read }
+      first = process(commands) { read }
       error = first if first.is_a?(RuntimeError)
 
       begin
@@ -109,7 +132,7 @@ class Redis
       retry
     end
 
-    def process(*commands)
+    def process(commands)
       logging(commands) do
         ensure_connected do
           commands.each do |command|

data/lib/redis/connection/command_helper.rb

@@ -4,7 +4,7 @@ class Redis
 
       COMMAND_DELIMITER = "\r\n"
 
-      def build_command(*args)
+      def build_command(args)
         command = []
         command << "*#{args.size}"
 
@@ -16,7 +16,7 @@ class Redis
 
         # Trailing delimiter
         command << ""
-        command
+        command.join(COMMAND_DELIMITER)
       end
 
     protected

data/lib/redis/connection/ruby.rb

@@ -55,7 +55,7 @@ class Redis
       end
 
       def write(command)
-        @sock.syswrite(build_command(*command).join(COMMAND_DELIMITER))
+        @sock.write(build_command(command))
       end
 
       def read
@@ -116,7 +116,11 @@ class Redis
         end
 
       rescue LoadError
-        warn "WARNING: using the built-in Timeout class which is known to have issues when used for opening connections. Install the SystemTimer gem if you want to make sure the Redis client will not hang." unless RUBY_VERSION >= "1.9" || RUBY_PLATFORM =~ /java/
+        if ! defined?(RUBY_ENGINE)
+          # MRI 1.8, all other interpreters define RUBY_ENGINE, JRuby and
+          # Rubinius should have no issues with timeout.
+          warn "WARNING: using the built-in Timeout class which is known to have issues when used for opening connections. Install the SystemTimer gem if you want to make sure the Redis client will not hang."
+        end
 
         require "timeout"
 

data/lib/redis/connection/synchrony.rb

@@ -10,13 +10,19 @@ class Redis
 
       def post_init
         @req = nil
+        @connected = false
         @reader = ::Hiredis::Reader.new
       end
 
       def connection_completed
+        @connected = true
         succeed
       end
 
+      def connected?
+        @connected
+      end
+
       def receive_data(data)
         @reader.feed(data)
 
@@ -39,6 +45,7 @@ class Redis
       end
 
       def unbind
+        @connected = false
         if @req
           @req.fail [:error, Errno::ECONNRESET]
           @req = nil
@@ -53,12 +60,11 @@ class Redis
 
       def initialize
         @timeout = 5_000_000
-        @state = :disconnected
         @connection = nil
       end
 
       def connected?
-        @state == :connected
+        @connection && @connection.connected?
       end
 
       def timeout=(usecs)
@@ -79,13 +85,12 @@ class Redis
       end
 
       def disconnect
-        @state = :disconnected
         @connection.close_connection
         @connection = nil
       end
 
       def write(command)
-        @connection.send(build_command(*command).join(COMMAND_DELIMITER))
+        @connection.send(build_command(command))
       end
 
       def read
@@ -105,7 +110,6 @@ class Redis
       def setup_connect_callbacks(conn, f)
         conn.callback do
           @connection = conn
-          @state = :connected
           f.resume conn
         end
 

data/lib/redis/distributed.rb

@@ -637,8 +637,8 @@ class Redis
     end
 
     # Get information and statistics about the server.
-    def info
-      on_each_node :info
+    def info(cmd = nil)
+      on_each_node :info, cmd
     end
 
     # Listen for all requests received by the server in real time.
@@ -655,6 +655,13 @@ class Redis
       raise CannotDistribute, :pipelined
     end
 
+    def inspect
+      node_info = nodes.map do |node|
+        "#{node.id} (Redis v#{node.info['redis_version']})"
+      end
+      "#<Redis client v#{Redis::VERSION} connected to #{node_info.join(', ')}>"
+    end
+
   protected
 
     def on_each_node(command, *args)

data/lib/redis/pipeline.rb

@@ -6,8 +6,23 @@ class Redis
       @commands = []
     end
 
+    # Starting with 2.2.1, assume that this method is called with a single
+    # array argument. Check its size for backwards compat.
     def call(*args)
-      @commands << args
+      if args.first.is_a?(Array) && args.size == 1
+        command = args.first
+      else
+        command = args
+      end
+
+      @commands << command
+      nil
+    end
+
+    # Assume that this method is called with a single array argument. No
+    # backwards compat here, since it was introduced in 2.2.2.
+    def call_without_reply(command)
+      @commands.push command
       nil
     end
 

data/lib/redis/subscribe.rb

@@ -4,8 +4,23 @@ class Redis
       @client = client
     end
 
+    # Starting with 2.2.1, assume that this method is called with a single
+    # array argument. Check its size for backwards compat.
     def call(*args)
-      @client.process(args)
+      if args.first.is_a?(Array) && args.size == 1
+        command = args.first
+      else
+        command = args
+      end
+
+      @client.process([command])
+    end
+
+    # Assume that this method is called with a single array argument. No
+    # backwards compat here, since it was introduced in 2.2.2.
+    def call_without_reply(command)
+      @commands.push command
+      nil
     end
 
     def subscribe(*channels, &block)
@@ -17,11 +32,11 @@ class Redis
     end
 
     def unsubscribe(*channels)
-      call(:unsubscribe, *channels)
+      call [:unsubscribe, *channels]
     end
 
     def punsubscribe(*channels)
-      call(:punsubscribe, *channels)
+      call [:punsubscribe, *channels]
     end
 
   protected
@@ -30,7 +45,7 @@ class Redis
       sub = Subscription.new(&block)
 
       begin
-        @client.call_loop(start, *channels) do |line|
+        @client.call_loop([start, *channels]) do |line|
           type, *rest = line
           sub.callbacks[type].call(*rest)
           break if type == stop && rest.last == 0

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/test/connection_handling_test.rb

@@ -47,7 +47,8 @@ test "SHUTDOWN" do
   redis_mock(:shutdown => lambda { "+SHUTDOWN" }) do
     redis = Redis.new(OPTIONS.merge(:port => 6380))
 
-    assert "SHUTDOWN" == redis.shutdown
+    # SHUTDOWN does not reply: test that it does not raise here.
+    assert nil == redis.shutdown
   end
 end
 

data/test/distributed_internals_test.rb

@@ -13,6 +13,15 @@ setup do
 end
 
 $TEST_PIPELINING = false
-$TEST_INSPECT    = false
 
 load File.expand_path("./lint/internals.rb", File.dirname(__FILE__))
+
+test "provides a meaningful inspect" do |r, _|
+  nodes = ["redis://localhost:6379/15", *NODES]
+  @r = Redis::Distributed.new nodes
+
+  node_info = nodes.map do |node|
+    "#{node} (Redis v#{@r.info.first["redis_version"]})"
+  end
+  assert "#<Redis client v#{Redis::VERSION} connected to #{node_info.join(', ')}>" == @r.inspect
+end

data/test/distributed_remote_server_control_commands_test.rb

@@ -16,6 +16,18 @@ test "INFO" do |r|
   end
 end
 
+test "INFO COMMANDSTATS" do |r|
+  # Only available on Redis >= 2.3.0
+  next if r.info.first["redis_version"] < "2.3.0"
+
+  r.nodes.each { |n| n.config(:resetstat) }
+  r.ping # Executed on every node
+
+  r.info(:commandstats).each do |info|
+    assert "1" == info["ping"]["calls"]
+  end
+end
+
 test "MONITOR" do |r|
   begin
     r.monitor

data/test/distributed_test.rb

@@ -57,4 +57,3 @@ test "Unknown commands does not work by default" do |r|
     r.not_yet_implemented_command
   end
 end
-

data/test/error_replies_test.rb

@@ -43,7 +43,7 @@ end
 
 test_with_reconnection_check "Recover from raise in #call_loop" do |r|
   begin
-    r.client.call_loop(:invalid_monitor) do
+    r.client.call_loop([:invalid_monitor]) do
       assert false # Should never be executed
     end
   rescue => ex

data/test/internals_test.rb

@@ -12,10 +12,13 @@ setup do
 end
 
 $TEST_PIPELINING = true
-$TEST_INSPECT    = true
 
 load File.expand_path("./lint/internals.rb", File.dirname(__FILE__))
 
+test "provides a meaningful inspect" do |r, _|
+  assert "#<Redis client v#{Redis::VERSION} connected to redis://127.0.0.1:6379/15 (Redis v#{r.info["redis_version"]})>" == r.inspect
+end
+
 test "Redis.current" do
   Redis.current.set("foo", "bar")
 

data/test/lint/internals.rb

@@ -27,10 +27,6 @@ test "Recovers from failed commands" do |r, _|
   end
 end
 
-test "provides a meaningful inspect" do |r, _|
-  assert "#<Redis client v#{Redis::VERSION} connected to redis://127.0.0.1:6379/15 (Redis v#{r.info["redis_version"]})>" == r.inspect
-end if $TEST_INSPECT
-
 test "raises on protocol errors" do
   redis_mock(:ping => lambda { |*_| "foo" }) do
     assert_raise(Redis::ProtocolError) do

data/test/remote_server_control_commands_test.rb

@@ -15,6 +15,17 @@ test "INFO" do |r|
   end
 end
 
+test "INFO COMMANDSTATS" do |r|
+  # Only available on Redis >= 2.3.0
+  next if r.info["redis_version"] < "2.3.0"
+
+  r.config(:resetstat)
+  r.ping
+
+  result = r.info(:commandstats)
+  assert "1" == result["ping"]["calls"]
+end
+
 test "MONITOR" do |r|
   log = []
 
@@ -52,6 +63,14 @@ test "DEBUG" do |r|
   assert r.debug(:object, "foo").kind_of?(String)
 end
 
+test "OBJECT" do |r|
+  r.lpush "list", "value"
+
+  assert r.object(:refcount, "list") == 1
+  assert r.object(:encoding, "list") == "ziplist"
+  assert r.object(:idletime, "list").kind_of?(Fixnum)
+end
+
 test "SYNC" do |r|
   replies = {:sync => lambda { "+OK" }}
 

metadata

@@ -2,7 +2,7 @@
 name: redis
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -18,7 +18,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -03:00
+date: 2011-06-08 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - benchmarking/logging.rb
 - benchmarking/pipeline.rb
 - benchmarking/speed.rb
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: redis-rb
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby client library for Redis, the key value storage server