redis 2.0.0 → 2.2.1

data/test/publish_subscribe_test.rb

@@ -0,0 +1,158 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "SUBSCRIBE and UNSUBSCRIBE" do |r|
+  listening = false
+
+  wire = Wire.new do
+    r.subscribe("foo") do |on|
+      on.subscribe do |channel, total|
+        @subscribed = true
+        @t1 = total
+      end
+
+      on.message do |channel, message|
+        if message == "s1"
+          r.unsubscribe
+          @message = message
+        end
+      end
+
+      on.unsubscribe do |channel, total|
+        @unsubscribed = true
+        @t2 = total
+      end
+
+      listening = true
+    end
+  end
+
+  Wire.pass while !listening
+
+  Redis.new(OPTIONS).publish("foo", "s1")
+
+  wire.join
+
+  assert @subscribed
+  assert 1 == @t1
+  assert @unsubscribed
+  assert 0 == @t2
+  assert "s1" == @message
+end
+
+test "PSUBSCRIBE and PUNSUBSCRIBE" do |r|
+  listening = false
+
+  wire = Wire.new do
+    r.psubscribe("f*") do |on|
+      on.psubscribe do |pattern, total|
+        @subscribed = true
+        @t1 = total
+      end
+
+      on.pmessage do |pattern, channel, message|
+        if message == "s1"
+          r.punsubscribe
+          @message = message
+        end
+      end
+
+      on.punsubscribe do |pattern, total|
+        @unsubscribed = true
+        @t2 = total
+      end
+
+      listening = true
+    end
+  end
+
+  Wire.pass while !listening
+
+  Redis.new(OPTIONS).publish("foo", "s1")
+
+  wire.join
+
+  assert @subscribed
+  assert 1 == @t1
+  assert @unsubscribed
+  assert 0 == @t2
+  assert "s1" == @message
+end
+
+test "SUBSCRIBE within SUBSCRIBE" do |r|
+  listening = false
+
+  @channels = []
+
+  wire = Wire.new do
+    r.subscribe("foo") do |on|
+      on.subscribe do |channel, total|
+        @channels << channel
+
+        r.subscribe("bar") if channel == "foo"
+        r.unsubscribe if channel == "bar"
+      end
+
+      listening = true
+    end
+  end
+
+  Wire.pass while !listening
+
+  Redis.new(OPTIONS).publish("foo", "s1")
+
+  wire.join
+
+  assert ["foo", "bar"] == @channels
+end
+
+test "other commands within a SUBSCRIBE" do |r|
+  assert_raise RuntimeError do
+    r.subscribe("foo") do |on|
+      on.subscribe do |channel, total|
+        r.set("bar", "s2")
+      end
+    end
+  end
+end
+
+test "SUBSCRIBE without a block" do |r|
+  assert_raise LocalJumpError do
+    r.subscribe("foo")
+  end
+end
+
+test "UNSUBSCRIBE without a SUBSCRIBE" do |r|
+  assert_raise RuntimeError do
+    r.unsubscribe
+  end
+
+  assert_raise RuntimeError do
+    r.punsubscribe
+  end
+end
+
+test "SUBSCRIBE past a timeout" do |r|
+  # For some reason, a thread here doesn't reproduce the issue.
+  sleep = %{sleep #{OPTIONS[:timeout] + 1}}
+  publish = %{echo "publish foo bar\r\n" | nc localhost #{OPTIONS[:port]}}
+  cmd = [sleep, publish].join("; ")
+
+  IO.popen(cmd, "r+") do |pipe|
+    received = false
+
+    r.subscribe "foo" do |on|
+      on.message do |channel, message|
+        received = true
+        r.unsubscribe
+      end
+    end
+
+    assert received
+  end
+end

data/test/redis_mock.rb

@@ -0,0 +1,80 @@
+require "socket"
+
+module RedisMock
+  class Server
+    VERBOSE = false
+
+    def initialize(port = 6380, &block)
+      @server = TCPServer.new("127.0.0.1", port)
+      @server.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
+      @thread = Thread.new { run(&block) }
+    end
+
+    # This raises an exception in the thread calling @server.accept which
+    # in turn will cause the thread to terminate.
+    def shutdown
+      @server.close if @server
+    rescue => ex
+      $stderr.puts "Error closing mock server: #{ex.message}" if VERBOSE
+      $stderr.puts ex.backtrace if VERBOSE
+    end
+
+    def run
+      loop do
+        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)
+
+            if response.nil?
+              session.shutdown(Socket::SHUT_RDWR)
+              break
+            else
+              session.write(response)
+              session.write("\r\n")
+            end
+          end
+        rescue Errno::ECONNRESET
+          # Ignore client closing the connection
+        end
+      end
+    rescue => ex
+      $stderr.puts "Error running mock server: #{ex.message}" if VERBOSE
+      $stderr.puts ex.backtrace if VERBOSE
+    end
+  end
+
+  module Helper
+    # Starts a mock Redis server in a thread on port 6380.
+    #
+    # The server will reply with a `+OK` to all commands, but you can
+    # customize it by providing a hash. For example:
+    #
+    #     redis_mock(:ping => lambda { "+PONG" }) do
+    #       assert_equal "PONG", Redis.new(:port => 6380).ping
+    #     end
+    #
+    def redis_mock(replies = {})
+      begin
+        server = Server.new do |command, *args|
+          (replies[command.to_sym] || lambda { |*_| "+OK" }).call(*args)
+        end
+
+        sleep 0.1 # Give time for the socket to start listening.
+
+        yield
+
+      ensure
+        server.shutdown
+      end
+    end
+  end
+end

data/test/remote_server_control_commands_test.rb

@@ -0,0 +1,82 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+require File.expand_path("./redis_mock", File.dirname(__FILE__))
+
+include RedisMock::Helper
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "INFO" do |r|
+  %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)
+  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 = []
+
+  wire = Wire.new do
+    Redis.new(OPTIONS).monitor do |line|
+      log << line
+      break if log.size == 3
+    end
+  end
+
+  Wire.pass while log.empty? # Faster than sleep
+
+  r.set "foo", "s1"
+
+  wire.join
+
+  assert log[-1][%q{(db 15) "set" "foo" "s1"}]
+end
+
+test "MONITOR returns value for break" do |r|
+  result = r.monitor do |line|
+    break line
+  end
+
+  assert result == "OK"
+end
+
+test "ECHO" do |r|
+  assert "foo bar baz\n" == r.echo("foo bar baz\n")
+end
+
+test "DEBUG" do |r|
+  r.set "foo", "s1"
+
+  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" }}
+
+  redis_mock(replies) do
+    redis = Redis.new(OPTIONS.merge(:port => 6380))
+
+    assert "OK" == redis.sync
+  end
+end

