redis 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f10522316b60319f14cbbf00cf0c82f13092997
-  data.tar.gz: 1aab75c09b750f2f2f5038cc14366b3c79e0e01c
+  metadata.gz: 7e0d0ba2328aca583c0f487729779c2b10b12c7b
+  data.tar.gz: 4a411cfa3512bafe7c2c12ac8a02c02bc87065aa
 SHA512:
-  metadata.gz: 78b8a72a6bc475aa55543abf515b3758af1a696a3f1adcaa9019898bf99acf0162383964880b1e6d07113205d0129ed84563de44a4680f9f15cc5893c44efae0
-  data.tar.gz: ad7ed9b0a0afb0a6c85bf5cd9cada2081c64b3b25856e0343bef61a62e2f4c7f376f42c32013092ec4dde55ed4182c6b11d1f0ace54167f49a597181abdbcf29
+  metadata.gz: 3af7dc63dc7bdc243da306817583db9b6989c21a0714c6652b4a443bfd9c46b2afba0707b028d708a74148bbeedd09d4ec207a0459b3559cb19b95f2f030bb07
+  data.tar.gz: 98d5aed456ebcd3ccdc50980879a3c14be4c8a1874c6febae95579d2fb3828bda2e82b05e62dc6a4966e178993d4a2a20dc3dedd9f8583cd731851eab2f8e164

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-# 4.0 (unreleased)
+# 4.0.1
+
+* `Redis::Distributed` now supports `mget` and `mapped_mget`. See #687.
+
+* `Redis::Distributed` now supports `sscan` and `sscan_each`. See #572.
+
+* `Redis#connection` returns a hash with connection information.
+  You shouldn't need to call `Redis#_client`, ever.
+
+* `Redis#flushdb` and `Redis#flushall` now support the `:async` option. See #706.
+
+
+# 4.0
 
 * Removed `Redis.connect`. Use `Redis.new`.
 

data/README.md

@@ -363,4 +363,4 @@ requests. You can also ask for help at `#redis-rb` on Freenode.
 [travis-home]:     https://travis-ci.org/
 [travis-image]:    https://secure.travis-ci.org/redis/redis-rb.svg?branch=master
 [travis-link]:     https://travis-ci.org/redis/redis-rb
-[rubydoc]:         https://www.rubydoc.info/gems/redis
+[rubydoc]:         http://www.rubydoc.info/gems/redis

data/lib/redis.rb

@@ -237,19 +237,31 @@ class Redis
 
   # Remove all keys from all databases.
   #
+  # @param [Hash] options
+  #   - `:async => Boolean`: async flush (default: false)
   # @return [String] `OK`
-  def flushall
+  def flushall(options = nil)
     synchronize do |client|
-      client.call([:flushall])
+      if options && options[:async]
+        client.call([:flushall, :async])
+      else
+        client.call([:flushall])
+      end
     end
   end
 
   # Remove all keys from the current database.
   #
+  # @param [Hash] options
+  #   - `:async => Boolean`: async flush (default: false)
   # @return [String] `OK`
-  def flushdb
+  def flushdb(options = nil)
     synchronize do |client|
-      client.call([:flushdb])
+      if options && options[:async]
+        client.call([:flushdb, :async])
+      else
+        client.call([:flushdb])
+      end
     end
   end
 
@@ -2737,6 +2749,16 @@ class Redis
     self.class.new(@options)
   end
 
+  def connection
+    {
+      host:     @original_client.host,
+      port:     @original_client.port,
+      db:       @original_client.db,
+      id:       @original_client.id,
+      location: @original_client.location
+    }
+  end
+
   def method_missing(command, *args)
     synchronize do |client|
       client.call([command] + args)

data/lib/redis/distributed.rb

@@ -277,13 +277,16 @@ class Redis
       node_for(key).get(key)
     end
 
-    # Get the values of all the given keys.
+    # Get the values of all the given keys as an Array.
     def mget(*keys)
-      raise CannotDistribute, :mget
+      mapped_mget(*keys).values_at(*keys)
     end
 
+    # Get the values of all the given keys as a Hash.
     def mapped_mget(*keys)
-      raise CannotDistribute, :mapped_mget
+      keys.group_by { |k| node_for k }.inject({}) do |results, (node, subkeys)|
+        results.merge! node.mapped_mget(*subkeys)
+      end
     end
 
     # Overwrite part of a string at key starting at the specified offset.
@@ -509,6 +512,16 @@ class Redis
       node_for(key).smembers(key)
     end
 
+    # Scan a set
+    def sscan(key, cursor, options={})
+      node_for(key).sscan(key, cursor, options)
+    end
+
+    # Scan a set and return an enumerator
+    def sscan_each(key, options={}, &block)
+      node_for(key).sscan_each(key, options, &block)
+    end
+
     # Subtract multiple sets.
     def sdiff(*keys)
       ensure_same_node(:sdiff, keys) do |node|

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

data/test/commands_on_value_types_test.rb

@@ -79,6 +79,7 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
   end
 
   def test_flushdb
+    # Test defaults
     r.set("foo", "s1")
     r.set("bar", "s2")
 
@@ -87,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

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_commands_on_sets_test.rb

@@ -78,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_strings_test.rb

@@ -7,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/internals_test.rb

@@ -41,10 +41,6 @@ class TestInternals < Test::Unit::TestCase
     end
   end
 
-  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_redis_current
     assert_equal "127.0.0.1", Redis.current._client.host
     assert_equal 6379, Redis.current._client.port
@@ -76,48 +72,12 @@ class TestInternals < Test::Unit::TestCase
     assert !fresh_client.connected?
   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._client.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._client.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._client.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._client.id
-  end
-
-  def test_override_id
-    redis = Redis.new(OPTIONS.merge(:id => "test"))
-    assert_equal redis._client.id, "test"
-  end
-
   def test_timeout
     assert_nothing_raised do
       Redis.new(OPTIONS.merge(:timeout => 0))
     end
   end
 
-  def test_id_inside_multi
-    redis = Redis.new(OPTIONS)
-    id = nil
-
-    redis.multi do
-      id = redis.id
-    end
-
-    assert_equal id, "redis://127.0.0.1:6381/15"
-  end
-
   driver(:ruby) do
     def test_tcp_keepalive
       keepalive = {:time => 20, :intvl => 10, :probes => 5}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -123,6 +123,7 @@ files:
 - test/commands_on_strings_test.rb
 - test/commands_on_value_types_test.rb
 - test/connection_handling_test.rb
+- test/connection_test.rb
 - test/db/.gitkeep
 - test/distributed_blocking_commands_test.rb
 - test/distributed_commands_on_hashes_test.rb
@@ -225,6 +226,7 @@ test_files:
 - test/commands_on_strings_test.rb
 - test/commands_on_value_types_test.rb
 - test/connection_handling_test.rb
+- test/connection_test.rb
 - test/db/.gitkeep
 - test/distributed_blocking_commands_test.rb
 - test/distributed_commands_on_hashes_test.rb