Merge pull request #706 from Napolskih/3.3

Add async mode for flushdb/flushall

Author: djanowski

lib/redis.rb

@@ -237,19 +237,31 @@ def debug(*args)
 
   # 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
 

test/commands_on_value_types_test.rb

@@ -79,6 +79,7 @@ def test_dbsize
   end
 
   def test_flushdb
+    # Test defaults
     r.set("foo", "s1")
     r.set("bar", "s2")
 
@@ -87,12 +88,51 @@ def test_flushdb
     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