data/test/sorting_test.rb

@@ -0,0 +1,44 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "SORT" do |r|
+  r.set("foo:1", "s1")
+  r.set("foo:2", "s2")
+
+  r.rpush("bar", "1")
+  r.rpush("bar", "2")
+
+  assert ["s1"] == r.sort("bar", :get => "foo:*", :limit => [0, 1])
+  assert ["s2"] == r.sort("bar", :get => "foo:*", :limit => [0, 1], :order => "desc alpha")
+end
+
+test "SORT with an array of GETs" do |r|
+  r.set("foo:1:a", "s1a")
+  r.set("foo:1:b", "s1b")
+
+  r.set("foo:2:a", "s2a")
+  r.set("foo:2:b", "s2b")
+
+  r.rpush("bar", "1")
+  r.rpush("bar", "2")
+
+  assert ["s1a", "s1b"] == r.sort("bar", :get => ["foo:*:a", "foo:*:b"], :limit => [0, 1])
+  assert ["s2a", "s2b"] == r.sort("bar", :get => ["foo:*:a", "foo:*:b"], :limit => [0, 1], :order => "desc alpha")
+end
+
+test "SORT with STORE" do |r|
+  r.set("foo:1", "s1")
+  r.set("foo:2", "s2")
+
+  r.rpush("bar", "1")
+  r.rpush("bar", "2")
+
+  r.sort("bar", :get => "foo:*", :store => "baz")
+  assert ["s1", "s2"] == r.lrange("baz", 0, -1)
+end
+

