redis 2.2.2 → 3.0.0.rc1

data/test/distributed_commands_on_hashes_test.rb

@@ -9,4 +9,3 @@ setup do
 end
 
 load './test/lint/hashes.rb'
-

data/test/distributed_commands_on_lists_test.rb

@@ -21,4 +21,3 @@ test "BRPOPLPUSH" do |r|
     r.brpoplpush("foo", "bar", 1)
   end
 end
-

data/test/distributed_commands_on_sets_test.rb

@@ -82,4 +82,3 @@ test "SDIFFSTORE" do |r|
     r.sdiffstore("baz", "foo", "bar")
   end
 end
-

data/test/distributed_commands_on_sorted_sets_test.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+require "redis/distributed"
+
+setup do
+  log = StringIO.new
+  init Redis::Distributed.new(NODES, :logger => ::Logger.new(log))
+end
+
+load './test/lint/sorted_sets.rb'
+
+test "ZCOUNT" do |r|
+  r.zadd "foo", 1, "s1"
+  r.zadd "foo", 2, "s2"
+  r.zadd "foo", 3, "s3"
+
+  assert 2 == r.zcount("foo", 2, 3)
+end

data/test/distributed_commands_on_strings_test.rb

@@ -47,4 +47,3 @@ test "MSETNX mapped" do |r|
     r.mapped_msetnx(:foo => "s2", :bar => "s3")
   end
 end
-

data/test/distributed_commands_on_value_types_test.rb

@@ -70,4 +70,3 @@ test "FLUSHDB" do |r|
 
   assert [0] == r.dbsize
 end
-

data/test/distributed_connection_handling_test.rb

@@ -22,4 +22,3 @@ test "SELECT" do |r|
 
   assert "bar" == r.get("foo")
 end
-

data/test/distributed_key_tags_test.rb

@@ -50,4 +50,3 @@ test "allows passing a custom tag extractor" do |r|
 
   assert [0, 100] == r.nodes.map { |node| node.keys.size }
 end
-

data/test/distributed_persistence_control_commands_test.rb

@@ -21,4 +21,3 @@ end
 test "LASTSAVE" do |r|
   assert r.lastsave.all? { |t| Time.at(t) <= Time.now }
 end
-

data/test/distributed_publish_subscribe_test.rb

@@ -84,7 +84,7 @@ test "SUBSCRIBE within SUBSCRIBE" do |r|
 end
 
 test "other commands within a SUBSCRIBE" do |r|
-  assert_raise RuntimeError do
+  assert_raise Redis::CommandError do
     r.subscribe("foo") do |on|
       on.subscribe do |channel, total|
         r.set("bar", "s2")
@@ -98,4 +98,3 @@ test "SUBSCRIBE without a block" do |r|
     r.subscribe("foo")
   end
 end
-

data/test/distributed_remote_server_control_commands_test.rb

@@ -17,8 +17,8 @@ test "INFO" do |r|
 end
 
 test "INFO COMMANDSTATS" do |r|
-  # Only available on Redis >= 2.3.0
-  next if r.info.first["redis_version"] < "2.3.0"
+  # Only available on Redis >= 2.9.0
+  next if version(r) < 209000
 
   r.nodes.each { |n| n.config(:resetstat) }
   r.ping # Executed on every node
@@ -40,4 +40,3 @@ end
 test "ECHO" do |r|
   assert ["foo bar baz\n"] == r.echo("foo bar baz\n")
 end
-

data/test/distributed_transactions_test.rb

@@ -31,4 +31,3 @@ test "WATCH/UNWATCH" do |r|
     r.unwatch
   end
 end
-

data/test/encoding_test.rb

@@ -13,4 +13,3 @@ test "returns properly encoded strings" do |r|
     assert "Shalom שלום" == "Shalom " + r.get("foo")
   end
 end if defined?(Encoding)
-

data/test/helper.rb

@@ -1,6 +1,6 @@
 $:.unshift File.expand_path('../lib', File.dirname(__FILE__))
 
-require "cutest"
+#require "cutest"
 require "logger"
 require "stringio"
 
@@ -20,7 +20,7 @@ def init(redis)
     redis.flushdb
     redis.select 15
     redis
-  rescue Errno::ECONNREFUSED
+  rescue Redis::CannotConnectError
     puts <<-EOS
 
       Cannot connect to Redis.
@@ -29,7 +29,7 @@ def init(redis)
       This testing suite connects to the database 15.
 
       To install redis:
-        visit <http://code.google.com/p/redis/>.
+        visit <http://redis.io/download/>.
 
       To start the server:
         rake start
@@ -44,6 +44,7 @@ end
 
 $VERBOSE = true
 
+require "redis/connection/%s" % (ENV["REDIS_CONNECTION_DRIVER"] || "ruby")
 require "redis"
 
 def driver
@@ -124,6 +125,16 @@ def silent
   end
 end
 
+def version(r)
+  info = r.info
+  info = info.first unless info.is_a?(Hash)
+  version_str_to_i info["redis_version"]
+end
+
+def version_str_to_i(version_str)
+  version_str.split(".").map{ |v| v.ljust(2, '0') }.join.to_i
+end
+
 def with_external_encoding(encoding)
   original_encoding = Encoding.default_external
 
@@ -142,4 +153,3 @@ def assert_nothing_raised(*exceptions)
     flunk(caller[1])
   end
 end
-

data/test/helper_test.rb

@@ -0,0 +1,8 @@
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+test "version_str_to_i" do
+  assert_equal 200000, version_str_to_i('2.0.0')
+  assert_equal 202020, version_str_to_i('2.2.2')
+  assert_equal 202022, version_str_to_i('2.2.22')
+  assert_equal 222222, version_str_to_i('22.22.22')
+end

data/test/internals_test.rb

@@ -35,20 +35,11 @@ test "Timeout" do
   end
 end
 
-# Don't use assert_raise because Timeour::Error in 1.8 inherits
-# Exception instead of StandardError (on 1.9).
 test "Connection timeout" do
-  # EM immediately raises CONNREFUSED
   next if driver == :synchrony
 
-  result = false
-
-  begin
+  assert_raise Redis::CannotConnectError do
     Redis.new(OPTIONS.merge(:host => "10.255.255.254", :timeout => 0.1)).ping
-  rescue Timeout::Error
-    result = true
-  ensure
-    assert result
   end
 end
 
@@ -80,7 +71,7 @@ test "Don't retry when wrapped inside #without_reconnect" do
 
   redis_mock(:ping => command) do
     redis = Redis.connect(:port => 6380, :timeout => 0.1)
-    assert_raise Errno::ECONNRESET do
+    assert_raise Redis::ConnectionError do
       redis.without_reconnect do
         redis.ping
       end
@@ -103,7 +94,7 @@ test "Retry only once when read raises ECONNRESET" do
 
   redis_mock(:ping => command) do
     redis = Redis.connect(:port => 6380, :timeout => 0.1)
-    assert_raise Errno::ECONNRESET do
+    assert_raise Redis::ConnectionError do
       redis.ping
     end
 
@@ -123,7 +114,7 @@ test "Don't retry when second read in pipeline raises ECONNRESET" do
 
   redis_mock(:ping => command) do
     redis = Redis.connect(:port => 6380, :timeout => 0.1)
-    assert_raise Errno::ECONNRESET do
+    assert_raise Redis::ConnectionError do
       redis.pipelined do
         redis.ping
         redis.ping # Second #read times out
@@ -138,23 +129,24 @@ test "Connecting to UNIX domain socket" do
   end
 end
 
-# Using a mock server in a thread doesn't work here (possibly because blocking
-# socket ops, raw socket timeouts and Ruby's thread scheduling don't mix).
-test "Bubble EAGAIN without retrying" do
-  cmd = %{(sleep 0.3; echo "+PONG\r\n") | nc -l 6380}
-  IO.popen(cmd) do |_|
-    sleep 0.1 # Give nc a little time to start listening
-    redis = Redis.connect(:port => 6380, :timeout => 0.1)
-
-    begin
-      assert_raise(Errno::EAGAIN) { redis.ping }
-    ensure
-      # Explicitly close connection so nc can quit
-      redis.client.disconnect
-
-      # Make the reactor loop do a tick to really close
-      EM::Synchrony.sleep(0) if driver == :synchrony
-    end
-  end
-end
-
+# if driver == :ruby || driver == :hiredis
+#   # Using a mock server in a thread doesn't work here (possibly because blocking
+#   # socket ops, raw socket timeouts and Ruby's thread scheduling don't mix).
+#   test "Bubble EAGAIN without retrying" do
+#     cmd = %{(sleep 0.3; echo "+PONG\r\n") | nc -l 6380}
+#     IO.popen(cmd) do |_|
+#       sleep 0.1 # Give nc a little time to start listening
+#       redis = Redis.connect(:port => 6380, :timeout => 0.1)
+#
+#       begin
+#         assert_raise(Errno::EAGAIN) { redis.ping }
+#       ensure
+#         # Explicitly close connection so nc can quit
+#         redis.client.disconnect
+#
+#         # Make the reactor loop do a tick to really close
+#         EM::Synchrony.sleep(0) if driver == :synchrony
+#       end
+#     end
+#   end
+# end

