redis 3.3.1 → 4.0.1

data/test/commands_on_sorted_sets_test.rb

@@ -1,13 +1,26 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sorted_sets"
+require_relative "helper"
+require_relative "lint/sorted_sets"
 
 class TestCommandsOnSortedSets < Test::Unit::TestCase
 
   include Helper::Client
   include Lint::SortedSets
 
+  def test_zlexcount
+    target_version "2.8.9" do
+      r.zadd "foo", 0, "aaren"
+      r.zadd "foo", 0, "abagael"
+      r.zadd "foo", 0, "abby"
+      r.zadd "foo", 0, "abbygail"
+
+      assert_equal 4, r.zlexcount("foo", "[a", "[a\xff")
+      assert_equal 4, r.zlexcount("foo", "[aa", "[ab\xff")
+      assert_equal 3, r.zlexcount("foo", "(aaren", "[ab\xff")
+      assert_equal 2, r.zlexcount("foo", "[aba", "(abbygail")
+      assert_equal 1, r.zlexcount("foo", "(aaren", "(abby")
+    end
+  end
+
   def test_zrangebylex
     target_version "2.8.9" do
       r.zadd "foo", 0, "aaren"

data/test/commands_on_strings_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/strings"
+require_relative "helper"
+require_relative "lint/strings"
 
 class TestCommandsOnStrings < Test::Unit::TestCase
 
@@ -82,7 +80,7 @@ class TestCommandsOnStrings < Test::Unit::TestCase
   end
 
   def test_bitop
-    try_encoding("UTF-8") do
+    with_external_encoding("UTF-8") do
       target_version "2.5.10" do
         r.set("foo", "a")
         r.set("bar", "b")

data/test/commands_on_value_types_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/value_types"
+require_relative "helper"
+require_relative "lint/value_types"
 
 class TestCommandsOnValueTypes < Test::Unit::TestCase
 
@@ -81,6 +79,7 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
   end
 
   def test_flushdb
+    # Test defaults
     r.set("foo", "s1")
     r.set("bar", "s2")
 
@@ -89,12 +88,51 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
     r.flushdb
 
     assert_equal 0, r.dbsize
+
+    # Test sync
+    r.set("foo", "s1")
+    r.set("bar", "s2")
+
+    assert_equal 2, r.dbsize
+
+    r.flushdb(:async => false)
+
+    assert_equal 0, r.dbsize
+
+    # Test async
+    target_version "3.9.101" do
+      r.set("foo", "s1")
+      r.set("bar", "s2")
+
+      assert_equal 2, r.dbsize
+
+      r.flushdb(:async => true)
+
+      assert_equal 0, r.dbsize
+
+      redis_mock(:flushdb => lambda { |args| "+FLUSHDB #{args.upcase}" }) do |redis|
+        assert_equal "FLUSHDB ASYNC", redis.flushdb(:async => true)
+      end
+    end
   end
 
   def test_flushall
+    # Test defaults
     redis_mock(:flushall => lambda { "+FLUSHALL" }) do |redis|
       assert_equal "FLUSHALL", redis.flushall
     end
+
+    # Test sync
+    redis_mock(:flushall => lambda { "+FLUSHALL" }) do |redis|
+      assert_equal "FLUSHALL", redis.flushall(:async => false)
+    end
+
+    # Test async
+    target_version "3.9.101" do
+      redis_mock(:flushall => lambda { |args| "+FLUSHALL #{args.upcase}" }) do |redis|
+        assert_equal "FLUSHALL ASYNC", redis.flushall(:async => true)
+      end
+    end
   end
 
   def test_migrate
@@ -111,8 +149,8 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
       end
       assert ex.message =~ /port not specified/
 
-      default_db = redis.client.db.to_i
-      default_timeout = redis.client.timeout.to_i
+      default_db = redis._client.db.to_i
+      default_timeout = redis._client.timeout.to_i
 
       # Test defaults
       actual = redis.migrate("foo", options)

data/test/connection_handling_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestConnectionHandling < Test::Unit::TestCase
 
@@ -40,7 +38,7 @@ class TestConnectionHandling < Test::Unit::TestCase
     r.select 14
     assert_equal nil, r.get("foo")
 
-    r.client.disconnect
+    r._client.disconnect
 
     assert_equal nil, r.get("foo")
   end
@@ -48,7 +46,7 @@ class TestConnectionHandling < Test::Unit::TestCase
   def test_quit
     r.quit
 
-    assert !r.client.connected?
+    assert !r._client.connected?
   end
 
   def test_close
@@ -148,7 +146,7 @@ class TestConnectionHandling < Test::Unit::TestCase
       end
 
       assert_equal nil, result
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end
 
