redis 3.3.5 → 4.0.3

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
 
@@ -43,4 +41,12 @@ class TestDistributedBlockingCommands < Test::Unit::TestCase
       r.brpoplpush("foo", "bar", 0)
     end
   end
+
+  def test_bzpopmin
+    # Not implemented yet
+  end
+
+  def test_bzpopmax
+    # Not implemented yet
+  end
 end

data/test/distributed_commands_on_hashes_test.rb

@@ -1,10 +1,21 @@
-# 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
-
   include Helper::Distributed
   include Lint::Hashes
+
+  def test_hscan
+    # Not implemented yet
+  end
+
+  def test_hstrlen
+    # Not implemented yet
+  end
+
+  def test_mapped_hmget_in_a_pipeline_returns_hash
+    assert_raise(Redis::Distributed::CannotDistribute) do
+      super
+    end
+  end
 end

data/test/distributed_commands_on_hyper_log_log_test.rb

@@ -1,33 +1,26 @@
-# 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
-
   include Helper::Distributed
   include Lint::HyperLogLog
 
   def test_pfmerge
-    target_version "2.8.9" do
+    target_version '2.8.9' do
       assert_raise Redis::Distributed::CannotDistribute do
-        r.pfadd "foo", "s1"
-        r.pfadd "bar", "s2"
-
-        assert r.pfmerge("res", "foo", "bar")
+        super
       end
     end
   end
 
   def test_pfcount_multiple_keys_diff_nodes
-    target_version "2.8.9" do
+    target_version '2.8.9' do
       assert_raise Redis::Distributed::CannotDistribute do
-        r.pfadd "foo", "s1"
-        r.pfadd "bar", "s2"
+        r.pfadd 'foo', 's1'
+        r.pfadd 'bar', 's2'
 
-        assert r.pfcount("res", "foo", "bar")
+        assert r.pfcount('res', 'foo', 'bar')
       end
     end
   end
-
 end

data/test/distributed_commands_on_lists_test.rb

@@ -1,22 +1,19 @@
-# 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
-
   include Helper::Distributed
   include Lint::Lists
 
   def test_rpoplpush
     assert_raise Redis::Distributed::CannotDistribute do
-      r.rpoplpush("foo", "bar")
+      r.rpoplpush('foo', 'bar')
     end
   end
 
   def test_brpoplpush
     assert_raise Redis::Distributed::CannotDistribute do
-      r.brpoplpush("foo", "bar", :timeout => 1)
+      r.brpoplpush('foo', 'bar', timeout: 1)
     end
   end
 end

data/test/distributed_commands_on_sets_test.rb

@@ -1,83 +1,105 @@
-# 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
-
   include Helper::Distributed
   include Lint::Sets
 
   def test_smove
     assert_raise Redis::Distributed::CannotDistribute do
-      r.sadd "foo", "s1"
-      r.sadd "bar", "s2"
+      r.sadd 'foo', 's1'
+      r.sadd 'bar', 's2'
 
-      r.smove("foo", "bar", "s1")
+      r.smove('foo', 'bar', 's1')
     end
   end
 
   def test_sinter
     assert_raise Redis::Distributed::CannotDistribute do
-      r.sadd "foo", "s1"
-      r.sadd "foo", "s2"
-      r.sadd "bar", "s2"
+      r.sadd 'foo', 's1'
+      r.sadd 'foo', 's2'
+      r.sadd 'bar', 's2'
 
-      r.sinter("foo", "bar")
+      r.sinter('foo', 'bar')
     end
   end
 
   def test_sinterstore
     assert_raise Redis::Distributed::CannotDistribute do
-      r.sadd "foo", "s1"
-      r.sadd "foo", "s2"
-      r.sadd "bar", "s2"
+      r.sadd 'foo', 's1'
+      r.sadd 'foo', 's2'
+      r.sadd 'bar', 's2'
 
-      r.sinterstore("baz", "foo", "bar")
+      r.sinterstore('baz', 'foo', 'bar')
     end
   end
 
   def test_sunion
     assert_raise Redis::Distributed::CannotDistribute do
-      r.sadd "foo", "s1"
-      r.sadd "foo", "s2"
-      r.sadd "bar", "s2"
-      r.sadd "bar", "s3"
+      r.sadd 'foo', 's1'
+      r.sadd 'foo', 's2'
+      r.sadd 'bar', 's2'
+      r.sadd 'bar', 's3'
 
-      r.sunion("foo", "bar")
+      r.sunion('foo', 'bar')
     end
   end
 
   def test_sunionstore
     assert_raise Redis::Distributed::CannotDistribute do