data/test/lint/hashes.rb

@@ -21,11 +21,26 @@ test "HDEL" do |r|
 
   assert "s1" == r.hget("foo", "f1")
 
-  r.hdel("foo", "f1")
+  assert 1 == r.hdel("foo", "f1")
 
   assert nil == r.hget("foo", "f1")
 end
 
+test "Variadic HDEL" do |r|
+  next if version(r) < 203090
+
+  r.hset("foo", "f1", "s1")
+  r.hset("foo", "f2", "s2")
+
+  assert "s1" == r.hget("foo", "f1")
+  assert "s2" == r.hget("foo", "f2")
+
+  assert 2 == r.hdel("foo", ["f1", "f2"])
+
+  assert nil == r.hget("foo", "f1")
+  assert nil == r.hget("foo", "f2")
+end
+
 test "HEXISTS" do |r|
   assert false == r.hexists("foo", "f1")
 
@@ -81,7 +96,7 @@ test "HMSET" do |r|
 end
 
 test "HMSET with invalid arguments" do |r|
-  assert_raise(RuntimeError) do
+  assert_raise(Redis::CommandError) do
     r.hmset("hash", "foo1", "bar1", "foo2", "bar2", "foo3")
   end
 end
@@ -123,4 +138,3 @@ test "HINCRBY" do |r|
 
   assert "2" == r.hget("foo", "f1")
 end
-

data/test/lint/internals.rb

@@ -18,8 +18,8 @@ end if $TEST_PIPELINING
 test "Recovers from failed commands" do |r, _|
   # See http://github.com/ezmobius/redis-rb/issues#issue/28
 
-  assert_raise(ArgumentError) do
-    r.srem "foo"
+  assert_raise do
+    r.command_that_doesnt_exist
   end
 
   assert_nothing_raised do
@@ -34,4 +34,3 @@ test "raises on protocol errors" do
     end
   end
 end
-

data/test/lint/lists.rb

@@ -6,6 +6,14 @@ test "RPUSH" do |r|
   assert "s2" == r.rpop("foo")
 end
 
+test "Variadic RPUSH" do |r|
+  next if version(r) < 203090 # 2.4-rc6
+
+  assert 3 == r.rpush("foo", ["s1", "s2", "s3"])
+  assert 3 == r.llen("foo")
+  assert "s3" == r.rpop("foo")
+end
+
 test "LPUSH" do |r|
   r.lpush "foo", "s1"
   r.lpush "foo", "s2"
@@ -14,6 +22,14 @@ test "LPUSH" do |r|
   assert "s2" == r.lpop("foo")
 end
 
+test "Variadic LPUSH" do |r|
+  next if version(r) < 203090 # 2.4-rc6
+
+  assert 3 == r.lpush("foo", ["s1", "s2", "s3"])
+  assert 3 == r.llen("foo")
+  assert "s3" == r.lpop("foo")
+end
+
 test "LLEN" do |r|
   r.rpush "foo", "s1"
   r.rpush "foo", "s2"
@@ -59,7 +75,7 @@ test "LSET" do |r|
   assert r.lset("foo", 1, "s3")
   assert "s3" == r.lindex("foo", 1)
 
-  assert_raise RuntimeError do
+  assert_raise Redis::CommandError do
     r.lset("foo", 4, "s3")
   end
 end
@@ -89,5 +105,3 @@ test "RPOP" do |r|
   assert "s2" == r.rpop("foo")
   assert 1 == r.llen("foo")
 end
-
-

data/test/lint/sets.rb

@@ -1,15 +1,40 @@
 test "SADD" do |r|
-  r.sadd "foo", "s1"
-  r.sadd "foo", "s2"
+  assert true == r.sadd("foo", "s1")
+  assert true == r.sadd("foo", "s2")
+  assert false == r.sadd("foo", "s1")
 
   assert ["s1", "s2"] == r.smembers("foo").sort
 end
 
+test "Variadic SADD" do |r|
+  next if version(r) < 203090 # 2.4-rc6
+
+  assert 2 == r.sadd("foo", ["s1", "s2"])
+  assert 1 == r.sadd("foo", ["s1", "s2", "s3"])
+
+  assert ["s1", "s2", "s3"] == r.smembers("foo").sort
+end
+
 test "SREM" do |r|