@@ -188,7 +186,7 @@ class TestConnectionHandling < Test::Unit::TestCase
       end
 
       assert_equal nil, result
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end
 

data/test/connection_test.rb

@@ -0,0 +1,57 @@
+require_relative "helper"
+
+class TestConnection < Test::Unit::TestCase
+
+  include Helper::Client
+
+  def test_provides_a_meaningful_inspect
+    assert_equal "#<Redis client v#{Redis::VERSION} for redis://127.0.0.1:#{PORT}/15>", r.inspect
+  end
+
+  def test_connection_information
+    assert_equal "127.0.0.1",                 r.connection.fetch(:host)
+    assert_equal 6381,                        r.connection.fetch(:port)
+    assert_equal 15,                          r.connection.fetch(:db)
+    assert_equal "127.0.0.1:6381",            r.connection.fetch(:location)
+    assert_equal "redis://127.0.0.1:6381/15", r.connection.fetch(:id)
+  end
+
+  def test_default_id_with_host_and_port
+    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0))
+    assert_equal "redis://host:1234/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_host_and_port_and_explicit_scheme
+    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0, :scheme => "foo"))
+    assert_equal "redis://host:1234/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_path
+    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0))
+    assert_equal "redis:///tmp/redis.sock/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_path_and_explicit_scheme
+    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0, :scheme => "foo"))
+    assert_equal "redis:///tmp/redis.sock/0", redis.connection.fetch(:id)
+  end
+
+  def test_override_id
+    redis = Redis.new(OPTIONS.merge(:id => "test"))
+    assert_equal "test", redis.connection.fetch(:id)
+  end
+
+  def test_id_inside_multi
+    redis         = Redis.new(OPTIONS)
+    id            = nil
+    connection_id = nil
+
+    redis.multi do
+      id            = redis.id
+      connection_id = redis.connection.fetch(:id)
+    end
+
+    assert_equal "redis://127.0.0.1:6381/15", id
+    assert_equal "redis://127.0.0.1:6381/15", connection_id
+  end
+end

data/test/distributed_blocking_commands_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/blocking_commands"
+require_relative "helper"
+require_relative "lint/blocking_commands"
 
 class TestDistributedBlockingCommands < Test::Unit::TestCase
 

data/test/distributed_commands_on_hashes_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hashes"
+require_relative "helper"
+require_relative "lint/hashes"
 
 class TestDistributedCommandsOnHashes < Test::Unit::TestCase
 

data/test/distributed_commands_on_hyper_log_log_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hyper_log_log"
+require_relative "helper"
+require_relative "lint/hyper_log_log"
 
 class TestDistributedCommandsOnHyperLogLog < Test::Unit::TestCase
 

data/test/distributed_commands_on_lists_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/lists"
+require_relative "helper"
+require_relative "lint/lists"
 
 class TestDistributedCommandsOnLists < Test::Unit::TestCase
 

data/test/distributed_commands_on_sets_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sets"
+require_relative "helper"
+require_relative "lint/sets"
 
 class TestDistributedCommandsOnSets < Test::Unit::TestCase
 
@@ -80,4 +78,29 @@ class TestDistributedCommandsOnSets < Test::Unit::TestCase
       r.sdiffstore("baz", "foo", "bar")
     end
   end
+
+  def test_sscan
+    assert_nothing_raised do
+      r.sadd "foo", "s1"
+      r.sadd "foo", "s2"
+      r.sadd "bar", "s2"
+      r.sadd "bar", "s3"
+
+      cursor, vals = r.sscan "foo", 0
+      assert_equal '0', cursor
+      assert_equal %w(s1 s2), vals.sort
+    end
+  end
+
+  def test_sscan_each
+    assert_nothing_raised do
+      r.sadd "foo", "s1"
+      r.sadd "foo", "s2"
+      r.sadd "bar", "s2"
+      r.sadd "bar", "s3"
+
+      vals = r.sscan_each("foo").to_a
+      assert_equal %w(s1 s2), vals.sort
+    end
+  end
 end

data/test/distributed_commands_on_sorted_sets_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sorted_sets"
+require_relative "helper"
+require_relative "lint/sorted_sets"
 
 class TestDistributedCommandsOnSortedSets < Test::Unit::TestCase
 

data/test/distributed_commands_on_strings_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/strings"
+require_relative "helper"
+require_relative "lint/strings"
 
 class TestDistributedCommandsOnStrings < Test::Unit::TestCase
 
@@ -9,15 +7,27 @@ class TestDistributedCommandsOnStrings < Test::Unit::TestCase
   include Lint::Strings
 
   def test_mget