-      r.sadd "foo", "s1"
-      r.sadd "foo", "s2"
-      r.sadd "bar", "s2"
-      r.sadd "bar", "s3"
+      r.sadd 'foo', 's1'
+      r.sadd 'foo', 's2'
+      r.sadd 'bar', 's2'
+      r.sadd 'bar', 's3'
 
-      r.sunionstore("baz", "foo", "bar")
+      r.sunionstore('baz', 'foo', 'bar')
     end
   end
 
   def test_sdiff
     assert_raise Redis::Distributed::CannotDistribute do
-      r.sadd "foo", "s1"
-      r.sadd "foo", "s2"
-      r.sadd "bar", "s2"
-      r.sadd "bar", "s3"
+      r.sadd 'foo', 's1'
+      r.sadd 'foo', 's2'
+      r.sadd 'bar', 's2'
+      r.sadd 'bar', 's3'
 
-      r.sdiff("foo", "bar")
+      r.sdiff('foo', 'bar')
     end
   end
 
   def test_sdiffstore
     assert_raise Redis::Distributed::CannotDistribute do
-      r.sadd "foo", "s1"
-      r.sadd "foo", "s2"
-      r.sadd "bar", "s2"
-      r.sadd "bar", "s3"
+      r.sadd 'foo', 's1'
+      r.sadd 'foo', 's2'
+      r.sadd 'bar', 's2'
+      r.sadd 'bar', 's3'
+
+      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'
 
-      r.sdiffstore("baz", "foo", "bar")
+      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,18 +1,59 @@
-# 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
-
   include Helper::Distributed
   include Lint::SortedSets
 
-  def test_zcount
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "foo", 3, "s3"
+  def test_zinterstore
+    assert_raise(Redis::Distributed::CannotDistribute) { super }
+  end
+
+  def test_zinterstore_with_aggregate
+    assert_raise(Redis::Distributed::CannotDistribute) { super }
+  end
+
+  def test_zinterstore_with_weights
+    assert_raise(Redis::Distributed::CannotDistribute) { super }
+  end
+
+  def test_zlexcount
+    # Not implemented yet
+  end
+
+  def test_zpopmax
+    # Not implemented yet
+  end
+
+  def test_zpopmin
+    # Not implemented yet
+  end
+
+  def test_zrangebylex
+    # Not implemented yet
+  end
+
+  def test_zremrangebylex
+    # Not implemented yet
+  end
+
+  def test_zrevrangebylex
+    # Not implemented yet
+  end
+
+  def test_zscan
+    # Not implemented yet
+  end
+
+  def test_zunionstore
+    assert_raise(Redis::Distributed::CannotDistribute) { super }
+  end
+
+  def test_zunionstore_with_aggregate
+    assert_raise(Redis::Distributed::CannotDistribute) { super }
+  end
 
-    assert_equal 2, r.zcount("foo", 2, 3)
+  def test_zunionstore_with_weights
+    assert_raise(Redis::Distributed::CannotDistribute) { super }
   end
 end

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
@@ -56,4 +66,14 @@ class TestDistributedCommandsOnStrings < Test::Unit::TestCase
       end
     end
   end
+
+  def test_mapped_mget_in_a_pipeline_returns_hash
+    assert_raise Redis::Distributed::CannotDistribute do
+      super
+    end
+  end
+
+  def test_bitfield
+    # Not implemented yet
+  end
 end

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
 
@@ -40,6 +38,42 @@ class TestDistributedCommandsOnValueTypes < Test::Unit::TestCase
     assert_equal [], r.keys("*").sort
   end
 
+  def test_unlink
+    target_version "4.0.0" do
+      r.set "foo", "s1"
+      r.set "bar", "s2"
+      r.set "baz", "s3"
+
+      assert_equal ["bar", "baz", "foo"], r.keys("*").sort
+
+      assert_equal 1, r.unlink("foo")
+
+      assert_equal ["bar", "baz"], r.keys("*").sort
+
+      assert_equal 2, r.unlink("bar", "baz")
+
+      assert_equal [], r.keys("*").sort
+    end
+  end
+
+  def test_unlink_with_array_argument
+    target_version "4.0.0" do
+      r.set "foo", "s1"
+      r.set "bar", "s2"
+      r.set "baz", "s3"
+
+      assert_equal ["bar", "baz", "foo"], r.keys("*").sort
+
+      assert_equal 1, r.unlink(["foo"])
+
+      assert_equal ["bar", "baz"], r.keys("*").sort
+
+      assert_equal 2, r.unlink(["bar", "baz"])
+
+      assert_equal [], r.keys("*").sort
+    end
+  end
+
   def test_randomkey
     assert_raise Redis::Distributed::CannotDistribute do
       r.randomkey

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