-  r.sadd "foo", "s1"
-  r.sadd "foo", "s2"
+  r.sadd("foo", "s1")
+  r.sadd("foo", "s2")
 
-  r.srem("foo", "s1")
+  assert true == r.srem("foo", "s1")
+  assert false == r.srem("foo", "s3")
+
+  assert ["s2"] == r.smembers("foo")
+end
+
+test "Variadic SREM" do |r|
+  next if version(r) < 203090 # 2.4-rc6
+
+  r.sadd("foo", "s1")
+  r.sadd("foo", "s2")
+  r.sadd("foo", "s3")
+
+  assert 1 == r.srem("foo", ["s1", "aaa"])
+  assert 0 == r.srem("foo", ["bbb", "ccc" "ddd"])
+  assert 1 == r.srem("foo", ["eee", "s3"])
 
   assert ["s2"] == r.smembers("foo")
 end
@@ -63,4 +88,3 @@ test "SRANDMEMBER" do |r|
 
   assert 2 == r.scard("foo")
 end
-

data/test/lint/sorted_sets.rb

@@ -1,33 +1,63 @@
 test "ZADD" do |r|
   assert 0 == r.zcard("foo")
+  assert true == r.zadd("foo", 1, "s1")
+  assert false == r.zadd("foo", 1, "s1")
+  assert 1 == r.zcard("foo")
+end
 
-  r.zadd "foo", 1, "s1"
+test "Variadic ZADD" do |r|
+  next if version(r) < 203090 # 2.4-rc6
 
-  assert 1 == r.zcard("foo")
+  # Non-nested array with pairs
+  assert 0 == r.zcard("foo")
+  assert 2 == r.zadd("foo", [1, "s1", 2, "s2"])
+  assert 1 == r.zadd("foo", [4, "s1", 5, "s2", 6, "s3"])
+  assert 3 == r.zcard("foo")
+  r.del "foo"
+
+  # Nested array with pairs
+  assert 0 == r.zcard("foo")
+  assert 2 == r.zadd("foo", [[1, "s1"], [2, "s2"]])
+  assert 1 == r.zadd("foo", [[4, "s1"], [5, "s2"], [6, "s3"]])
+  assert 3 == r.zcard("foo")
+  r.del "foo"
+
+  # Wrong number of arguments
+  assert_raise { r.zadd("foo") }
+  assert_raise { r.zadd("foo", ["bar"]) }
+  assert_raise { r.zadd("foo", ["bar", "qux", "zap"]) }
 end
 
 test "ZREM" do |r|
-  r.zadd "foo", 1, "s1"
+  r.zadd("foo", 1, "s1")
+  r.zadd("foo", 2, "s2")
 
+  assert 2 == r.zcard("foo")
+  assert true == r.zrem("foo", "s1")
+  assert false == r.zrem("foo", "s1")
   assert 1 == r.zcard("foo")
+end
 
-  r.zadd "foo", 2, "s2"
-
-  assert 2 == r.zcard("foo")
+test "Variadic ZREM" do |r|
+  next if version(r) < 203090 # 2.4-rc6
 
-  r.zrem "foo", "s1"
+  r.zadd("foo", 1, "s1")
+  r.zadd("foo", 2, "s2")
+  r.zadd("foo", 3, "s3")
 
+  assert 3 == r.zcard("foo")
+  assert 1 == r.zrem("foo", ["s1", "aaa"])
+  assert 0 == r.zrem("foo", ["bbb", "ccc" "ddd"])
+  assert 1 == r.zrem("foo", ["eee", "s3"])
   assert 1 == r.zcard("foo")
 end
 
 test "ZINCRBY" do |r|
-  r.zincrby "foo", 1, "s1"
-
-  assert "1" == r.zscore("foo", "s1")
+  rv = r.zincrby "foo", 1, "s1"
+  assert 1.0 == rv
 
-  r.zincrby "foo", 10, "s1"
-
-  assert "11" == r.zscore("foo", "s1")
+  rv = r.zincrby "foo", 10, "s1"
+  assert 11.0 == rv
 end
 
 test "ZRANK" do |r|
@@ -52,8 +82,8 @@ test "ZRANGE" do |r|
   r.zadd "foo", 3, "s3"
 
   assert ["s1", "s2"] == r.zrange("foo", 0, 1)