-    assert_raise Redis::Distributed::CannotDistribute do
-      r.mget("foo", "bar")
-    end
+    r.set("foo", "s1")
+    r.set("bar", "s2")
+
+    assert_equal ["s1", "s2"]     , r.mget("foo", "bar")
+    assert_equal ["s1", "s2", nil], r.mget("foo", "bar", "baz")
   end
 
   def test_mget_mapped
-    assert_raise Redis::Distributed::CannotDistribute do
-      r.mapped_mget("foo", "bar")
-    end
+    r.set("foo", "s1")
+    r.set("bar", "s2")
+
+    response = r.mapped_mget("foo", "bar")
+
+    assert_equal "s1", response["foo"]
+    assert_equal "s2", response["bar"]
+
+    response = r.mapped_mget("foo", "bar", "baz")
+
+    assert_equal "s1", response["foo"]
+    assert_equal "s2", response["bar"]
+    assert_equal nil , response["baz"]
   end
 
   def test_mset

data/test/distributed_commands_on_value_types_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/value_types"
+require_relative "helper"
+require_relative "lint/value_types"
 
 class TestDistributedCommandsOnValueTypes < Test::Unit::TestCase
 

data/test/distributed_commands_requiring_clustering_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedCommandsRequiringClustering < Test::Unit::TestCase
 

data/test/distributed_connection_handling_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedConnectionHandling < Test::Unit::TestCase
 

data/test/distributed_internals_test.rb

@@ -1,41 +1,39 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedInternals < Test::Unit::TestCase
 
   include Helper::Distributed
 
   def test_provides_a_meaningful_inspect
-    nodes = ["redis://localhost:#{PORT}/15", *NODES]
+    nodes = ["redis://127.0.0.1:#{PORT}/15", *NODES]
     redis = Redis::Distributed.new nodes
 
     assert_equal "#<Redis client v#{Redis::VERSION} for #{redis.nodes.map(&:id).join(', ')}>", redis.inspect
   end
 
   def test_default_as_urls
-    nodes = ["redis://localhost:#{PORT}/15", *NODES]
+    nodes = ["redis://127.0.0.1:#{PORT}/15", *NODES]
     redis = Redis::Distributed.new nodes
-    assert_equal ["redis://localhost:#{PORT}/15", *NODES], redis.nodes.map { |node| node.client.id}
+    assert_equal ["redis://127.0.0.1:#{PORT}/15", *NODES], redis.nodes.map { |node| node._client.id }
   end
 
   def test_default_as_config_hashes
     nodes = [OPTIONS.merge(:host => '127.0.0.1'), OPTIONS.merge(:host => 'somehost', :port => PORT.next)]
     redis = Redis::Distributed.new nodes
