From 0994aee746a2397f97a262cd6ff7cf2e6223254e Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Wed, 19 Jul 2017 11:03:20 +0300
Subject: [PATCH] unlink, flashdb and flashall async commands support. #965

---
 .../main/java/org/redisson/RedissonKeys.java  | 40 ++++++++++++++++++-
 .../java/org/redisson/RedissonObject.java     | 10 +++++
 .../src/main/java/org/redisson/api/RKeys.java | 29 ++++++++++++++
 .../java/org/redisson/api/RKeysAsync.java     | 31 ++++++++++++++
 .../main/java/org/redisson/api/RObject.java   | 10 +++++
 .../java/org/redisson/api/RObjectAsync.java   | 10 +++++
 .../client/protocol/RedisCommands.java        |  6 +++
 7 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonKeys.java b/redisson/src/main/java/org/redisson/RedissonKeys.java
index 776e9dee0..3040c3273 100644
--- a/redisson/src/main/java/org/redisson/RedissonKeys.java
+++ b/redisson/src/main/java/org/redisson/RedissonKeys.java
@@ -36,6 +36,7 @@ import org.redisson.client.RedisException;
 import org.redisson.client.codec.ScanCodec;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommands;
+import org.redisson.client.protocol.RedisStrictCommand;
 import org.redisson.client.protocol.decoder.ListScanResult;
 import org.redisson.client.protocol.decoder.ScanObjectEntry;
 import org.redisson.command.CommandAsyncExecutor;
@@ -277,10 +278,24 @@ public class RedissonKeys implements RKeys {
         return deleteAsync(keys.toArray(new String[keys.size()]));
     }
     
+    @Override
+    public long unlink(String ... keys) {
+        return commandExecutor.get(deleteAsync(keys));
+    }
+
+    @Override
+    public RFuture<Long> unlinkAsync(String ... keys) {
+        return executeAsync(RedisCommands.UNLINK, keys);
+    }
+
     @Override
     public RFuture<Long> deleteAsync(String ... keys) {
+        return executeAsync(RedisCommands.DEL, keys);
+    }
+    
+    private RFuture<Long> executeAsync(RedisStrictCommand<Long> command, String ... keys) {
         if (!commandExecutor.getConnectionManager().isClusterMode()) {
-            return commandExecutor.writeAsync(null, RedisCommands.DEL, keys);
+            return commandExecutor.writeAsync(null, command, keys);
         }
 
         Map<MasterSlaveEntry, List<String>> range2key = new HashMap<MasterSlaveEntry, List<String>>();
@@ -320,7 +335,7 @@ public class RedissonKeys implements RKeys {
             // executes in batch due to CROSSLOT error
             CommandBatchService executorService = new CommandBatchService(commandExecutor.getConnectionManager());
             for (String key : entry.getValue()) {
-                executorService.writeAsync(entry.getKey(), null, RedisCommands.DEL, key);
+                executorService.writeAsync(entry.getKey(), null, command, key);
             }
 
             RFuture<List<?>> future = executorService.executeAsync();
@@ -351,6 +366,27 @@ public class RedissonKeys implements RKeys {
         });
     }
 