-  assert ["s1", "1", "s2", "2"] == r.zrange("foo", 0, 1, :with_scores => true)
-  assert ["s1", "1", "s2", "2"] == r.zrange("foo", 0, 1, :withscores => true)
+  assert [["s1", 1.0], ["s2", 2.0]] == r.zrange("foo", 0, 1, :with_scores => true)
+  assert [["s1", 1.0], ["s2", 2.0]] == r.zrange("foo", 0, 1, :withscores => true)
 end
 
 test "ZREVRANGE" do |r|
@@ -62,8 +92,8 @@ test "ZREVRANGE" do |r|
   r.zadd "foo", 3, "s3"
 
   assert ["s3", "s2"] == r.zrevrange("foo", 0, 1)
-  assert ["s3", "3", "s2", "2"] == r.zrevrange("foo", 0, 1, :with_scores => true)
-  assert ["s3", "3", "s2", "2"] == r.zrevrange("foo", 0, 1, :withscores => true)
+  assert [["s3", 3.0], ["s2", 2.0]] == r.zrevrange("foo", 0, 1, :with_scores => true)
+  assert [["s3", 3.0], ["s2", 2.0]] == r.zrevrange("foo", 0, 1, :withscores => true)
 end
 
 test "ZRANGEBYSCORE" do |r|
@@ -110,10 +140,10 @@ test "ZRANGEBYSCORE with WITHSCORES" do |r|
   r.zadd "foo", 3, "s3"
   r.zadd "foo", 4, "s4"
 
-  assert ["s2", "2"] == r.zrangebyscore("foo", 2, 4, :limit => [0, 1], :with_scores => true)
-  assert ["s3", "3"] == r.zrangebyscore("foo", 2, 4, :limit => [1, 1], :with_scores => true)
-  assert ["s2", "2"] == r.zrangebyscore("foo", 2, 4, :limit => [0, 1], :withscores => true)
-  assert ["s3", "3"] == r.zrangebyscore("foo", 2, 4, :limit => [1, 1], :withscores => true)
+  assert [["s2", 2.0]] == r.zrangebyscore("foo", 2, 4, :limit => [0, 1], :with_scores => true)
+  assert [["s3", 3.0]] == r.zrangebyscore("foo", 2, 4, :limit => [1, 1], :with_scores => true)
+  assert [["s2", 2.0]] == r.zrangebyscore("foo", 2, 4, :limit => [0, 1], :withscores => true)
+  assert [["s3", 3.0]] == r.zrangebyscore("foo", 2, 4, :limit => [1, 1], :withscores => true)
 end
 
 test "ZREVRANGEBYSCORE with WITHSCORES" do |r|
@@ -122,10 +152,10 @@ test "ZREVRANGEBYSCORE with WITHSCORES" do |r|
   r.zadd "foo", 3, "s3"
   r.zadd "foo", 4, "s4"
 
-  assert ["s4", "4"] == r.zrevrangebyscore("foo", 4, 2, :limit => [0, 1], :with_scores => true)
-  assert ["s3", "3"] == r.zrevrangebyscore("foo", 4, 2, :limit => [1, 1], :with_scores => true)
-  assert ["s4", "4"] == r.zrevrangebyscore("foo", 4, 2, :limit => [0, 1], :withscores => true)
-  assert ["s3", "3"] == r.zrevrangebyscore("foo", 4, 2, :limit => [1, 1], :withscores => true)
+  assert [["s4", 4.0]] == r.zrevrangebyscore("foo", 4, 2, :limit => [0, 1], :with_scores => true)
+  assert [["s3", 3.0]] == r.zrevrangebyscore("foo", 4, 2, :limit => [1, 1], :with_scores => true)
+  assert [["s4", 4.0]] == r.zrevrangebyscore("foo", 4, 2, :limit => [0, 1], :withscores => true)
+  assert [["s3", 3.0]] == r.zrevrangebyscore("foo", 4, 2, :limit => [1, 1], :withscores => true)
 end
 
 test "ZCARD" do |r|
@@ -139,7 +169,7 @@ end
 test "ZSCORE" do |r|
   r.zadd "foo", 1, "s1"
 
-  assert "1" == r.zscore("foo", "s1")
+  assert 1.0 == r.zscore("foo", "s1")
 
   assert nil == r.zscore("foo", "s2")
   assert nil == r.zscore("bar", "s1")
@@ -164,4 +194,3 @@ test "ZREMRANGEBYSCORE" do |r|
   assert 3 == r.zremrangebyscore("foo", 2, 4)
   assert ["s1"] == r.zrange("foo", 0, -1)
 end
-