data/test/synchrony_driver.rb

@@ -0,0 +1,57 @@
+# encoding: UTF-8
+
+require 'em-synchrony'
+
+require 'redis'
+require 'redis/connection/synchrony'
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+#
+# if running under Eventmachine + Synchrony (Ruby 1.9+), then
+# we can simulate the blocking API while performing the network
+# IO via the EM reactor.
+#
+
+EM.synchrony do
+  r = Redis.new
+  r.flushdb
+
+  r.rpush "foo", "s1"
+  r.rpush "foo", "s2"
+
+  assert 2 == r.llen("foo")
+  assert "s2" == r.rpop("foo")
+
+  r.set("foo", "bar")
+
+  assert "bar" == r.getset("foo", "baz")
+  assert "baz" == r.get("foo")
+
+  r.set("foo", "a")
+
+  assert_equal 1, r.getbit("foo", 1)
+  assert_equal 1, r.getbit("foo", 2)
+  assert_equal 0, r.getbit("foo", 3)
+  assert_equal 0, r.getbit("foo", 4)
+  assert_equal 0, r.getbit("foo", 5)
+  assert_equal 0, r.getbit("foo", 6)
+  assert_equal 1, r.getbit("foo", 7)
+
+  r.flushdb
+
+  # command pipelining
+  r.pipelined do
+    r.lpush "foo", "s1"
+    r.lpush "foo", "s2"
+  end
+
+  assert 2 == r.llen("foo")
+  assert "s2" == r.lpop("foo")
+  assert "s1" == r.lpop("foo")
+
+  assert "OK" == r.client.call(:quit)
+  assert "PONG" == r.ping
+
+  EM.stop
+end

data/test/test.conf

@@ -0,0 +1,8 @@
+dir ./test/db
+pidfile ./redis.pid
+port 6379
+timeout 300
+loglevel debug
+logfile stdout
+databases 16
+daemonize yes

data/test/thread_safety_test.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "thread safety" do
+  redis = Redis.connect(OPTIONS.merge(:thread_safe => true))
+
+  redis.set "foo", 1
+  redis.set "bar", 2
+
+  sample = 100
+
+  t1 = Thread.new do
+    $foos = Array.new(sample) { redis.get "foo" }
+  end
+
+  t2 = Thread.new do
+    $bars = Array.new(sample) { redis.get "bar" }
+  end
+
+  t1.join
+  t2.join
+
+  assert_equal ["1"], $foos.uniq
+  assert_equal ["2"], $bars.uniq
+end

data/test/transactions_test.rb