+    @Override
+    public void flushdbParallel() {
+        commandExecutor.get(flushdbParallelAsync());
+    }
+
+    @Override
+    public RFuture<Void> flushdbParallelAsync() {
+        return commandExecutor.writeAllAsync(RedisCommands.FLUSHDB_ASYNC);
+    }
+
+    @Override
+    public void flushallParallel() {
+        commandExecutor.get(flushallParallelAsync());
+    }
+
+    @Override
+    public RFuture<Void> flushallParallelAsync() {
+        return commandExecutor.writeAllAsync(RedisCommands.FLUSHALL_ASYNC);
+    }
+
+    
     @Override
     public void flushdb() {
         commandExecutor.get(flushdbAsync());
diff --git a/redisson/src/main/java/org/redisson/RedissonObject.java b/redisson/src/main/java/org/redisson/RedissonObject.java
index a1285a43b..e7d5f4ead 100644
--- a/redisson/src/main/java/org/redisson/RedissonObject.java
+++ b/redisson/src/main/java/org/redisson/RedissonObject.java
@@ -136,6 +136,16 @@ public abstract class RedissonObject implements RObject {
     public RFuture<Boolean> deleteAsync() {
         return commandExecutor.writeAsync(getName(), RedisCommands.DEL_BOOL, getName());
     }
+    
+    @Override
+    public boolean unlink() {
+        return get(unlinkAsync());
+    }
+
+    @Override
+    public RFuture<Boolean> unlinkAsync() {
+        return commandExecutor.writeAsync(getName(), RedisCommands.UNLINK_BOOL, getName());
+    }
 
     @Override
     public boolean touch() {
diff --git a/redisson/src/main/java/org/redisson/api/RKeys.java b/redisson/src/main/java/org/redisson/api/RKeys.java
index 7e039732f..f3445184b 100644
--- a/redisson/src/main/java/org/redisson/api/RKeys.java
+++ b/redisson/src/main/java/org/redisson/api/RKeys.java
@@ -230,6 +230,17 @@ public interface RKeys extends RKeysAsync {
      */
     long delete(String ... keys);
 
+    /**
+     * Delete multiple objects by name.
+     * Actual removal will happen later asynchronously.
+     * <p>
+     * Requires Redis 4.0+
+     * 
+     * @param keys
+     * @return number of removed keys
+     */
+    long unlink(String ... keys);
+    
     /**
      * Returns the number of keys in the currently-selected database
      *
@@ -242,9 +253,27 @@ public interface RKeys extends RKeysAsync {
      */
     void flushdb();
 
+    /**
+     * Delete all keys of currently selected database 
+     * in background without blocking server.
+     * <p>
+     * Requires Redis 4.0+
+     * 
+     */
+    void flushdbParallel();
+
     /**
      * Delete all keys of all existing databases
      */
     void flushall();
+    
+    /**
+     * Delete all keys of all existing databases
+     * in background without blocking server.
+     * <p>
+     * Requires Redis 4.0+
+     * 
+     */
+    void flushallParallel();
 
 }
diff --git a/redisson/src/main/java/org/redisson/api/RKeysAsync.java b/redisson/src/main/java/org/redisson/api/RKeysAsync.java
index 0f2e3cb7a..65343be43 100644
--- a/redisson/src/main/java/org/redisson/api/RKeysAsync.java
+++ b/redisson/src/main/java/org/redisson/api/RKeysAsync.java
@@ -188,6 +188,17 @@ public interface RKeysAsync {
      */
     RFuture<Long> deleteAsync(String ... keys);
 
+    /**
+     * Delete multiple objects by name.
+     * Actual removal will happen later asynchronously.
+     * <p>
+     * Requires Redis 4.0+
+     * 
+     * @param keys
+     * @return number of removed keys
+     */
+    RFuture<Long> unlinkAsync(String ... keys);
+    
     /**
      * Returns the number of keys in the currently-selected database in async mode
      *
@@ -207,4 +218,24 @@ public interface RKeysAsync {
      */
     RFuture<Void> flushallAsync();
 
+    /**
+     * Delete all keys of currently selected database
+     * in background without blocking server.
+     * <p>
+     * Requires Redis 4.0+
+     * 
+     * @return void
+     */
+    RFuture<Void> flushdbParallelAsync();
+
+    /**
+     * Delete all keys of all existing databases
+     * in background without blocking server.
+     * <p>
+     * Requires Redis 4.0+
+     * 
+     * @return void
+     */
+    RFuture<Void> flushallParallelAsync();
+    
 }
diff --git a/redisson/src/main/java/org/redisson/api/RObject.java b/redisson/src/main/java/org/redisson/api/RObject.java
index cc0b021ba..e06bf5575 100644
--- a/redisson/src/main/java/org/redisson/api/RObject.java
+++ b/redisson/src/main/java/org/redisson/api/RObject.java
@@ -63,6 +63,16 @@ public interface RObject extends RObjectAsync {
      */
     boolean delete();
 
+    /**
+     * Delete the objects.
+     * Actual removal will happen later asynchronously.
+     * <p>
+     * Requires Redis 4.0+
+     * 
+     * @return <code>true</code> if it was exist and deleted else <code>false</code>
+     */
+    boolean unlink();
+    
     /**
      * Rename current object key to <code>newName</code>
      *
diff --git a/redisson/src/main/java/org/redisson/api/RObjectAsync.java b/redisson/src/main/java/org/redisson/api/RObjectAsync.java
index 829034e5f..ef97a69da 100644
--- a/redisson/src/main/java/org/redisson/api/RObjectAsync.java
+++ b/redisson/src/main/java/org/redisson/api/RObjectAsync.java
@@ -56,6 +56,16 @@ public interface RObjectAsync {
      */
     RFuture<Boolean> deleteAsync();
 
+    /**
+     * Delete the objects.
+     * Actual removal will happen later asynchronously.
+     * <p>
+     * Requires Redis 4.0+
+     * 
+     * @return <code>true</code> if it was exist and deleted else <code>false</code>
+     */
+    RFuture<Boolean> unlinkAsync();
+    
     /**
      * Rename current object key to <code>newName</code>
      * in async mode
diff --git a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
index 85c569237..083fe33e5 100644
--- a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
+++ b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
@@ -245,6 +245,9 @@ public interface RedisCommands {
     RedisStrictCommand<String> CLIENT_GETNAME = new RedisStrictCommand<String>("CLIENT", "GETNAME", new StringDataDecoder());
     RedisStrictCommand<Void> FLUSHDB = new RedisStrictCommand<Void>("FLUSHDB", new VoidReplayConvertor());
     RedisStrictCommand<Void> FLUSHALL = new RedisStrictCommand<Void>("FLUSHALL", new VoidReplayConvertor());
+    
+    RedisStrictCommand<Void> FLUSHDB_ASYNC = new RedisStrictCommand<Void>("FLUSHDB", "ASYNC", new VoidReplayConvertor());
+    RedisStrictCommand<Void> FLUSHALL_ASYNC = new RedisStrictCommand<Void>("FLUSHALL", "ASYNC", new VoidReplayConvertor());
 
     RedisStrictCommand<List<String>> KEYS = new RedisStrictCommand<List<String>>("KEYS", new StringListReplayDecoder());
     RedisCommand<List<Object>> MGET = new RedisCommand<List<Object>>("MGET", new ObjectListReplayDecoder<Object>());
@@ -272,6 +275,9 @@ public interface RedisCommands {
     RedisStrictCommand<Boolean> DEL_BOOL = new RedisStrictCommand<Boolean>("DEL", new BooleanNullSafeReplayConvertor());
     RedisStrictCommand<Boolean> DEL_OBJECTS = new RedisStrictCommand<Boolean>("DEL", new BooleanNullSafeReplayConvertor());
     RedisStrictCommand<Void> DEL_VOID = new RedisStrictCommand<Void>("DEL", new VoidReplayConvertor());
+    
+    RedisStrictCommand<Long> UNLINK = new RedisStrictCommand<Long>("UNLINK");
+    RedisStrictCommand<Boolean> UNLINK_BOOL = new RedisStrictCommand<Boolean>("UNLINK", new BooleanNullSafeReplayConvertor());
 
     RedisCommand<Object> GET = new RedisCommand<Object>("GET");
     RedisStrictCommand<Long> GET_LONG = new RedisStrictCommand<Long>("GET", new LongReplayConvertor());