-    assert_equal ["redis://127.0.0.1:#{PORT}/15","redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node.client.id }
+    assert_equal ["redis://127.0.0.1:#{PORT}/15","redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node._client.id }
   end
 
   def test_as_mix_and_match
     nodes = ["redis://127.0.0.1:7389/15", OPTIONS.merge(:host => 'somehost'), OPTIONS.merge(:host => 'somehost', :port => PORT.next)]
     redis = Redis::Distributed.new nodes
-    assert_equal ["redis://127.0.0.1:7389/15", "redis://somehost:#{PORT}/15", "redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node.client.id }
+    assert_equal ["redis://127.0.0.1:7389/15", "redis://somehost:#{PORT}/15", "redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node._client.id }
   end
 
   def test_override_id
     nodes = [OPTIONS.merge(:host => '127.0.0.1', :id => "test"), OPTIONS.merge( :host => 'somehost', :port => PORT.next, :id => "test1")]
     redis = Redis::Distributed.new nodes
-    assert_equal redis.nodes.first.client.id, "test"
-    assert_equal redis.nodes.last.client.id,  "test1"
+    assert_equal redis.nodes.first._client.id, "test"
+    assert_equal redis.nodes.last._client.id,  "test1"
     assert_equal "#<Redis client v#{Redis::VERSION} for #{redis.nodes.map(&:id).join(', ')}>", redis.inspect
   end
 
@@ -67,13 +65,4 @@ class TestDistributedInternals < Test::Unit::TestCase
 
     assert_equal [], r2.sinter("baz:foo", "baz:bar")
   end
-
-  def test_colliding_node_ids
-    nodes = ["redis://localhost:#{PORT}/15", "redis://localhost:#{PORT}/15", *NODES]
-
-    assert_raise(RuntimeError) do
-      Redis::Distributed.new nodes
-    end
-  end
-
 end

data/test/distributed_key_tags_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedKeyTags < Test::Unit::TestCase
 
@@ -8,9 +6,9 @@ class TestDistributedKeyTags < Test::Unit::TestCase
   include Helper::Distributed
 
   def test_hashes_consistently
-    r1 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
-    r2 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
-    r3 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
+    r1 = Redis::Distributed.new ["redis://127.0.0.1:#{PORT}/15", *NODES]
+    r2 = Redis::Distributed.new ["redis://127.0.0.1:#{PORT}/15", *NODES]
+    r3 = Redis::Distributed.new ["redis://127.0.0.1:#{PORT}/15", *NODES]
 
     assert_equal r1.node_for("foo").id, r2.node_for("foo").id
     assert_equal r1.node_for("foo").id, r3.node_for("foo").id

data/test/distributed_persistence_control_commands_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedPersistenceControlCommands < Test::Unit::TestCase
 

data/test/distributed_publish_subscribe_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedPublishSubscribe < Test::Unit::TestCase
 

data/test/distributed_remote_server_control_commands_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedRemoteServerControlCommands < Test::Unit::TestCase
 

data/test/distributed_scripting_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedScripting < Test::Unit::TestCase
 

data/test/distributed_sorting_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedSorting < Test::Unit::TestCase
 

data/test/distributed_test.rb

@@ -1,13 +1,11 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributed < Test::Unit::TestCase
 
   include Helper::Distributed
 
   def test_handle_multiple_servers
-    @r = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
+    @r = Redis::Distributed.new ["redis://127.0.0.1:#{PORT}/15", *NODES]
 
     100.times do |idx|
       @r.set(idx.to_s, "foo#{idx}")
@@ -26,19 +24,19 @@ class TestDistributed < Test::Unit::TestCase
 
     @r = Redis::Distributed.new NODES, :logger => logger, :timeout => 10
 
-    assert_equal "127.0.0.1", @r.nodes[0].client.host
-    assert_equal PORT, @r.nodes[0].client.port
-    assert_equal 15, @r.nodes[0].client.db
-    assert_equal 10, @r.nodes[0].client.timeout
-    assert_equal logger, @r.nodes[0].client.logger
+    assert_equal "127.0.0.1", @r.nodes[0]._client.host
+    assert_equal PORT, @r.nodes[0]._client.port
+    assert_equal 15, @r.nodes[0]._client.db
+    assert_equal 10, @r.nodes[0]._client.timeout
+    assert_equal logger, @r.nodes[0]._client.logger
 
     @r.add_node("redis://127.0.0.1:6380/14")
 
-    assert_equal "127.0.0.1", @r.nodes[1].client.host
-    assert_equal 6380, @r.nodes[1].client.port
-    assert_equal 14, @r.nodes[1].client.db
-    assert_equal 10, @r.nodes[1].client.timeout
-    assert_equal logger, @r.nodes[1].client.logger
+    assert_equal "127.0.0.1", @r.nodes[1]._client.host
+    assert_equal 6380, @r.nodes[1]._client.port
+    assert_equal 14, @r.nodes[1]._client.db
+    assert_equal 10, @r.nodes[1]._client.timeout
+    assert_equal logger, @r.nodes[1]._client.logger
   end
 
   def test_pipelining_commands_cannot_be_distributed

data/test/distributed_transactions_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestDistributedTransactions < Test::Unit::TestCase
 

data/test/encoding_test.rb

@@ -1,18 +1,14 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestEncoding < Test::Unit::TestCase
 
   include Helper::Client
 
   def test_returns_properly_encoded_strings
-    if defined?(Encoding)
-      with_external_encoding("UTF-8") do
-        r.set "foo", "שלום"
+    with_external_encoding("UTF-8") do
+      r.set "foo", "שלום"
 
-        assert_equal "Shalom שלום", "Shalom " + r.get("foo")
-      end
+      assert_equal "Shalom שלום", "Shalom " + r.get("foo")
     end
   end
 end

data/test/error_replies_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestErrorReplies < Test::Unit::TestCase
 
@@ -47,7 +45,7 @@ class TestErrorReplies < Test::Unit::TestCase
   def test_recover_from_raise_in__call_loop
     with_reconnection_check do
       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/fork_safety_test.rb

@@ -1,11 +1,8 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestForkSafety < Test::Unit::TestCase
 
   include Helper::Client
-  include Helper::Skipable
 
   driver(:ruby, :hiredis) do
     def test_fork_safety
@@ -32,7 +29,6 @@ class TestForkSafety < Test::Unit::TestCase
 
     rescue NotImplementedError => error
       raise unless error.message =~ /fork is not available/
-      return skip(error.message)
     end
 
     def test_fork_safety_with_enabled_inherited_socket
@@ -59,7 +55,6 @@ class TestForkSafety < Test::Unit::TestCase
 
     rescue NotImplementedError => error
       raise unless error.message =~ /fork is not available/
-      return skip(error.message)
     end
   end
 end