SuccessFuture allocation optimization. #338

redisson · Dec 18, 2015 · ca6be04 · ca6be04
1 parent e17a9ce
commit ca6be04
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/org/redisson/client/RedisConnection.java b/src/main/java/org/redisson/client/RedisConnection.java
@@ -23,6 +23,7 @@
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.RedisStrictCommand;
+import org.redisson.connection.FastSuccessFuture;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -44,6 +45,7 @@ public class RedisConnection implements RedisCommands {
     private ReconnectListener reconnectListener;
     private long lastUsageTime;
 
+    private final Future<?> acquireFuture = new FastSuccessFuture<Object>(this);
 
     public RedisConnection(RedisClient redisClient, Channel channel) {
         super();
@@ -194,4 +196,8 @@ public String toString() {
         return getClass().getSimpleName() + " [redisClient=" + redisClient + ", channel=" + channel + "]";
     }
 
+    public Future<?> getAcquireFuture() {
+        return acquireFuture;
+    }
+
 }
diff --git a/src/main/java/org/redisson/client/RedisPubSubConnection.java b/src/main/java/org/redisson/client/RedisPubSubConnection.java
@@ -33,8 +33,6 @@
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.FutureListener;
 import io.netty.util.internal.PlatformDependent;
 
 public class RedisPubSubConnection extends RedisConnection {

diff --git a/src/main/java/org/redisson/connection/FastSuccessFuture.java b/src/main/java/org/redisson/connection/FastSuccessFuture.java
@@ -25,7 +25,7 @@ public class FastSuccessFuture<V> extends FastCompleteFuture<V> {
 
     private final V result;
 
-    protected FastSuccessFuture(V result) {
+    public FastSuccessFuture(V result) {
         this.result = result;
     }
 

diff --git a/src/main/java/org/redisson/misc/ConnectionPool.java b/src/main/java/org/redisson/misc/ConnectionPool.java
@@ -193,7 +193,7 @@ private void promiseSuccessful(ClientConnectionsEntry entry, Promise<T> promise,
 
     private Future<T> promiseSuccessful(ClientConnectionsEntry entry, T conn) {
         entry.resetFailedAttempts();
-        return connectionManager.newSucceededFuture(conn);
+        return (Future<T>) conn.getAcquireFuture();
     }
 
     private void promiseFailure(ClientConnectionsEntry entry, Promise<T> promise, Throwable cause) {