@@ -0,0 +1,100 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "MULTI/DISCARD" do |r|
+  r.multi
+
+  assert "QUEUED" == r.set("foo", "1")
+  assert "QUEUED" == r.get("foo")
+
+  r.discard
+
+  assert nil == r.get("foo")
+end
+
+test "MULTI/EXEC with a block" do |r|
+  r.multi do |multi|
+    multi.set "foo", "s1"
+  end
+
+  assert "s1" == r.get("foo")
+
+  assert_raise(RuntimeError) do
+    r.multi do |multi|
+      multi.set "bar", "s2"
+      raise "Some error"
+      multi.set "baz", "s3"
+    end
+  end
+
+  assert nil == r.get("bar")
+  assert nil == r.get("baz")
+end
+
+test "Don't raise (and ignore) immediate error in MULTI/EXEC" do |r|
+  result = r.multi do |m|
+    m.set("foo", "s1")
+    m.unknown_command
+  end
+
+  assert 1 == result.size
+  assert "OK" == result.first
+  assert "s1" == r.get("foo")
+end
+
+test "Don't raise delayed error in MULTI/EXEC" do |r|
+  result = r.multi do |m|
+    m.set("foo", "s1")
+    m.incr("foo") # not an integer
+    m.lpush("foo", "value") # wrong kind of value
+  end
+
+  assert result[1].message =~ /not an integer/i
+  assert result[2].message =~ /wrong kind of value/i
+  assert "s1" == r.get("foo")
+end
+
+test "MULTI with a block yielding the client" do |r|
+  r.multi do |multi|
+    multi.set "foo", "s1"
+  end
+
+  assert "s1" == r.get("foo")
+end
+
+test "WATCH with an unmodified key" do |r|
+  r.watch "foo"
+  r.multi do |multi|
+    multi.set "foo", "s1"
+  end
+
+  assert "s1" == r.get("foo")
+end
+
+test "WATCH with a modified key" do |r|
+  r.watch "foo"
+  r.set "foo", "s1"
+  res = r.multi do |multi|
+    multi.set "foo", "s2"
+  end
+
+  assert nil == res
+  assert "s1" == r.get("foo")
+end
+
+test "UNWATCH with a modified key" do |r|
+  r.watch "foo"
+  r.set "foo", "s1"
+  r.unwatch
+  r.multi do |multi|
+    multi.set "foo", "s2"
+  end
+
+  assert "s2" == r.get("foo")
+end
+

data/test/unknown_commands_test.rb

@@ -0,0 +1,14 @@
+ # encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+setup do
+  init Redis.new(OPTIONS)
+end
+
+test "should try to work" do |r|
+  assert_raise RuntimeError do
+    r.not_yet_implemented_command
+  end
+end
+

data/test/url_param_test.rb

@@ -0,0 +1,60 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+test "URL defaults to 127.0.0.1:6379" do
+  redis = Redis.connect
+
+  assert "127.0.0.1" == redis.client.host
+  assert 6379 == redis.client.port
+  assert 0 == redis.client.db
+  assert nil == redis.client.password
+end
+
+test "allows to pass in a URL" do
+  redis = Redis.connect :url => "redis://:secr3t@foo.com:999/2"
+
+  assert "foo.com" == redis.client.host
+  assert 999 == redis.client.port
+  assert 2 == redis.client.db
+  assert "secr3t" == redis.client.password
+end
+
+test "override URL if path option is passed" do
+  redis = Redis.connect :url => "redis://:secr3t@foo.com/foo:999/2", :path => "/tmp/redis.sock"
+
+  assert "/tmp/redis.sock" == redis.client.path
+  assert nil == redis.client.host
+  assert nil == redis.client.port
+end
+
+test "overrides URL if another connection option is passed" do
+  redis = Redis.connect :url => "redis://:secr3t@foo.com:999/2", :port => 1000
+
+  assert "foo.com" == redis.client.host
+  assert 1000 == redis.client.port
+  assert 2 == redis.client.db
+  assert "secr3t" == redis.client.password
+end
+
+test "does not modify the passed options" do
+  options = { :url => "redis://:secr3t@foo.com:999/2" }
+
+  redis = Redis.connect(options)
+
+  assert({ :url => "redis://:secr3t@foo.com:999/2" } == options)
+end
+
+test "uses REDIS_URL over default if available" do
+  ENV["REDIS_URL"] = "redis://:secr3t@foo.com:999/2"
+
+  redis = Redis.connect
+
+  assert "foo.com" == redis.client.host
+  assert 999 == redis.client.port
+  assert 2 == redis.client.db
+  assert "secr3t" == redis.client.password
+
+  ENV.delete("REDIS_URL")
+end
+